From abcb19ee0cf2659981516133a1a9e7b163f529ce Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 24 一月 2026 08:21:14 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 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 d091a78..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;
@@ -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)) {
+ 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,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