From 7b4ef38e8e644cfd06f4a264333c791af1cdff5f Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 18 十一月 2025 17:27:56 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 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 b8cc3ef..30cf8bb 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
@@ -51,17 +51,23 @@
* get available agv list which is idle
*/
private List<String> getAvailableAgvNos(List<String> agvNos) {
- List<Agv> agvList = new ArrayList<>();
- if (Cools.isEmpty(agvNos)) {
- agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
- } else {
- for (String agvNo : agvNos) {
- Agv agv = agvService.selectByUuid(agvNo);
- if (agv.getStatusBool()) {
- agvList.add(agv);
- }
- }
- }
+// List<Agv> agvList = new ArrayList<>();
+// if (Cools.isEmpty(agvNos)) {
+// // global
+// agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
+// } else {
+// // local
+// for (String agvNo : agvNos) {
+// Agv agv = agvService.selectByUuid(agvNo);
+// if (agv.getStatusBool()) {
+// agvList.add(agv);
+// }
+// }
+// }
+
+ List<Agv> agvList = Cools.isEmpty(agvNos)
+ ? agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val))
+ : agvNos.stream().map(agvService::selectByUuid).filter(Agv::getStatusBool).collect(Collectors.toList());
List<String> result = new ArrayList<>();
for (Agv agv : agvList) {
@@ -100,7 +106,8 @@
* it can break the limit of the number of agv backpack
*/
public synchronized Agv execute(Task task) {
- List<String> availableAgvNos = this.getAvailableAgvNos(agvAreaDispatcher.getAgvNosByTask(task));
+// List<String> availableAgvNos = this.getAvailableAgvNos(agvAreaDispatcher.getAgvNosByTask(task));
+ List<String> availableAgvNos = this.getAvailableAgvNos(null);
if (Cools.isEmpty(availableAgvNos)) {
// log.warn("No available agv to assign the task[{}]", task.getSeqNum());
return null;
--
Gitblit v1.9.1