From a71d7a7a4b437a718e68ec41dcecd30ee7ff55e7 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期日, 04 一月 2026 09:45:30 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java
index 2035ddc..d091a78 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java
@@ -12,7 +12,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
-import java.util.Collections;
+import java.util.ArrayList;
import java.util.List;
@Slf4j
@@ -61,7 +61,7 @@
public List<Long> getAgvIdsByCode(String code) {
if (Cools.isEmpty(code)) {
- return Collections.emptyList();
+ return new ArrayList<>();
}
List<Long> areaIds = areaGovernService.queryAreas(code);
List<Long> agvIds = areaAgvService.queryAgvIdsByAreaIds(areaIds);
@@ -79,9 +79,13 @@
return areaGovernService.queryCodes(areaIds);
}
+ // 鍒ゆ柇杞﹁締鏄惁琚玜rea缁戝畾锛屽鏋滅粦瀹氳繑鍥� true锛� 濡傛灉娌＄粦瀹氳繑鍥� false
public Boolean isAgvExistsInAnyArea(Long agvId) {
- List<Long> agvIdsWithoutAreaAgv = areaAgvService.findAgvIdsWithoutAreaAgv();
- return !Cools.isEmpty(agvIdsWithoutAreaAgv) && agvIdsWithoutAreaAgv.contains(agvId);
+ List<Long> agvIdsWithoutAreaAgv = areaAgvService.findAgvIdsWithoutAreaAgv(); // 娌℃湁琚粦瀹氱殑杞﹁締闆嗗悎
+ if (Cools.isEmpty(agvIdsWithoutAreaAgv)) {
+ return true;
+ }
+ return !agvIdsWithoutAreaAgv.contains(agvId);
}
}
--
Gitblit v1.9.1