From 920bb5635c88c2f2f9a21134c81ebbc344539987 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 16 十二月 2025 11:07:06 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | 60 ++++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 44 insertions(+), 16 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 513ab9b..babdeee 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
@@ -18,9 +18,11 @@
import com.zy.acs.manager.core.service.MapService;
import com.zy.acs.manager.core.service.PatrolService;
import com.zy.acs.manager.core.service.floyd.FloydNavigateService;
+import com.zy.acs.manager.manager.controller.param.MapAreaParam;
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.*;
@@ -74,6 +76,8 @@
private PatrolService patrolService;
@Autowired
private AvoidWaveCalculator avoidWaveCalculator;
+ @Autowired
+ private AreaService areaService;
@PreAuthorize("hasAuthority('manager:loc:update')")
@PostMapping("/startupOrShutdown")
@@ -211,22 +215,6 @@
}
return R.ok().add(result);
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -439,4 +427,44 @@
return R.ok().add(mapDto);
}
+ // area operate -------------------------
+
+ @PreAuthorize("hasAuthority('manager:loc:list')")
+ @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);
+ }
+
+ @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")
+ 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