From 1bbfdfcecf243ba36512b59da80e41602ad50263 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 19 一月 2026 13:46:10 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java | 63 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 30 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 0bbbe3d..0dc1f6f 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
@@ -5,7 +5,7 @@
import com.zy.acs.manager.common.utils.CommonUtil;
import com.zy.acs.manager.core.domain.AgvCntDto;
import com.zy.acs.manager.core.domain.FilterLaneDto;
-import com.zy.acs.manager.core.domain.Lane;
+import com.zy.acs.manager.core.domain.LaneDto;
import com.zy.acs.manager.core.domain.TaskPosDto;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.*;
@@ -45,7 +45,7 @@
@Autowired
private LocService locService;
@Autowired
- private LaneService laneService;
+ private LaneBuilder laneBuilder;
@Autowired
private AgvAreaDispatcher agvAreaDispatcher;
@Autowired
@@ -121,7 +121,7 @@
return null;
}
- List<String> availableAgvNos = this.getAvailableAgvNos(agvAreaDispatcher.getAgvNosByTask(task), true);
+ List<String> availableAgvNos = this.getAvailableAgvNos(agvAreaDispatcher.getAgvIdsByTask(task), true);
FilterLaneDto filterLaneDto = this.filterThroughLane(task, availableAgvNos);
if (filterLaneDto == null) {
return null;
@@ -135,11 +135,11 @@
}
// record lane hash for later dispatch/traffic-control logic
- if (filterLaneDto.getOriginLane() != null) {
- task.setOriLaneHash(filterLaneDto.getOriginLane().getHashCode());
+ if (filterLaneDto.getOriginLaneDto() != null) {
+ task.setOriLaneHash(filterLaneDto.getOriginLaneDto().getHashCode());
}
- if (filterLaneDto.getDestinationLane() != null) {
- task.setDestLaneHash(filterLaneDto.getDestinationLane().getHashCode());
+ if (filterLaneDto.getDestinationLaneDto() != null) {
+ task.setDestLaneHash(filterLaneDto.getDestinationLaneDto().getHashCode());
}
return agvNo;
@@ -155,7 +155,7 @@
* it can break the limit of the number of agv backpack
*/
public synchronized String normalExecute(Task task) {
- List<String> availableAgvNos = this.getAvailableAgvNos(agvAreaDispatcher.getAgvNosByTask(task), false);
+ List<String> availableAgvNos = this.getAvailableAgvNos(agvAreaDispatcher.getAgvIdsByTask(task), false);
// List<String> availableAgvNos = this.getAvailableAgvNos(null);
if (Cools.isEmpty(availableAgvNos)) {
// log.warn("No available agv to assign the task[{}]", task.getSeqNum());
@@ -167,21 +167,24 @@
if (null == filterLaneDto) {
return null;
}
- Lane originLane = filterLaneDto.getOriginLane();
- Lane destinationLane = filterLaneDto.getDestinationLane();
+ LaneDto originLaneDto = filterLaneDto.getOriginLaneDto();
+ LaneDto destinationLaneDto = filterLaneDto.getDestinationLaneDto();
List<String> actualAvailableAgvNos = filterLaneDto.getActualAvailableAgvNos();
if (Cools.isEmpty(actualAvailableAgvNos)) {
return null;
}
// choose min number of running task
- actualAvailableAgvNos.sort(Comparator.comparingInt(agvNo -> calcAllocateWeight(agvNo, task)));
+ actualAvailableAgvNos.sort((o1, o2) -> Integer.compare(
+ calcAllocateWeight(o2, task),
+ calcAllocateWeight(o1, task)
+ ));
- if (null != originLane) {
- task.setOriLaneHash(originLane.getHashCode());
+ if (null != originLaneDto) {
+ task.setOriLaneHash(originLaneDto.getHashCode());
}
- if (null != destinationLane) {
- task.setDestLaneHash(destinationLane.getHashCode());
+ if (null != destinationLaneDto) {
+ task.setDestLaneHash(destinationLaneDto.getHashCode());
}
return actualAvailableAgvNos.get(0);
@@ -225,8 +228,8 @@
// has enough backpack space to load
Integer backpack = agvService.getBackpack(agvId);
- int countRemainingBackpack = segmentService.countRemainingBackpack(null, agvId);
- if (countRemainingBackpack >= backpack) {
+ List<Integer> usedBackpacks = segmentService.selectUsedBackpacks(null, agvId);
+ if (usedBackpacks.size() >= backpack) {
continue;
}
@@ -288,13 +291,13 @@
Integer maxAgvCountInLane = configService.getVal("maxAgvCountInLane", Integer.class);
// checkout lane
- Lane originLane = taskService.checkoutOriginLane(task);
- Lane destinationLane = taskService.checkoutDestinationLane(task);
+ LaneDto originLaneDto = taskService.checkoutOriginLane(task);
+ LaneDto destinationLaneDto = taskService.checkoutDestinationLane(task);
// allocate about origin
List<String> availableAgvNosByOriLane = new ArrayList<>(availableAgvNos);
- if (null != originLane) {
- List<String> agvNosByOriLane = findAgvNosByLane(originLane); // the agv list that had tasks in this lane
+ if (null != originLaneDto) {
+ List<String> agvNosByOriLane = findAgvNosByLane(originLaneDto); // the agv list that had tasks in this lane
// if full lane
if (agvNosByOriLane.size() >= maxAgvCountInLane) {
@@ -307,8 +310,8 @@
// allocate about destination
List<String> availableAgvNosByDestLane = new ArrayList<>(availableAgvNos);
- if (null != destinationLane) {
- List<String> agvNosByDestLane = findAgvNosByLane(destinationLane);
+ if (null != destinationLaneDto) {
+ List<String> agvNosByDestLane = findAgvNosByLane(destinationLaneDto);
if (agvNosByDestLane.size() >= maxAgvCountInLane) {
availableAgvNosByDestLane = Cools.getIntersection(agvNosByDestLane, availableAgvNos);
@@ -331,14 +334,14 @@
return null;
}
- return new FilterLaneDto(originLane, destinationLane, actualAvailableAgvNos);
+ return new FilterLaneDto(originLaneDto, destinationLaneDto, actualAvailableAgvNos);
}
- public List<String> findAgvNosByLane(Lane lane) {
- if (null == lane) {
+ public List<String> findAgvNosByLane(LaneDto laneDto) {
+ if (null == laneDto) {
return new ArrayList<>();
}
- List<Task> taskList = taskService.findRunningTasksByLaneHash(lane.getHashCode());
+ List<Task> taskList = taskService.findRunningTasksByLaneHash(laneDto.getHashCode());
if (Cools.isEmpty(taskList)) {
return new ArrayList<>();
}
@@ -409,11 +412,11 @@
}
public Boolean validCapacityOfLane(String agvNo, Code code) {
- Lane lane = laneService.search(code.getData());
- if (null != lane) {
+ LaneDto laneDto = laneBuilder.search(code.getData());
+ if (null != laneDto) {
Integer maxAgvCountInLane = configService.getVal("maxAgvCountInLane", Integer.class);
- List<String> agvNosByLane = this.findAgvNosByLane(lane);
+ List<String> agvNosByLane = this.findAgvNosByLane(laneDto);
agvNosByLane.remove(agvNo);
if (agvNosByLane.size() >= maxAgvCountInLane) {
return false;
--
Gitblit v1.9.1