From 87e2c5cc992ea090c574417725db55e9ac704705 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 07 一月 2026 08:50:31 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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..002673a 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
@@ -65,7 +65,15 @@
}
List<Long> areaIds = areaGovernService.queryAreas(code);
List<Long> agvIds = areaAgvService.queryAgvIdsByAreaIds(areaIds);
- agvIds.addAll(areaAgvService.findAgvIdsWithoutAreaAgv());
+ List<Long> agvIdsWithoutAreaAgv = areaAgvService.findAgvIdsWithoutAreaAgv();
+ if (agvIdsWithoutAreaAgv.isEmpty()) {
+ return agvIds;
+ }else {
+ if (agvIds.isEmpty()){
+ return agvIdsWithoutAreaAgv;
+ }
+ }
+ agvIds.addAll(agvIdsWithoutAreaAgv);
return agvIds;
}
@@ -79,9 +87,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