From 92a36252bf8e4e484cf17abf6d12b4e86497f6e9 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期三, 10 十二月 2025 09:22:22 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 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 3bb25ad..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.common.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,12 +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);
-        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
@@ -220,7 +219,7 @@
             }
         }
 
-        return codeList.stream().findFirst().orElse(null);
+        return CODE_DATA_CACHE.stream().findFirst().orElse(null);
     }
 
     // ---------------------------------------------------------------------------
@@ -243,7 +242,7 @@
                 executePatrolLogic(agvNo);
 //                executeUShapeConveyor(agvNo);
             } catch (Exception e) {
-                log.error("鎵цAGV{}璺戝簱浠诲姟鏃跺彂鐢熷紓甯�: {}", agvNo, e.getMessage());
+                log.error("鎵цAGV{}璺戝簱浠诲姟鏃跺彂鐢熷紓甯�", agvNo, e);
             }
         };
 

--
Gitblit v1.9.1