From 7ac5a3f2bcbb0d0e13dc87cd969c8fb1fd99b488 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期日, 04 一月 2026 10:38:42 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AreaGovernService.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 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 707b840..2ca64dd 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
@@ -10,14 +10,14 @@
import com.zy.acs.manager.core.service.astart.MapDataDispatcher;
import com.zy.acs.manager.manager.entity.Area;
import com.zy.acs.manager.manager.enums.StatusType;
+import com.zy.acs.manager.manager.service.AreaAgvService;
import com.zy.acs.manager.manager.service.AreaService;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.event.ApplicationReadyEvent;
-import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
+import javax.annotation.PostConstruct;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
@@ -35,9 +35,12 @@
private AreaService areaService;
@Autowired
private MapDataDispatcher mapDataDispatcher;
+ @Autowired
+ private AreaAgvService areaAgvService;
// launcher -------------------------------------------------------
- @EventListener(ApplicationReadyEvent.class)
+// @EventListener(ApplicationReadyEvent.class)
+ @PostConstruct
public void init() {
List<Area> areaList = areaService.list(new LambdaQueryWrapper<Area>().eq(Area::getStatus, StatusType.ENABLE.val));
if (Cools.isEmpty(areaList)) {
@@ -107,8 +110,6 @@
// String areaDataStr = redis.getValue(RedisConstant.MAP_AREA_DATA_FLAG, redisKey);
//
// }
-
- System.out.println(1);
}
// checkout list of area by code data
@@ -123,10 +124,22 @@
return areaIds;
}
+ // checkout list of code by code data
+ public List<String> queryCodesByOneCode(String code) {
+ Set<String> codeSet = new HashSet<>();
+ for (Map.Entry<Long, List<String>> entry : AREA_CODE.entrySet()) {
+ List<String> codeList = entry.getValue();
+ if (!Cools.isEmpty(codeList) && codeList.contains(code)) {
+ codeSet.addAll(codeList);
+ }
+ }
+ return new ArrayList<>(codeSet);
+ }
+
// 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<>();
@@ -154,8 +167,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