From 7b6dabd2ac8b30edf695e0d09c22129c16961f84 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 28 十月 2024 14:00:00 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java | 75 ++++++++++++++++++++++++++++++++++++-
1 files changed, 72 insertions(+), 3 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 5e7cbd4..93f3c33 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
@@ -17,6 +17,7 @@
import org.springframework.stereotype.Service;
import java.util.*;
+import java.util.stream.Collectors;
/**
* Created by vincent on 8/12/2024
@@ -67,12 +68,16 @@
return result;
}
+ /**
+ * it can break the limit of the number of agv backpack
+ */
public synchronized Agv execute(Task task) {
List<Agv> availableAgvList = getAvailableAgv();
if (Cools.isEmpty(availableAgvList)) {
log.warn("No available agv to assign the task[{}]", task.getSeqNum());
return null;
}
+ List<String> availableAgvNos = availableAgvList.stream().map(Agv::getUuid).distinct().collect(Collectors.toList());
Integer maxAgvCountInLane = configService.getVal("maxAgvCountInLane", Integer.class);
@@ -80,11 +85,63 @@
Lane originLane = taskService.checkoutOriginLane(task);
Lane destinationLane = taskService.checkoutDestinationLane(task);
+
// allocate about origin
- taskService.findTasksByLaneHash(originLane.getHashCode());
+ List<String> availableAgvNosByOriLane = new ArrayList<>(availableAgvNos);
+ if (null != originLane) {
+ List<String> agvNosByOriLane = findAgvNosByLane(originLane); // the agv list that had tasks in this lane
+ if (!Cools.isEmpty(agvNosByOriLane) && agvNosByOriLane.size() >= maxAgvCountInLane) {
+
+ availableAgvNosByOriLane = Cools.getIntersection(agvNosByOriLane, availableAgvNos);
+ availableAgvNosByOriLane = availableAgvNosByOriLane.stream().filter(agvNo -> {
+ Agv agv = agvService.selectByUuid(agvNo);
+
+ return agv.getStatus() == 1;
+ }).collect(Collectors.toList());
+ }
+ }
+
// allocate about destination
- taskService.findTasksByLaneHash(destinationLane.getHashCode());
+ List<String> availableAgvNosByDestLane = new ArrayList<>(availableAgvNos);
+ if (null != destinationLane) {
+ List<String> agvNosByDestLane = findAgvNosByLane(destinationLane);
+ if (!Cools.isEmpty(agvNosByDestLane) && agvNosByDestLane.size() >= maxAgvCountInLane) {
+
+ availableAgvNosByDestLane = Cools.getIntersection(agvNosByDestLane, availableAgvNos);
+ availableAgvNosByDestLane = availableAgvNosByDestLane.stream().filter(agvNo -> {
+ Agv agv = agvService.selectByUuid(agvNo);
+
+ return agv.getStatus() == 1;
+ }).collect(Collectors.toList());
+ }
+ }
+
+ // valid
+ if (Cools.isEmpty(availableAgvNosByOriLane)) {
+ log.warn("No available agv to assign the task origin[{}]", task.getSeqNum());
+ return null;
+ }
+ if (Cools.isEmpty(availableAgvNosByDestLane)) {
+ log.warn("No available agv to assign the task destination[{}]", task.getSeqNum());
+ return null;
+ }
+
+ List<String> actualAvailableAgvNos = Cools.getIntersection(availableAgvNosByOriLane, availableAgvNosByDestLane);
+ if (Cools.isEmpty(actualAvailableAgvNos)) {
+ log.warn("No available agv to assign the task[{}]", task.getSeqNum());
+ return null;
+ }
+
+ actualAvailableAgvNos.sort(new Comparator<String>() {
+ @Override
+ public int compare(String o1, String o2) {
+ return 0;
+ }
+ });
+
+ String s = actualAvailableAgvNos.stream().findFirst().orElse(null);
+
/**
* 1. 鍒ゆ柇task鐨勮捣濮嬬偣鍜岀洰鐨勭偣鎵�鍦ㄧ殑宸烽亾鎵胯浇浠诲姟鏁伴噺锛�
@@ -95,13 +152,25 @@
* 鍒ゆ柇閫昏緫锛氳儗绡撴暟閲忔渶灏戠殑灏忚溅杞鐨勬椂鍊欙紝浼樺厛绾ф渶楂�
*/
-
task.setOriLaneHash(originLane.getHashCode());
task.setDestLaneHash(destinationLane.getHashCode());
return null;
}
+ private List<String> findAgvNosByLane(Lane lane) {
+ if (null == lane) {
+ return null;
+ }
+ List<Task> taskList = taskService.findRunningTasksByLaneHash(lane.getHashCode());
+ if (Cools.isEmpty(taskList)) {
+ return null;
+ }
+ return taskList.stream().map(task -> {
+ return agvService.getById(task.getAgvId()).getUuid();
+ }).distinct().collect(Collectors.toList());
+ }
+
public synchronized Agv execute(Task task, Map<String, List<Long>> taskAllot, List<Long> taskIds) {
String oriLocNo = task.getOriLoc$();
int oriLocRow = LocUtils.getRow(oriLocNo);
--
Gitblit v1.9.1