From 1bc33546a044cbc84dd9595c19dbcd9a4e309fc9 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期六, 10 一月 2026 14:06:10 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java | 51 +++++++++++++++++++++++++++++----------------------
1 files changed, 29 insertions(+), 22 deletions(-)
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 7b10eb9..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<>();
@@ -73,6 +73,24 @@
private ConfigService configService;
@Autowired
private AgvModelService agvModelService;
+ @Autowired
+ private AgvAreaDispatcher agvAreaDispatcher;
+
+ @PostConstruct
+ public void init() {
+ int count = agvService.count(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
+ if (count > 0) {
+ this.scheduler = Executors.newScheduledThreadPool(count);
+ }
+ // init all code data
+ List<Code> codeList = codeService.list(new LambdaQueryWrapper<Code>().eq(Code::getStatus, StatusType.ENABLE.val));
+ this.ALL_CODE_DATA_CACHE = codeList.stream().map(Code::getData).distinct().collect(Collectors.toList());
+
+ // int all loc code data
+ List<Code> locCodeList = codeService.getAllLocCode();
+ this.LOC_CODE_DATA_CACHE = locCodeList.stream().map(Code::getData).distinct().collect(Collectors.toList());
+
+ }
// pick & drop logic --------------------------------------------------
@@ -196,14 +214,19 @@
* 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 = null;
+ if (agvAreaDispatcher.isAgvExistsInAnyArea(agvId)) {
+ codeList = agvAreaDispatcher.getCodesByAgvId(agvId);
+ } else {
+ codeList = ALL_CODE_DATA_CACHE;
+ }
+ Collections.shuffle(codeList);
- for (String endCodeData : CODE_DATA_CACHE) {
+ for (String endCodeData : codeList) {
if (notInCodeSet.contains(endCodeData)) { continue; }
Code endCode = codeService.getCacheByData(endCodeData);
@@ -219,7 +242,7 @@
}
}
- return CODE_DATA_CACHE.stream().findFirst().orElse(null);
+ return codeList.stream().findFirst().orElse(null);
}
// ---------------------------------------------------------------------------
@@ -273,22 +296,6 @@
log.error("鏈兘鎴愬姛鍋滄AGV " + agvNo + " 鐨勮窇搴撲换鍔°��");
return R.error("鏈兘鎴愬姛鍋滄AGV " + agvNo + " 鐨勮窇搴撲换鍔°��");
}
- }
-
- @PostConstruct
- public void init() {
- int count = agvService.count(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
- if (count > 0) {
- this.scheduler = Executors.newScheduledThreadPool(count);
- }
- // 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());
-
- // int all loc code data
- List<Code> locCodeList = codeService.getAllLocCode();
- this.LOC_CODE_DATA_CACHE = locCodeList.stream().map(Code::getData).distinct().collect(Collectors.toList());
-
}
@PreDestroy
--
Gitblit v1.9.1