From 590a64af2cdd33427ed8eda2eb983b07dd60ab8b Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期五, 16 一月 2026 12:05:12 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AreaGovernService.java |   33 +++++----------------------------
 1 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AreaGovernService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AreaGovernService.java
index 177b2be..1a45b15 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AreaGovernService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AreaGovernService.java
@@ -85,31 +85,6 @@
             }
         }
 
-//        for (Map.Entry<Long, List<String>> entry : AREA_CODE.entrySet()) {
-//            Long areaId = entry.getKey();
-//            List<String> codeList = entry.getValue();
-//
-//            for (String code : codeList) {
-//                Set<Long> agvList = CODE_AGV.computeIfAbsent(code, k -> new HashSet<>());
-//                // todo AreaAGV( man_area_agv )
-//
-//
-//            }
-//        }
-
-
-//        for (Area area : areaList) {
-//            AreaShapeDto shapeDto = JSON.parseObject(area.getShapeData(), AreaShapeDto.class);
-//            MapPointDto start = shapeDto.getStart();
-//            MapPointDto end = shapeDto.getEnd();
-//
-//            List<String> codeList = this.findCodesInArea(start, end);
-//            log.info("codeList: {}", JSON.toJSONString(codeList));
-//
-//            String redisKey = area.getName() + (area.getZoneId() != null ? "_" + area.getZoneId() : "");
-//            String areaDataStr = redis.getValue(RedisConstant.MAP_AREA_DATA_FLAG, redisKey);
-//
-//        }
     }
 
     // checkout list of area by code data
@@ -139,7 +114,7 @@
     // checkout list of code by area ids
     public List<String> queryCodes(List<Long> areaIds) {
         if (Cools.isEmpty(areaIds)) {
-            return Collections.emptyList();
+            return new ArrayList<>();
         }
 
         Set<String> codeList = new HashSet<>();
@@ -167,8 +142,10 @@
     public Boolean removeArea(Long areaId) {
         if (null == areaId) { return false; }
         List<String> codeList = AREA_CODE.get(areaId);
-        AREA_CODE.get(areaId).clear();
-        AREA_CODE.remove(areaId);
+        if (!Cools.isEmpty(codeList)) {
+            AREA_CODE.get(areaId).clear();
+            AREA_CODE.remove(areaId);
+        }
         return Boolean.TRUE;
     }
 

--
Gitblit v1.9.1