From aa6f20d98b5d8e18ae56f9562a78d403a5417b48 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 08 一月 2025 16:32:28 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 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 76a5f58..0d5d835 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
@@ -77,6 +77,12 @@
try {
Date now = new Date();
+ // deprecate jam
+ if (this.isExpiredJamByAvo(segment.getId())) {
+ mainService.settleSegmentList(Utils.singletonList(segment), null);
+ return;
+ }
+
// temporary -----------------
Integer algoExtensionTime = configService.getVal("algoExtensionTime", Integer.class);
if (null != algoExtensionTime && algoExtensionTime > 0) {
@@ -117,12 +123,6 @@
return;
}
- // deprecate jam
- if (this.isExpiredJamByAvo(segment.getId())) {
- mainService.settleSegmentList(Utils.singletonList(segment), null);
- return;
- }
-
// execute -----------------------------------------------
// ArrayList<List<TaskPosDto>> list = JSON.parseObject(travel.getTaskContent(), new TypeReference<ArrayList<List<TaskPosDto>>>() {});
@@ -135,7 +135,9 @@
// checkout path
Code startCode = codeService.getById(agvDetail.getRecentCode());
Code endCode = codeService.getById(endNode);
+ long startTime = System.currentTimeMillis();
List<String> pathList = this.checkoutPath(agv, startCode, endCode, segment);
+ System.out.println("checkoutPath: " + (System.currentTimeMillis() - startTime));
if (Cools.isEmpty(pathList)) {
return;
}
@@ -146,7 +148,7 @@
String lastCodeData = pathList.get(pathList.size() - 1);
if (!endCode.getData().equals(lastCodeData)) {
// slice
- Code lastCode = codeService.selectByData(lastCodeData);
+ Code lastCode = codeService.getCacheByData(lastCodeData);
// if (pathList.size() <= MIN_SLICE_PATH_LENGTH) {
// return;
@@ -200,7 +202,9 @@
mapService.lockPath(null, pathList, agv.getUuid());
+ startTime = System.currentTimeMillis();
mainService.generateAction(segment.getAgvId(), segmentList, pathList, now);
+ System.out.println("generateAction: " + (System.currentTimeMillis() - startTime));
} catch (Exception e) {
log.error("TrafficService.trigger", e);
@@ -304,28 +308,28 @@
} else {
// block vehicle info
- Agv blockAgv = agvService.selectByUuid(blockAgvNo);
- String blockAgvCode = codeService.getById(agvDetailService.selectByAgvId(blockAgv.getId()).getRecentCode()).getData();
+ Long blockAgvId = agvService.getAgvId(blockAgvNo);
+ String blockAgvCode = codeService.getById(agvDetailService.selectByAgvId(blockAgvId).getRecentCode()).getData();
// create new jam if already notify the avoid vehicle
- if (!Cools.isEmpty(jam.getAvoAgv(), jam.getAvoSeg()) && !blockAgv.getId().equals(jam.getAvoAgv())) {
+ if (!Cools.isEmpty(jam.getAvoAgv(), jam.getAvoSeg()) && !blockAgvId.equals(jam.getAvoAgv())) {
jam = this.setupNewJam(jam, agv, startCode, segment, draftPath);
}
do {
// 闃诲杞﹁締姝ｅ湪鍘熷湴浣滀笟锛岀瓑寰� ===>> 瓒呰繃绛夊緟鏃堕棿锛岀粫璺�
- List<Segment> runningSegList = segmentService.getByAgvAndState(blockAgv.getId(), SegmentStateType.RUNNING.toString());
+ List<Segment> runningSegList = segmentService.getByAgvAndState(blockAgvId, SegmentStateType.RUNNING.toString());
if (!Cools.isEmpty(runningSegList)) {
maxJamTimeoutFactor = 1;
break;
}
// 鍒ゆ柇涓嬩釜浠诲姟鏄惁涓哄師鍦颁换鍔★紝濡傛灉鏄垯绛夊緟 ===>> 瓒呰繃绛夊緟鏃堕棿锛岀粫璺紱濡傛灉涓嶆槸锛岃闃诲杞﹁締閬胯
- List<Segment> waitingSegList = segmentService.getJustWaitingSeg(blockAgv.getId());
+ List<Segment> waitingSegList = segmentService.getJustWaitingSeg(blockAgvId);
if (null != waitingSegList
&& waitingSegList.stream().anyMatch(
- waitingSeg -> waitingSeg.getEndNode().equals(codeService.selectByData(blockAgvCode).getId())
+ waitingSeg -> waitingSeg.getEndNode().equals(codeService.getCacheByData(blockAgvCode).getId())
)) {
maxJamTimeoutFactor = 1;
break;
@@ -336,7 +340,7 @@
if (jam.getCycleAvo() == 1) {
jam.setCycleCode(endCode.getId());
}
- jam.setAvoAgv(blockAgv.getId());
+ jam.setAvoAgv(blockAgvId);
jam.setNotifyTime(new Date());
if (!jamService.updateById(jam)) {
throw new CoolException(jam.getUuid() + "-jam failed to update锛侊紒锛�");
@@ -355,7 +359,7 @@
// handle jam timeout
if (null != maxJamTimeoutFactor) {
- if (System.currentTimeMillis() - jam.getStartTime().getTime() > MapDataConstant.MAX_JAM_TIMEOUT * maxJamTimeoutFactor) {
+ if (System.currentTimeMillis() - jam.getStartTime().getTime() > (long) MapDataConstant.MAX_JAM_TIMEOUT * maxJamTimeoutFactor) {
if (!Cools.isEmpty(lockPathList)) {
@@ -441,7 +445,7 @@
List<String> otherWaveList = MapDataUtils.hasOtherWave(waveNodeList, agvNo);
if (!Cools.isEmpty(otherWaveList)) {
for (String otherWave : otherWaveList) {
- if (1 < mapDataDispatcher.queryCodeListFromDynamicNode(lev, otherWave).size()) {
+ if (mapService.isWalkingByVehicle(lev, otherWave)) {
blockVehicleList.add(new BlockVehicleDto(otherWave, false));
} else {
blockVehicleList.add(new BlockVehicleDto(otherWave, true));
@@ -490,7 +494,7 @@
}
String endCodeData = finalNode.getCodeData();
- Code endCode = codeService.selectByData(endCodeData);
+ Code endCode = codeService.getCacheByData(endCodeData);
List<Segment> waitingSegList = segmentService.getByAgvAndState(agv.getId(), SegmentStateType.WAITING.toString());
if (!Cools.isEmpty(waitingSegList)) {
@@ -585,7 +589,7 @@
List<String> list = GsonUtils.fromJsonToList(jam.getJamPath(), String.class);
Agv jamAgv = agvService.getById(jam.getJamAgv());
- List<String> jamDynamicNodes = mapDataDispatcher.queryCodeListFromDynamicNode(lev, jamAgv.getUuid());
+ List<String> jamDynamicNodes = mapService.queryCodeListFromDynamicNode(lev, jamAgv.getUuid());
// jamDynamicNodes has sorted
String firstCodeNode = jamDynamicNodes.stream().findFirst().orElse(null);
--
Gitblit v1.9.1