From 2de9e897274f93ef5e90eaa068ab8645dea2de39 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 18 十二月 2025 15:40:33 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java | 5 +++++
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java | 15 +++++++++------
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java
index 8d916b3..2035ddc 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java
@@ -79,4 +79,9 @@
return areaGovernService.queryCodes(areaIds);
}
+ public Boolean isAgvExistsInAnyArea(Long agvId) {
+ List<Long> agvIdsWithoutAreaAgv = areaAgvService.findAgvIdsWithoutAreaAgv();
+ return !Cools.isEmpty(agvIdsWithoutAreaAgv) && agvIdsWithoutAreaAgv.contains(agvId);
+ }
+
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
index f9a7752..1c9c942 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
@@ -41,7 +41,7 @@
private ScheduledExecutorService scheduler = null;
- private List<String> CODE_DATA_CACHE = new ArrayList<>();
+ private List<String> ALL_CODE_DATA_CACHE = new ArrayList<>();
private List<String> LOC_CODE_DATA_CACHE = new ArrayList<>();
@@ -84,7 +84,7 @@
}
// init all code data
List<Code> codeList = codeService.list(new LambdaQueryWrapper<Code>().eq(Code::getStatus, StatusType.ENABLE.val));
- this.CODE_DATA_CACHE = codeList.stream().map(Code::getData).distinct().collect(Collectors.toList());
+ this.ALL_CODE_DATA_CACHE = codeList.stream().map(Code::getData).distinct().collect(Collectors.toList());
// int all loc code data
List<Code> locCodeList = codeService.getAllLocCode();
@@ -214,13 +214,16 @@
* agv鍦板浘鍥炬爣鍙樺寲
*/
public String getDestinationCode(String agvNo, AgvDetail agvDetail) {
-
Code startCode = codeService.getCacheById(agvDetail.getRecentCode());
-
Set<String> notInCodeSet = new HashSet<>();
+ Long agvId = agvDetail.getAgvId();
-// Collections.shuffle(CODE_DATA_CACHE);
- List<String> codeList = agvAreaDispatcher.getCodesByAgvId(agvDetail.getAgvId());
+ List<String> codeList = null;
+ if (agvAreaDispatcher.isAgvExistsInAnyArea(agvId)) {
+ codeList = agvAreaDispatcher.getCodesByAgvId(agvId);
+ } else {
+ codeList = ALL_CODE_DATA_CACHE;
+ }
Collections.shuffle(codeList);
for (String endCodeData : codeList) {
--
Gitblit v1.9.1