From 78843030000790e42210069dc7bcce9c246967a8 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期三, 12 十一月 2025 14:24:27 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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 2fdaf0b..7b10eb9 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
@@ -4,7 +4,6 @@
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
-import com.zy.acs.manager.core.constant.AgvAreaDispatcher;
import com.zy.acs.manager.core.cache.CoreCache;
import com.zy.acs.manager.core.domain.CodeStepDto;
import com.zy.acs.manager.core.domain.type.JobType;
@@ -200,14 +199,12 @@
Code startCode = codeService.getCacheById(agvDetail.getRecentCode());
- List<String> codeList = AgvAreaDispatcher.AGV_AREA.get(agvNo);
- List<String> disableCodeList = AgvAreaDispatcher.AGV_DISABLE_AREA.get(agvNo);
- if (!Cools.isEmpty(codeList)) {
- Collections.shuffle(codeList);
- }
+ Set<String> notInCodeSet = new HashSet<>();
- for (String endCodeData : codeList) {
- if (disableCodeList.contains(endCodeData)) { continue; }
+ Collections.shuffle(CODE_DATA_CACHE);
+
+ for (String endCodeData : CODE_DATA_CACHE) {
+ if (notInCodeSet.contains(endCodeData)) { continue; }
Code endCode = codeService.getCacheByData(endCodeData);
// valid lane
@@ -222,7 +219,7 @@
}
}
- return codeList.stream().findFirst().orElse(null);
+ return CODE_DATA_CACHE.stream().findFirst().orElse(null);
}
// ---------------------------------------------------------------------------
--
Gitblit v1.9.1