From 0f637043262ce627511260f18abc1e2f8ea3bb11 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 15 十二月 2025 15:42:17 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 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 ec0c524..4ab0eb5 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.*;
@@ -428,12 +429,30 @@
 
     // 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(area);
+    }
+
     @PreAuthorize("hasAuthority('manager:loc:update')")
     @PostMapping("/area/save")
     @Transactional
     public R save(@RequestBody MapAreaParam param) {
-        areaService.saveMapArea(param, getLoginUserId());
-        return R.ok();
+        return R.ok().add(areaService.saveMapArea(param, getLoginUserId()));
     }
 
 }

--
Gitblit v1.9.1