From 590a64af2cdd33427ed8eda2eb983b07dd60ab8b Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期五, 16 一月 2026 12:05:12 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 5ddf526..605293b 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,6 +29,8 @@
private AreaGovernService areaGovernService;
@Autowired
private AreaAgvService areaAgvService;
+ @Autowired
+ private CodeService codeService;
@PostConstruct
public void init() {
@@ -42,26 +46,30 @@
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();
+ return new ArrayList<>();
}
List<Long> areaIds = areaGovernService.queryAreas(code);
List<Long> agvIds = areaAgvService.queryAgvIdsByAreaIds(areaIds);
--
Gitblit v1.9.1