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/PatrolService.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 104eb4b..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<>();
@@ -74,9 +74,7 @@
@Autowired
private AgvModelService agvModelService;
@Autowired
- private AreaAgvService areaAgvService;
- @Autowired
- private AreaGovernService areaGovernService;
+ private AgvAreaDispatcher agvAreaDispatcher;
@PostConstruct
public void init() {
@@ -86,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();
@@ -216,14 +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<Long> areaIds = areaAgvService.queryAreaIdsByAgvId(agvDetail.getAgvId());
- List<String> codeList = areaGovernService.queryCodes(areaIds);
+ 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