From 43412c20ac444392471ea8ea8bc4a93af39efe87 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 19 一月 2026 13:17:27 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java | 23 +++++++++++++++++++----
1 files changed, 19 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 605293b..22a9888 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
@@ -36,7 +36,7 @@
public void init() {
}
- public List<Long> getAgvNosByTask(Task task) {
+ public List<Long> getAgvIdsByTask(Task task) {
if (null == task) {
return null;
}
@@ -67,11 +67,11 @@
return null;
}
- public List<Long> getAgvIdsByCode(String code) {
- if (Cools.isEmpty(code)) {
+ public List<Long> getAgvIdsByCode(String codeData) {
+ if (Cools.isEmpty(codeData)) {
return new ArrayList<>();
}
- List<Long> areaIds = areaGovernService.queryAreas(code);
+ List<Long> areaIds = areaGovernService.queryAreas(codeData);
List<Long> agvIds = areaAgvService.queryAgvIdsByAreaIds(areaIds);
agvIds.addAll(areaAgvService.findAgvIdsWithoutAreaAgv());
return agvIds;
@@ -81,6 +81,21 @@
return null;
}
+ public Boolean match(Long agvId, Long codeId) {
+ Code code = codeService.getCacheById(codeId);
+ if (Cools.isEmpty(agvId, code)) {
+ return false;
+ }
+ List<Long> agvIds = this.getAgvIdsByCode(code.getData());
+ if (Cools.isEmpty(agvIds)) {
+ return false;
+ }
+ if (!agvIds.contains(agvId)) {
+ return false;
+ }
+ return true;
+ }
+
// 濡傛灉閮芥病鏈夊懡涓紝灏辫繑鍥炲叏閮╟ode
public List<String> getCodesByAgvId(Long agvId) {
List<Long> areaIds = areaAgvService.queryAreaIdsByAgvId(agvId);
--
Gitblit v1.9.1