From 4d45de01e35f8b271e5ba25439b574a8b67bc5eb Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期五, 26 十二月 2025 14:00:55 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 58f74b5..e053b75 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
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.common.utils.CommonUtil;
-import com.zy.acs.manager.core.constant.AgvAreaDispatcher;
import com.zy.acs.manager.core.domain.Lane;
import com.zy.acs.manager.core.domain.TaskPosDto;
import com.zy.acs.manager.manager.entity.*;
@@ -50,21 +49,24 @@
/**
* get available agv list which is idle
*/
- private List<String> getAvailableAgvNos(List<String> agvNos) {
- List<Agv> agvList = new ArrayList<>();
- if (Cools.isEmpty(agvNos)) {
- // global
- agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
- } else {
- // local
- agvList = agvNos.stream().map(agvService::selectByUuid).filter(Agv::getStatusBool).collect(Collectors.toList());
+ private List<String> getAvailableAgvNos(List<Long> agvIds) {
+// 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(agvIds)
+ ? agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val))
+ : agvIds.stream().map(agvService::getById).filter(Agv::getStatusBool).collect(Collectors.toList());
List<String> result = new ArrayList<>();
for (Agv agv : agvList) {
@@ -87,6 +89,7 @@
}
if (!Cools.isEmpty(result)) {
+ // todo: 杞鏉冮噸
Collections.shuffle(result);
}
@@ -104,6 +107,7 @@
*/
public synchronized Agv execute(Task 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