From 4c9169967a879b54c04b0754ab9830a5a6baa708 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 18 三月 2025 14:30:48 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java
index 5d6cdb2..e396ba6 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java
@@ -177,10 +177,10 @@
return new ArrayList<>();
}
return agvNoList.stream().filter(agvNo -> {
- Agv agv = agvService.selectByUuid(agvNo);
+ Long agvId = agvService.getAgvId(agvNo);
+ int transportTasksCount = taskService.findTransportTasksCountByAgv(agvId);
AgvModel agvModel = agvModelService.getByAgvNo(agvNo);
- List<Task> transportTasks = taskService.findTransportTasksByAgv(agv.getId());
- return transportTasks.size() < agvModel.getBackpack();
+ return transportTasksCount < agvModel.getBackpack();
}).collect(Collectors.toList());
}
@@ -190,15 +190,15 @@
Long agvId = agvService.getAgvId(agvNo);
// backpack
- List<Task> transportTasks = taskService.findTransportTasksByAgv(agvId);
- if (!Cools.isEmpty(transportTasks)) {
- weight = weight + transportTasks.size() * 100000;
+ Integer transportTasksCount = taskService.findTransportTasksCountByAgv(agvId);
+ if (!Cools.isEmpty(transportTasksCount)) {
+ weight = weight + transportTasksCount * 100000;
}
// distance
// from
AgvDetail agvDetail = agvDetailService.selectByAgvId(agvId);
- Code agvCurrCode = codeService.getById(agvDetail.getRecentCode());
+ Code agvCurrCode = codeService.getCacheById(agvDetail.getRecentCode());
Double[] fromPosition = new Double[]{agvCurrCode.getX(), agvCurrCode.getY()};
// to
Code firstCode = null;
@@ -207,20 +207,20 @@
case LOC_TO_LOC:
case LOC_TO_STA:
Loc oriLoc = locService.getById(task.getOriLoc());
- firstCode = codeService.getById(oriLoc.getCode());
+ firstCode = codeService.getCacheById(oriLoc.getCode());
break;
case STA_TO_LOC:
case STA_TO_STA:
Sta oriSta = staService.getById(task.getOriSta());
- firstCode = codeService.getById(oriSta.getCode());
+ firstCode = codeService.getCacheById(oriSta.getCode());
break;
case TO_CHARGE:
case TO_STANDBY:
case MOVE:
- firstCode = codeService.getById(task.getDestCode());
+ firstCode = codeService.getCacheById(task.getDestCode());
break;
default:
- firstCode = codeService.getById(task.getDestCode());
+ firstCode = codeService.getCacheById(task.getDestCode());
break;
}
assert null != firstCode;
--
Gitblit v1.9.1