From 2de9e897274f93ef5e90eaa068ab8645dea2de39 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 18 十二月 2025 15:40:33 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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 e4b225b..2035ddc 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,6 @@
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -65,16 +64,24 @@
return Collections.emptyList();
}
List<Long> areaIds = areaGovernService.queryAreas(code);
- return areaAgvService.queryAgvIdsByAreaIds(areaIds);
+ List<Long> agvIds = areaAgvService.queryAgvIdsByAreaIds(areaIds);
+ agvIds.addAll(areaAgvService.findAgvIdsWithoutAreaAgv());
+ return agvIds;
}
public List<String> getAgvNosByStaNo(String staNo) {
return null;
}
- public List<String> getAreaCodeListByAgvNo(String agvNo) {
- List<String> areaCodeList = new ArrayList<>();
- return areaCodeList;
+ // 濡傛灉閮芥病鏈夊懡涓紝灏辫繑鍥炲叏閮╟ode
+ public List<String> getCodesByAgvId(Long agvId) {
+ List<Long> areaIds = areaAgvService.queryAreaIdsByAgvId(agvId);
+ return areaGovernService.queryCodes(areaIds);
+ }
+
+ public Boolean isAgvExistsInAnyArea(Long agvId) {
+ List<Long> agvIdsWithoutAreaAgv = areaAgvService.findAgvIdsWithoutAreaAgv();
+ return !Cools.isEmpty(agvIdsWithoutAreaAgv) && agvIdsWithoutAreaAgv.contains(agvId);
}
}
--
Gitblit v1.9.1