From 337746fee651f91e9c63bd1c33a474c236d51889 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 06 十一月 2024 10:33:34 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java | 68 +++++++++++++--------------------
1 files changed, 27 insertions(+), 41 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
index c2ed10b..0325a9c 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
@@ -6,6 +6,7 @@
import com.zy.acs.framework.common.SnowflakeIdWorker;
import com.zy.acs.framework.exception.CoolException;
import com.zy.acs.manager.common.utils.MapDataUtils;
+import com.zy.acs.manager.core.domain.BlockVehicleDto;
import com.zy.acs.manager.core.domain.TaskPosDto;
import com.zy.acs.manager.core.service.astart.MapDataDispatcher;
import com.zy.acs.manager.core.service.astart.RetreatNavigateNode;
@@ -188,28 +189,6 @@
}
}
- public void callback(List<Segment> segmentList) {
- Date now = new Date();
-
- segmentList.stream().max(Comparator.comparingInt(Segment::getSerial)).ifPresent(segment -> {
- Segment nextSegment = segmentService.getNextStepOfInit(segment.getTravelId(), segment.getSerial());
-
- if (null != nextSegment) {
-
- nextSegment.setState(SegmentStateType.WAITING.toString());
- nextSegment.setUpdateTime(now);
- if (!segmentService.updateById(nextSegment)) {
- log.error("Segment [{}] 鏇存柊澶辫触 锛侊紒锛�", nextSegment.getGroupId() + " - " + nextSegment.getSerial());
- }
-
- } else {
-
- travelService.checkFinish(segment.getTravelId());
- }
- });
-
- }
-
private List<String> checkoutPath(Agv agv, Code startCode, Code endCode, Segment segment) {
Integer lev = null;
String agvNo = agv.getUuid();
@@ -232,13 +211,15 @@
} else {
// 鍙蛋琛岃矾寰勯泦鍚堣绠�
- List<String> blockVehicleList = this.slicePathAndReturnBlockVehicleList(lev, unlockPathList, agvNo, pathList); // jamAgvNo may was wave
+ List<BlockVehicleDto> blockVehicleList = this.slicePathAndReturnBlockVehicleList(lev, unlockPathList, agvNo, pathList); // jamAgvNo may was wave
if (!Cools.isEmpty(pathList)) {
- if (!pathList.get(pathList.size() - 1).equals(endCode.getData()) && !Cools.isEmpty(blockVehicleList)) {
- String blockAgvNo = blockVehicleList.get(0);
- if (mapDataDispatcher.queryCodeListFromDynamicNode(null, blockAgvNo).size() > 1 && pathList.size() <= MIN_SLICE_PATH_LENGTH) {
+ if (!pathList.get(pathList.size() - 1).equals(endCode.getData())) {
+
+ assert !Cools.isEmpty(blockVehicleList);
+ if (blockVehicleList.stream().anyMatch(blockVehicleDto -> !blockVehicleDto.isAvoidable())
+ && pathList.size() <= MIN_SLICE_PATH_LENGTH) {
pathList.clear();
}
}
@@ -249,9 +230,15 @@
// 闃诲杞﹁締鍒楄〃
assert !Cools.isEmpty(blockVehicleList);
- String blockAgvNo = blockVehicleList.get(0);
+ String blockAgvNo = blockVehicleList.stream()
+ .filter(BlockVehicleDto::isAvoidable)
+ .map(BlockVehicleDto::getVehicle)
+ .findFirst().orElse(null);
+ // 濡傛灉鍏ㄦ槸杩愯涓殑闃诲agv锛屽垯涓嶈繘琛岄伩璁╅�昏緫 todo
+ if (Cools.isEmpty(blockAgvNo)) {
+ return pathList;
+ }
- boolean initJamCache = false;
if (null == jam) {
jam = new Jam();
jam.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
@@ -264,7 +251,11 @@
log.error("{}鍙疯溅杈嗗湪{}瀹氫綅琚樆濉烇紝璁板綍闃诲鐘舵�佸け璐ワ紒锛侊紒", agvNo, startCode.getData());
return pathList;
}
- initJamCache = true;
+ } else {
+ jam.setDuration(System.currentTimeMillis() - jam.getStartTime().getTime());
+ if (!jamService.updateById(jam)) {
+ log.error("{}缂栧彿闃诲璁板綍鏇存柊澶辫触锛侊紒锛�", jam.getUuid());
+ }
}
long previousTimestamp = jam.getStartTime().getTime();
@@ -378,13 +369,6 @@
}
- if (!initJamCache) {
- jam.setDuration(System.currentTimeMillis() - jam.getStartTime().getTime());
- if (!jamService.updateById(jam)) {
- log.error("{}缂栧彿闃诲璁板綍鏇存柊澶辫触锛侊紒锛�", jam.getUuid());
- }
- }
-
}
}
@@ -399,7 +383,7 @@
log.error("{}缂栧彿闃诲璁板綍瀹屾垚淇敼澶辫触锛侊紒锛�", jam.getUuid());
}
}
- // expired jam
+ // deal expired jam
for (Jam expiredJam : jamService.list(new LambdaQueryWrapper<Jam>()
.eq(Jam::getJamAgv, agv.getId())
.eq(Jam::getState, JamStateType.RUNNING.toString()))) {
@@ -416,8 +400,8 @@
return pathList;
}
- private List<String> slicePathAndReturnBlockVehicleList(Integer lev, List<String> fullPathList, String agvNo, List<String> pathList) {
- List<String> blockVehicleList = new ArrayList<>();
+ private List<BlockVehicleDto> slicePathAndReturnBlockVehicleList(Integer lev, List<String> fullPathList, String agvNo, List<String> pathList) {
+ List<BlockVehicleDto> blockVehicleList = new ArrayList<>();
DynamicNode[][] dynamicMatrix = mapDataDispatcher.getDynamicMatrix(lev);
String[][] waveMatrix = mapDataDispatcher.getWaveMatrix(lev);
@@ -431,8 +415,10 @@
List<String> otherWaveList = MapDataUtils.hasOtherWave(waveNodeList, agvNo);
if (!Cools.isEmpty(otherWaveList)) {
for (String otherWave : otherWaveList) {
- if (mapDataDispatcher.queryCodeListFromDynamicNode(lev, otherWave).size() <= 1) {
- blockVehicleList.add(otherWave);
+ if (1 < mapDataDispatcher.queryCodeListFromDynamicNode(lev, otherWave).size()) {
+ blockVehicleList.add(new BlockVehicleDto(otherWave, false));
+ } else {
+ blockVehicleList.add(new BlockVehicleDto(otherWave, true));
}
}
break;
--
Gitblit v1.9.1