From f43a65438cbfb5c11675bea8b643de8e0770f52b Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 13 一月 2026 13:50:45 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
index b546994..bb31f02 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
@@ -22,6 +22,7 @@
import com.zy.acs.manager.manager.controller.param.MapDataParam;
import com.zy.acs.manager.manager.controller.param.MapParam;
import com.zy.acs.manager.manager.controller.result.MapAgvVo;
+import com.zy.acs.manager.manager.controller.result.MapAreaResult;
import com.zy.acs.manager.manager.controller.result.MapPointVo;
import com.zy.acs.manager.manager.controller.result.MapRouteVo;
import com.zy.acs.manager.manager.entity.*;
@@ -83,6 +84,17 @@
public synchronized R startupOrShutdown() {
Boolean taskAssignMode = configService.getVal("TaskAssignMode", Boolean.class);
return configService.setVal("TaskAssignMode", !taskAssignMode) ? R.ok() : R.error();
+ }
+
+ @PreAuthorize("hasAuthority('manager:loc:list')")
+ @PostMapping("/config/preferences")
+ public R configPreferences(@RequestParam(required = false) Long zoneId, @RequestParam(required = false) Integer floor) {
+ Integer dashboardAgvAngleOffsetVal = configService.getVal("dashboardAgvAngleOffsetVal", Integer.class);
+ Boolean dashMapMirror = configService.getVal("dashMapMirror", Boolean.class);
+ return R.ok().add(Cools
+ .add("agvAngleOffsetVal", Optional.ofNullable(dashboardAgvAngleOffsetVal).orElse(0))
+ .add("mapMirror", Optional.ofNullable(dashMapMirror).orElse(Boolean.FALSE))
+ );
}
@PreAuthorize("hasAuthority('manager:loc:list')")
@@ -432,15 +444,37 @@
@PostMapping("/area/list")
public R areaFetch(@RequestParam(required = false) Long zoneId, @RequestParam(required = false) Integer floor) {
List<Area> areaList = areaService.list(new LambdaQueryWrapper<Area>().eq(Area::getStatus, StatusType.ENABLE.val));
+ List<MapAreaResult> list = new ArrayList<>();
+ for (Area area : areaList) {
+ MapAreaResult result = new MapAreaResult();
+ list.add(result.sync(area));
+ }
+ return R.ok().add(list);
+ }
- return R.ok();
+ @PreAuthorize("hasAuthority('manager:loc:list')")
+ @GetMapping("/area/get")
+ public R areaGet(@RequestParam Long areaId) {
+ Area area = areaService.getById(areaId);
+ return R.ok().add(new MapAreaResult().sync(area));
}
@PreAuthorize("hasAuthority('manager:loc:update')")
@PostMapping("/area/save")
- @Transactional
- public R save(@RequestBody MapAreaParam param) {
- areaService.saveMapArea(param, getLoginUserId());
+ public R areaSave(@RequestBody MapAreaParam param) {
+ return R.ok().add(areaService.saveMapArea(param, getLoginUserId()));
+ }
+
+ @PreAuthorize("hasAuthority('manager:loc:update')")
+ @PostMapping("/area/update")
+ public R areaUpdate(@RequestBody MapAreaParam param) {
+ return R.ok().add(areaService.modifyMapArea(param, getLoginUserId()));
+ }
+
+ @PreAuthorize("hasAuthority('manager:loc:remove')")
+ @PostMapping("/area/remove")
+ public R areaRemove(@RequestBody MapAreaParam param) {
+ areaService.removeMapArea(param.getId(), getLoginUserId());
return R.ok();
}
--
Gitblit v1.9.1