From b1dd4c6e284244bd7224e2c050a9670fbd9a38ea Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 19 一月 2026 16:21:49 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java |   51 +++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 39 insertions(+), 12 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..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
@@ -1,10 +1,12 @@
 package com.zy.acs.manager.core.service;
 
 import com.zy.acs.framework.common.Cools;
+import com.zy.acs.manager.manager.entity.Code;
 import com.zy.acs.manager.manager.entity.Loc;
 import com.zy.acs.manager.manager.entity.Sta;
 import com.zy.acs.manager.manager.entity.Task;
 import com.zy.acs.manager.manager.service.AreaAgvService;
+import com.zy.acs.manager.manager.service.CodeService;
 import com.zy.acs.manager.manager.service.LocService;
 import com.zy.acs.manager.manager.service.StaService;
 import lombok.extern.slf4j.Slf4j;
@@ -12,7 +14,7 @@
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
-import java.util.Collections;
+import java.util.ArrayList;
 import java.util.List;
 
 @Slf4j
@@ -27,12 +29,14 @@
     private AreaGovernService areaGovernService;
     @Autowired
     private AreaAgvService areaAgvService;
+    @Autowired
+    private CodeService codeService;
 
     @PostConstruct
     public void init() {
     }
 
-    public List<Long> getAgvNosByTask(Task task) {
+    public List<Long> getAgvIdsByTask(Task task) {
         if (null == task) {
             return null;
         }
@@ -42,28 +46,32 @@
         Sta destSta = null;
         if (null != task.getOriLoc()) {
             oriLoc = locService.getById(task.getOriLoc());
-            return this.getAgvIdsByCode(oriLoc.getCode$());
+            Code code = codeService.getCacheById(oriLoc.getCode());
+            return this.getAgvIdsByCode(code.getData());
         }
         if (null != task.getOriSta()) {
             oriSta = staService.getById(task.getOriSta());
-            return this.getAgvIdsByCode(oriSta.getCode$());
+            Code code = codeService.getCacheById(oriSta.getCode());
+            return this.getAgvIdsByCode(code.getData());
         }
         if (null != task.getDestLoc()) {
             destLoc = locService.getById(task.getDestLoc());
-            return this.getAgvIdsByCode(destLoc.getCode$());
+            Code code = codeService.getCacheById(destLoc.getCode());
+            return this.getAgvIdsByCode(code.getData());
         }
         if (null != task.getDestSta()) {
             destSta = staService.getById(task.getDestSta());
-            return this.getAgvIdsByCode(destSta.getCode$());
+            Code code = codeService.getCacheById(destSta.getCode());
+            return this.getAgvIdsByCode(code.getData());
         }
         return null;
     }
 
-    public List<Long> getAgvIdsByCode(String code) {
-        if (Cools.isEmpty(code)) {
-            return Collections.emptyList();
+    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;
@@ -73,15 +81,34 @@
         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);
         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