From c514b7d8ad8a3f89b81c949e265446b4f09a4bb5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 20 十一月 2024 16:46:30 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java | 132 ++++++++++----------------------------------
1 files changed, 30 insertions(+), 102 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 c62fe74..744917b 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
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.acs.framework.common.Cools;
-import com.zy.acs.manager.common.utils.LocUtils;
+import com.zy.acs.manager.common.utils.CommonUtil;
import com.zy.acs.manager.core.domain.Lane;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.StatusType;
@@ -102,7 +102,8 @@
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) {
+ // if full lane
+ if (agvNosByOriLane.size() >= maxAgvCountInLane) {
availableAgvNosByOriLane = Cools.getIntersection(agvNosByOriLane, availableAgvNos);
}
@@ -115,7 +116,7 @@
List<String> availableAgvNosByDestLane = new ArrayList<>(availableAgvNos);
if (null != destinationLane) {
List<String> agvNosByDestLane = findAgvNosByLane(destinationLane);
- if (!Cools.isEmpty(agvNosByDestLane) && agvNosByDestLane.size() >= maxAgvCountInLane) {
+ if (agvNosByDestLane.size() >= maxAgvCountInLane) {
availableAgvNosByDestLane = Cools.getIntersection(agvNosByDestLane, availableAgvNos);
}
@@ -131,7 +132,6 @@
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());
@@ -157,17 +157,18 @@
return agvService.selectByUuid(actualAvailableAgvNos.stream().findFirst().orElse(null));
}
- private List<String> findAgvNosByLane(Lane lane) {
+ public List<String> findAgvNosByLane(Lane lane) {
if (null == lane) {
- return null;
+ return new ArrayList<>();
}
List<Task> taskList = taskService.findRunningTasksByLaneHash(lane.getHashCode());
if (Cools.isEmpty(taskList)) {
- return null;
+ return new ArrayList<>();
}
- return taskList.stream().map(task -> {
- return agvService.getById(task.getAgvId()).getUuid();
- }).distinct().collect(Collectors.toList());
+ return taskList.stream()
+ .map(task -> agvService.getById(task.getAgvId()).getUuid())
+ .distinct()
+ .collect(Collectors.toList());
}
private List<String> validBackpackLimit(List<String> agvNoList) {
@@ -177,8 +178,8 @@
return agvNoList.stream().filter(agvNo -> {
Agv agv = agvService.selectByUuid(agvNo);
AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
- List<Task> runningTasks = taskService.findRunningTasksByAgv(agv.getId());
- return runningTasks.size() < agvModel.getBackpack();
+ List<Task> transportTasks = taskService.findTransportTasksByAgv(agv.getId());
+ return transportTasks.size() < agvModel.getBackpack();
}).collect(Collectors.toList());
}
@@ -188,9 +189,9 @@
Agv agv = agvService.selectByUuid(agvNo);
// backpack
- List<Task> runningTasks = taskService.findRunningTasksByAgv(agv.getId());
- if (!Cools.isEmpty(runningTasks)) {
- weight = weight + runningTasks.size() * 100000;
+ List<Task> transportTasks = taskService.findTransportTasksByAgv(agv.getId());
+ if (!Cools.isEmpty(transportTasks)) {
+ weight = weight + transportTasks.size() * 100000;
}
// distance
@@ -224,99 +225,26 @@
assert null != firstCode;
Double[] toPosition = new Double[]{firstCode.getX(), firstCode.getY()};
// calculate distance
- weight = weight + this.calcPositionDistance(fromPosition, toPosition);
+ weight = weight + CommonUtil.calcDistance(fromPosition, toPosition);
// return opposite
return -weight;
}
- private int calcPositionDistance(Double[] from, Double[] to) {
- return (int) (Math.abs(to[0] - from[0]) + Math.abs(to[1] - from[1]));
+ public Boolean validCapacityOfLane(Agv agv, Code code) {
+ Lane lane = laneService.search(code.getData());
+ if (null != lane) {
+ Integer maxAgvCountInLane = configService.getVal("maxAgvCountInLane", Integer.class);
+
+ List<String> agvNosByLane = this.findAgvNosByLane(lane);
+ agvNosByLane.remove(agv.getUuid());
+ if (agvNosByLane.size() >= maxAgvCountInLane) {
+ return false;
+ }
+ }
+
+ return true;
}
- public synchronized Agv execute(Task task, Map<String, List<Long>> taskAllot, List<Long> taskIds) {
- String oriLocNo = task.getOriLoc$();
- int oriLocRow = LocUtils.getRow(oriLocNo);
- String destLocNo = task.getDestLoc$();
- int destLocRow = LocUtils.getRow(destLocNo);
-
- Agv hit = null;
-
- List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
- Collections.shuffle(agvList);
- for (Agv agv : agvList) {
- AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
- int allotTaskCount = 0;
- List<Long> allotTaskIds = taskAllot.get(agv.getUuid());
- if (!Cools.isEmpty(allotTaskIds)) {
- allotTaskCount = allotTaskIds.size();
- }
- if (allotTaskCount >= agvModel.getBackpack()) {
- continue;
- }
- if (taskService.count(new LambdaQueryWrapper<Task>()
- .eq(Task::getAgvId, agv.getId())
- .notIn(Task::getId, taskIds)
- .and(i -> {
- i.eq(Task::getTaskSts, TaskStsType.WAITING.val()) // 宸茬粡鏈墂aiting浠诲姟鐨勮溅涓嶈兘鍐嶅垎閰�
- .or().eq(Task::getTaskSts, TaskStsType.ASSIGN.val())
- .or().eq(Task::getTaskSts, TaskStsType.PROGRESS.val());
- })) > 0) {
- log.info(agv.getUuid() + "鍙稟GV涓嶅彲鐢紝宸茬粡瀛樺湪杩涜涓殑浠诲姟...");
- continue;
- }
- if (!agvService.judgeEnable(agv.getId(), true)) {
- log.info(agv.getUuid() + "鍙稟GV涓嶅彲鐢紝" + task.getSeqNum() + "浠诲姟鏃犳硶璁＄畻...");
- continue;
- }
-
- hit = agv;
- break;
- }
-
- return hit;
- }
-
- public synchronized Agv execute1(Task task, Map<String, List<Long>> taskAllot, List<Long> taskIds) {
- String oriLocNo = task.getOriLoc$();
- int oriLocRow = LocUtils.getRow(oriLocNo);
- String destLocNo = task.getDestLoc$();
- int destLocRow = LocUtils.getRow(destLocNo);
-
- Agv agv = null;
- if (oriLocRow <= 2 && destLocRow <= 2) {
- agv = agvService.selectByUuid(String.valueOf(1));
- }
- if (oriLocRow > 2 && destLocRow > 2) {
- agv = agvService.selectByUuid(String.valueOf(2));
- }
- assert agv != null;
- AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
- int allotTaskCount = 0;
- List<Long> allotTaskIds = taskAllot.get(agv.getUuid());
- if (!Cools.isEmpty(allotTaskIds)) {
- allotTaskCount = allotTaskIds.size();
- }
- if (allotTaskCount >= agvModel.getBackpack()) {
- return null;
- }
- if (taskService.count(new LambdaQueryWrapper<Task>()
- .eq(Task::getAgvId, agv.getId())
- .notIn(Task::getId, taskIds)
- .and(i -> {
- i.eq(Task::getTaskSts, TaskStsType.WAITING.val()) // 宸茬粡鏈墂aiting浠诲姟鐨勮溅涓嶈兘鍐嶅垎閰�
- .or().eq(Task::getTaskSts, TaskStsType.ASSIGN.val())
- .or().eq(Task::getTaskSts, TaskStsType.PROGRESS.val());
- })) > 0) {
- log.info(agv.getUuid() + "鍙稟GV涓嶅彲鐢紝宸茬粡瀛樺湪杩涜涓殑浠诲姟...");
- return null;
- }
- if (!agvService.judgeEnable(agv.getId(), true)) {
- log.info(agv.getUuid() + "鍙稟GV涓嶅彲鐢紝" + task.getSeqNum() + "浠诲姟鏃犳硶璁＄畻...");
- return null;
- }
-
- return agv;
- }
}
--
Gitblit v1.9.1