From 2bdbfd1ac24d4e9a87daf6fb8b99ec32264d5752 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 21 十二月 2024 11:25:27 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java | 247 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 197 insertions(+), 50 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 eed8e6a..db6cd89 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
@@ -2,14 +2,17 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.acs.common.utils.GsonUtils;
-import com.zy.acs.common.utils.RedisSupport;
+import com.zy.acs.common.utils.Utils;
import com.zy.acs.framework.common.Cools;
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.constant.MapDataConstant;
import com.zy.acs.manager.core.domain.BlockVehicleDto;
import com.zy.acs.manager.core.domain.TaskPosDto;
+import com.zy.acs.manager.core.domain.type.BlockSeverityType;
import com.zy.acs.manager.core.service.astart.MapDataDispatcher;
+import com.zy.acs.manager.core.service.astart.NavigateNode;
import com.zy.acs.manager.core.service.astart.RetreatNavigateNode;
import com.zy.acs.manager.core.service.astart.WaveNodeType;
import com.zy.acs.manager.manager.entity.*;
@@ -37,12 +40,6 @@
@Component
public class TrafficService {
- public static final Integer MIN_SLICE_PATH_LENGTH = 3;
-
- public static final Integer MAX_JAM_TIMEOUT = 5 * 1000;
-
- private final RedisSupport redis = RedisSupport.defaultRedisSupport;
-
@Autowired
private AgvService agvService;
@Autowired
@@ -64,7 +61,7 @@
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
- private ActionService actionService;
+ private AgvModelService agvModelService;
@Autowired
private RetreatNavigateService retreatNavigateService;
@Autowired
@@ -108,6 +105,12 @@
.eq(Jam::getCycleCode, endNode)
.eq(Jam::getState, JamStateType.RUNNING.toString())
) > 0) {
+ return;
+ }
+
+ // deprecate jam
+ if (this.isExpiredJamByAvo(segment.getId())) {
+ mainService.settleSegmentList(Utils.singletonList(segment), null);
return;
}
@@ -199,7 +202,8 @@
String agvNo = agv.getUuid();
Date now = new Date();
Jam jam = jamService.getJam(agv.getId(), startCode.getId(), segment.getId());
- // judge avoid of jam
+ BlockSeverityType blockSeverity = BlockSeverityType.query(null == jam ? null : jam.getDuration());
+ // judge avoid of jam 濡傛灉宸茬粡鍦ㄩ伩璁╃偣锛堝洜涓哄綋鍓嶈溅鎵ц浜嗛伩璁╀换鍔★級锛岄偅涔堝垯涓嶈兘鍐嶅幓妫�绱箣鍓嶇殑闃诲璺緞
List<Jam> unfinishedOriginJamByCurrAgv = jamService.getUnfinishedOriginJamByAvo(agv.getId(), startCode.getId(), segment.getId());
List<String> blackPath = this.getBlackPathList(unfinishedOriginJamByCurrAgv);
@@ -218,8 +222,18 @@
pathList = lockPathList;
} else {
+ // preview path
+ List<String> draftPath = new ArrayList<>(unlockPathList);
+ if (blockSeverity.equals(BlockSeverityType.SEVERE)) {
+ unlockPathList.remove(endCode.getData());
+ blackPath.addAll(unlockPathList);
+ List<String> newUnlockPathList = mapService.checkoutPath(agvNo, startCode, endCode, false, blackPath, segment);
+ if (!Cools.isEmpty(newUnlockPathList)) {
+ draftPath = newUnlockPathList;
+ }
+ }
// 鍙蛋琛岃矾寰勯泦鍚堣绠�
- List<BlockVehicleDto> blockVehicleList = this.slicePathAndReturnBlockVehicleList(lev, unlockPathList, agvNo, pathList); // jamAgvNo may was wave
+ List<BlockVehicleDto> blockVehicleList = this.slicePathAndReturnBlockVehicleList(lev, draftPath, agvNo, pathList); // jamAgvNo may was wave
if (!Cools.isEmpty(pathList)) {
@@ -227,7 +241,7 @@
assert !Cools.isEmpty(blockVehicleList);
boolean hasUnavoidableBlocks = blockVehicleList.stream().anyMatch(blockVehicleDto -> !blockVehicleDto.isAvoidable());
- if (hasUnavoidableBlocks && pathList.size() <= MIN_SLICE_PATH_LENGTH) {
+ if (hasUnavoidableBlocks && pathList.size() <= MapDataConstant.MIN_SLICE_PATH_LENGTH) {
log.info("AGV[{}] waiting in place, because the path list is too short...", agvNo);
pathList.clear();
}
@@ -252,8 +266,7 @@
Integer maxJamTimeoutFactor = null;
// persist jam data
- ArrayList<String> jamPath = new ArrayList<>(unlockPathList);
- jam = this.createOrUpdateJam(agv, startCode, segment, jam, jamPath);
+ jam = this.createOrUpdateJam(agv, startCode, segment, jam, draftPath);
// ? has unAvoidable block vehicles
if (blockVehicleList.stream().anyMatch(blockVehicleDto -> !blockVehicleDto.isAvoidable())) {
@@ -266,59 +279,71 @@
if (!Cools.isEmpty(jam.getAvoAgv())
&& BlockVehicleDto.customContain(blockVehicleList, agvService.getById(jam.getAvoAgv()).getUuid())) {
- maxJamTimeoutFactor = 10;
+ maxJamTimeoutFactor = 4;
} else {
// select optimal block vehicle
- String blockAgvNo = blockVehicleList.stream()
- .filter(BlockVehicleDto::isAvoidable)
- .map(BlockVehicleDto::getVehicle)
- .findFirst().orElse(null);
+ String blockAgvNo = this.checkoutBestSolutionOfBlocks(blockVehicleList, segment);
+ if (Cools.isEmpty(blockAgvNo)) {
- // block vehicle info
- Agv blockAgv = agvService.selectByUuid(blockAgvNo);
- String blockAgvCode = codeService.getById(agvDetailService.selectByAgvId(blockAgv.getId()).getRecentCode()).getData();
+ maxJamTimeoutFactor = 2;
- do {
+ } else {
- // 闃诲杞﹁締姝ｅ湪鍘熷湴浣滀笟锛岀瓑寰� ===>> 瓒呰繃绛夊緟鏃堕棿锛岀粫璺�
- List<Segment> runningSegList = segmentService.getByAgvAndState(blockAgv.getId(), SegmentStateType.RUNNING.toString());
- if (!Cools.isEmpty(runningSegList)) {
- maxJamTimeoutFactor = 1;
- break;
+ // block vehicle info
+ Agv blockAgv = agvService.selectByUuid(blockAgvNo);
+ String blockAgvCode = codeService.getById(agvDetailService.selectByAgvId(blockAgv.getId()).getRecentCode()).getData();
+
+ // create new jam if already notify the avoid vehicle
+ if (!Cools.isEmpty(jam.getAvoAgv(), jam.getAvoSeg()) && !blockAgv.getId().equals(jam.getAvoAgv())) {
+ jam = this.setupNewJam(jam, agv, startCode, segment, draftPath);
}
- // 鍒ゆ柇涓嬩釜浠诲姟鏄惁涓哄師鍦颁换鍔★紝濡傛灉鏄垯绛夊緟 ===>> 瓒呰繃绛夊緟鏃堕棿锛岀粫璺紱濡傛灉涓嶆槸锛岃闃诲杞﹁締閬胯
- Segment waitingSeg = segmentService.getJustWaitingSeg(blockAgv.getId());
- if (null != waitingSeg && waitingSeg.getEndNode().equals(codeService.selectByData(blockAgvCode).getId())) {
- maxJamTimeoutFactor = 1;
- break;
- }
+ do {
- // notify block vehicle to avoid
- if (this.notifyVehicleAvoid(blockAgvNo, blockAgvCode, jamPath, agvNo, jam)) {
- if (jam.getCycleAvo() == 1) {
- jam.setCycleCode(endCode.getId());
+ // 闃诲杞﹁締姝ｅ湪鍘熷湴浣滀笟锛岀瓑寰� ===>> 瓒呰繃绛夊緟鏃堕棿锛岀粫璺�
+ List<Segment> runningSegList = segmentService.getByAgvAndState(blockAgv.getId(), SegmentStateType.RUNNING.toString());
+ if (!Cools.isEmpty(runningSegList)) {
+ maxJamTimeoutFactor = 1;
+ break;
}
- jam.setAvoAgv(blockAgv.getId());
- jam.setNotifyTime(new Date());
- if (!jamService.updateById(jam)) {
- throw new CoolException(jam.getUuid() + "-jam failed to update锛侊紒锛�");
+
+ // 鍒ゆ柇涓嬩釜浠诲姟鏄惁涓哄師鍦颁换鍔★紝濡傛灉鏄垯绛夊緟 ===>> 瓒呰繃绛夊緟鏃堕棿锛岀粫璺紱濡傛灉涓嶆槸锛岃闃诲杞﹁締閬胯
+ List<Segment> waitingSegList = segmentService.getJustWaitingSeg(blockAgv.getId());
+ if (null != waitingSegList
+ && waitingSegList.stream().anyMatch(
+ waitingSeg -> waitingSeg.getEndNode().equals(codeService.selectByData(blockAgvCode).getId())
+ )) {
+ maxJamTimeoutFactor = 1;
+ break;
}
- } else {
- maxJamTimeoutFactor = 1;
- }
+ // notify block vehicle to avoid
+ if (this.notifyVehicleAvoid(blockAgvNo, blockAgvCode, draftPath, agvNo, jam)) {
+ if (jam.getCycleAvo() == 1) {
+ jam.setCycleCode(endCode.getId());
+ }
+ jam.setAvoAgv(blockAgv.getId());
+ jam.setNotifyTime(new Date());
+ if (!jamService.updateById(jam)) {
+ throw new CoolException(jam.getUuid() + "-jam failed to update锛侊紒锛�");
+ }
+ } else {
- } while (false);
+ maxJamTimeoutFactor = 1;
+ }
+
+ } while (false);
+ }
+
}
}
// handle jam timeout
if (null != maxJamTimeoutFactor) {
- if (System.currentTimeMillis() - jam.getStartTime().getTime() > MAX_JAM_TIMEOUT * maxJamTimeoutFactor) {
+ if (System.currentTimeMillis() - jam.getStartTime().getTime() > MapDataConstant.MAX_JAM_TIMEOUT * maxJamTimeoutFactor) {
if (!Cools.isEmpty(lockPathList)) {
@@ -343,10 +368,32 @@
if (!Cools.isEmpty(pathList)) {
if (null != jam) {
+ boolean beDeprecate = false;
+ if (blockSeverity.equals(BlockSeverityType.SEVERE) && !Cools.isEmpty(jam.getJamPath())) {
+ List<String> jamPath = GsonUtils.fromJsonToList(jam.getJamPath(), String.class);
+ if (!this.comparePathLists(jamPath, pathList)) { // jamPath >= pathList
+ beDeprecate = true;
+ }
+ }
jam.setEndTime(now);
jam.setUpdateTime(now);
- jam.setState(JamStateType.FINISH.toString());
- if (!jamService.updateById(jam)) {
+ jam.setState(beDeprecate ? JamStateType.DEPRECATED.toString() : JamStateType.FINISH.toString());
+ if (jamService.updateById(jam)) {
+ if (beDeprecate) {
+ // search previous jam that jamSeg from this segment
+ List<Jam> previousJams = jamService.list(new LambdaQueryWrapper<Jam>()
+ .eq(Jam::getJamSeg, segment.getId())
+ .eq(Jam::getState, JamStateType.FINISH.toString())
+ );
+ for (Jam previousJam : previousJams) {
+ previousJam.setState(JamStateType.DEPRECATED.toString());
+ previousJam.setUpdateTime(now);
+ if (!jamService.updateById(previousJam)) {
+ log.error("Jam[{}] failed to update锛侊紒锛�", previousJam.getUuid());
+ }
+ }
+ }
+ } else {
log.error("Jam[{}] failed to update锛侊紒锛�", jam.getUuid());
}
}
@@ -356,7 +403,7 @@
.eq(Jam::getState, JamStateType.RUNNING.toString()))) {
expiredJam.setEndTime(now);
expiredJam.setUpdateTime(now);
- expiredJam.setState(JamStateType.FINISH.toString());
+ expiredJam.setState(JamStateType.DEPRECATED.toString());
if (!jamService.updateById(expiredJam)) {
log.error("Jam[{}] failed to update锛侊紒锛�", expiredJam.getUuid());
}
@@ -432,11 +479,14 @@
String endCodeData = finalNode.getCodeData();
Code endCode = codeService.selectByData(endCodeData);
- jam.setAvoCode(endCode.getId());
List<Segment> waitingSegList = segmentService.getByAgvAndState(agv.getId(), SegmentStateType.WAITING.toString());
if (!Cools.isEmpty(waitingSegList)) {
+ if (waitingSegList.size() > 1) {
+ log.error("閬胯閫氱煡澶辫触锛寋}鍙疯溅杈嗗瓨鍦ㄥ涓瓑寰呬腑鐨凷egment锛侊紒锛�", agvNo);
+ return false;
+ }
// revert
Date now = new Date();
for (Segment seg : waitingSegList) {
@@ -462,6 +512,7 @@
return false;
} else {
jam.setAvoSeg(insertSeg.getId());
+ jam.setAvoCode(endCode.getId());
}
} else {
@@ -495,12 +546,56 @@
return jam;
}
+ private Jam setupNewJam(Jam originJam, Agv agv, Code startCode, Segment segment, List<String> draftPath) {
+ originJam.setUpdateTime(new Date());
+ originJam.setState(JamStateType.FINISH.toString());
+ if (!jamService.updateById(originJam)) {
+ log.error("Jam[{}] failed to update", originJam.getUuid());
+ return originJam;
+ } else {
+ return this.createOrUpdateJam(
+ agv
+ , startCode
+ , segment
+ , null
+ , draftPath
+ );
+ }
+ }
+
private List<String> getBlackPathList(List<Jam> unfinishedOriginJamByCurrAgv) {
List<String> blackPathList = new ArrayList<>();
+ Integer lev = MapDataDispatcher.MAP_DEFAULT_LEV;
if (!Cools.isEmpty(unfinishedOriginJamByCurrAgv)) {
for (Jam jam : unfinishedOriginJamByCurrAgv) {
if (!Cools.isEmpty(jam.getJamPath())) {
+
List<String> list = GsonUtils.fromJsonToList(jam.getJamPath(), String.class);
+
+ Agv jamAgv = agvService.getById(jam.getJamAgv());
+ List<String> jamDynamicNodes = mapDataDispatcher.queryCodeListFromDynamicNode(lev, jamAgv.getUuid());
+ // jamDynamicNodes has sorted
+ String firstCodeNode = jamDynamicNodes.stream().findFirst().orElse(null);
+
+ if (!Cools.isEmpty(firstCodeNode)) {
+ int idx = list.indexOf(firstCodeNode);
+ if (idx != -1) {
+ list = new ArrayList<>(list.subList(idx, list.size()));
+
+ // the wave of first node
+ Double avoidDistance = MapDataUtils.getVehicleWaveSafeDistance(
+ agvModelService.getById(jamAgv.getAgvModel()).getDiameter(),
+ MapDataConstant.MAX_DISTANCE_BETWEEN_ADJACENT_AGV_FACTOR
+ );
+ List<String> waveCodeList = mapService.getWaveScopeByCode(lev, firstCodeNode, avoidDistance)
+ .stream().map(NavigateNode::getCodeData).distinct().collect(Collectors.toList());
+ list.addAll(waveCodeList);
+ } else {
+ // 濡傛灉琚樆濉炶溅杈嗗凡缁忎笉鍦ㄥ師鏉ョ殑闃诲璺緞涓紝鑰冭檻閬胯杞﹁蛋琛屾椂涓嶉渶瑕佹妸涔嬪墠鐨勯樆濉炶矾寰勫姞鍏ラ粦鍚嶅崟
+ list = new ArrayList<>();
+ }
+ }
+
blackPathList.addAll(list);
}
}
@@ -508,4 +603,56 @@
return blackPathList.stream().distinct().collect(Collectors.toList());
}
+ private String checkoutBestSolutionOfBlocks(List<BlockVehicleDto> blockVehicleList, Segment segment) {
+ assert !Cools.isEmpty(blockVehicleList);
+ for (BlockVehicleDto blockVehicleDto : blockVehicleList) {
+ if (!blockVehicleDto.isAvoidable()) {
+ continue;
+ }
+ // 褰撳墠vehicle姝ｅ湪杩涜閬胯浣滀笟
+ if (!Cools.isEmpty(jamService.getUnfinishedAvoSegByAvo(blockVehicleDto.getVehicle(), null))) {
+ continue;
+ }
+ return blockVehicleDto.getVehicle();
+ }
+ return null;
+ }
+
+ public boolean comparePathLists(List<String> list1, List<String> list2) {
+ if (list1.equals(list2)) {
+ return true;
+ }
+ if (list1.containsAll(list2)) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * 1. the jam was deprecated
+ * 2. the jam segment is finished
+ *
+ * all these by avoid segment
+ */
+ private boolean isExpiredJamByAvo(Long avoSeg) {
+ List<Jam> jamList = jamService.list(new LambdaQueryWrapper<Jam>()
+// .eq(Jam::getAvoAgv, avoAgv)
+ .eq(Jam::getAvoSeg, avoSeg));
+ if (Cools.isEmpty(jamList)) {
+ return false;
+ }
+ if (jamList.size() > 1) {
+ log.error("AvoSeg[id = {}] seg data has exception, result in two jams", avoSeg);
+ }
+ Jam jam = jamList.get(0);
+ if (jam.getState().equals(JamStateType.DEPRECATED.toString())) {
+ return true;
+ }
+ Segment jamSegment = segmentService.getById(jam.getJamSeg());
+ if (jamSegment.getState().equals(SegmentStateType.FINISH.toString())) {
+ return true;
+ }
+ return false;
+ }
+
}
--
Gitblit v1.9.1