From ebd2f4397a92c6a5096de1b86d59154363344720 Mon Sep 17 00:00:00 2001 From: vincentlu <t1341870251@gmail.com> Date: 星期二, 13 五月 2025 08:48:15 +0800 Subject: [PATCH] # --- zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 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..2fdaf0b 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,7 @@ 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.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; @@ -202,7 +202,9 @@ List<String> codeList = AgvAreaDispatcher.AGV_AREA.get(agvNo); List<String> disableCodeList = AgvAreaDispatcher.AGV_DISABLE_AREA.get(agvNo); - Collections.shuffle(codeList); + if (!Cools.isEmpty(codeList)) { + Collections.shuffle(codeList); + } for (String endCodeData : codeList) { if (disableCodeList.contains(endCodeData)) { continue; } @@ -243,7 +245,7 @@ executePatrolLogic(agvNo); // executeUShapeConveyor(agvNo); } catch (Exception e) { - log.error("鎵цAGV{}璺戝簱浠诲姟鏃跺彂鐢熷紓甯�: {}", agvNo, e.getMessage()); + log.error("鎵цAGV{}璺戝簱浠诲姟鏃跺彂鐢熷紓甯�", agvNo, e); } }; -- Gitblit v1.9.1