From 70930071a49190f414c8d8bc9c9e9795a4096739 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 23 三月 2026 16:08:27 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into jdxaj
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java | 59 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 30 insertions(+), 29 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 dbf3a7b..d47d5a2 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
@@ -27,6 +27,7 @@
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import com.zy.acs.common.utils.News;
import java.util.ArrayList;
import java.util.Arrays;
@@ -143,14 +144,14 @@
// }
// }
// if (null == endCode) {
-// log.warn("AGV[{}] failed to search destination锛宼here hadn't any idle funSta锛孴askTypeType锛歿}", segment.getAgvId(), FuncStaType.STANDBY);
+// News.warn("AGV[{}] failed to search destination锛宼here hadn't any idle funSta锛孴askTypeType锛歿}", segment.getAgvId(), FuncStaType.STANDBY);
// return;
// }
//
// segment.setState(SegmentStateType.INIT.toString());
// segment.setUpdateTime(now);
// if (!segmentService.updateById(segment)) {
-// log.error("Segment [{}] failed to update 锛侊紒锛�", segment.getGroupId() + " - " + segment.getSerial());
+// News.error("Segment [{}] failed to update 锛侊紒锛�", segment.getGroupId() + " - " + segment.getSerial());
// return;
// }
//
@@ -166,7 +167,7 @@
// insertSeg.setState(SegmentStateType.WAITING.toString());
// insertSeg.setMemo(MapDataConstant.RESOLVE_DEADLOCK);
// if (!segmentService.save(insertSeg)) {
-// log.error("Segment [{}] failed to save 锛侊紒锛�", segment.getTravelId() + " - " + segment.getSerial());
+// News.error("Segment [{}] failed to save 锛侊紒锛�", segment.getTravelId() + " - " + segment.getSerial());
// return;
// }
// return;
@@ -181,7 +182,7 @@
if (!Cools.isEmpty(waitingSegList)) {
for (Segment waitingSeg : waitingSegList) {
if (!waitingSeg.getId().equals(segment.getId())) {
-// log.error("AGV[{}] 浠诲姟寮傚父锛屾湇鍔″櫒閿欒锛侊紒锛�", agv.getUuid());
+// News.error("AGV[{}] 浠诲姟寮傚父锛屾湇鍔″櫒閿欒锛侊紒锛�", agv.getUuid());
return;
}
}
@@ -203,7 +204,7 @@
// * sync wave scope
if (!avoidWaveCalculator.calcWaveScope(agvModelService.getByAgvId(agv.getId()))) {
- log.error("failed to calculate avoid wave matrix ...");
+ News.error("failed to calculate avoid wave matrix ...");
return;
}
@@ -233,7 +234,7 @@
segment.setState(SegmentStateType.INIT.toString());
segment.setUpdateTime(now);
if (!segmentService.updateById(segment)) {
- log.error("Segment [{}] failed to update 锛侊紒锛�", segment.getGroupId() + " - " + segment.getSerial());
+ News.error("Segment [{}] failed to update 锛侊紒锛�", segment.getGroupId() + " - " + segment.getSerial());
}
segmentList.clear();
@@ -248,7 +249,7 @@
insertSeg.setPosType(TaskPosDto.PosType.MOVE.toString());
insertSeg.setState(SegmentStateType.WAITING.toString());
if (!segmentService.save(insertSeg)) {
- log.error("Segment [{}] failed to save 锛侊紒锛�", insertSeg.getTravelId() + " - " + insertSeg.getSerial());
+ News.error("Segment [{}] failed to save 锛侊紒锛�", insertSeg.getTravelId() + " - " + insertSeg.getSerial());
}
segmentList.add(insertSeg);
@@ -285,7 +286,7 @@
mapService.lockPath(null, pathDtoList, agv.getUuid());
} catch (Exception e) {
- log.error("TrafficService.trigger", e);
+ News.error("TrafficService.trigger", e);
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
throw new RuntimeException("trigger method caught an exception", e);
@@ -337,7 +338,7 @@
boolean hasUnavoidableBlocks = blockVehicleList.stream().anyMatch(blockVehicleDto -> !blockVehicleDto.isAvoidable());
if (hasUnavoidableBlocks && pathList.size() <= MapDataConstant.MIN_SLICE_PATH_LENGTH) {
- log.info("AGV[{}] waiting in place, because the path list is too short...", agvNo);
+// News.info("AGV[{}] waiting in place, because the path list is too short...", agvNo);
pathList.clear();
}
@@ -345,7 +346,7 @@
blockVehicleDto -> null != jamService.getCycleJam(agv.getId(), segment.getId(), blockVehicleDto.getVehicle())
);
if (hasCycleJam) {
- log.info("AGV[{}] waiting in place, because has cycle jam...", agvNo);
+ News.info("AGV[{}] waiting in place, because has cycle jam...", agvNo);
pathList.clear();
}
}
@@ -354,7 +355,7 @@
} else {
if (Cools.isEmpty(blockVehicleList)) {
- log.warn("AGV[{}] can't reach to code: {}, because there is too many vehicle in the lane...", agvNo, endCode.getData());
+ News.warn("AGV[{}] can't reach to code: {}, because there is too many vehicle in the lane...", agvNo, endCode.getData());
} else {
assert !Cools.isEmpty(blockVehicleList);
@@ -444,14 +445,14 @@
pathList = lockPathList;
} else {
- log.error("{}鍙疯溅杈嗘绱{}] ===>> [{}]璺緞澶辫触锛屽師鍥狅細{}"
+ News.error("{}鍙疯溅杈嗘绱{}] ===>> [{}]璺緞澶辫触锛屽師鍥狅細{}"
, agvNo, startCode.getData(), endCode.getData(), "璺緞闃诲瓒呮椂");
}
} else {
- log.warn("{}鍙疯溅杈嗘鍦ㄧ瓑寰呬氦閫氬牭濉烇紝闃诲杞﹁締锛氥�恵}銆�"
- , agvNo
- , blockVehicleList.stream().map(BlockVehicleDto::getVehicle).collect(Collectors.toList()).toString()
- );
+// News.warn("{}鍙疯溅杈嗘鍦ㄧ瓑寰呬氦閫氬牭濉烇紝闃诲杞﹁締锛氥�恵}銆�"
+// , agvNo
+// , blockVehicleList.stream().map(BlockVehicleDto::getVehicle).collect(Collectors.toList()).toString()
+// );
}
}
@@ -484,12 +485,12 @@
previousJam.setState(JamStateType.DEPRECATED.toString());
previousJam.setUpdateTime(now);
if (!jamService.updateById(previousJam)) {
- log.error("Jam[{}] failed to update锛侊紒锛�", previousJam.getUuid());
+ News.error("Jam[{}] failed to update锛侊紒锛�", previousJam.getUuid());
}
}
}
} else {
- log.error("Jam[{}] failed to update锛侊紒锛�", jam.getUuid());
+ News.error("Jam[{}] failed to update锛侊紒锛�", jam.getUuid());
}
}
// deal expired jam
@@ -501,7 +502,7 @@
expiredJam.setUpdateTime(now);
expiredJam.setState(JamStateType.DEPRECATED.toString());
if (!jamService.updateById(expiredJam)) {
- log.error("Jam[{}] failed to update锛侊紒锛�", expiredJam.getUuid());
+ News.error("Jam[{}] failed to update锛侊紒锛�", expiredJam.getUuid());
}
}
@@ -552,7 +553,7 @@
private boolean notifyVehicleAvoid(String agvNo, String agvPosCode, List<String> avoidPathList, String sponsor, Jam jam) {
Long agvId = agvService.getAgvId(agvNo);
if (!Cools.isEmpty(segmentService.getByAgvAndState(agvId, SegmentStateType.RUNNING.toString()))) {
- log.warn("{}鍙疯溅杈嗛伩璁╁け璐ワ紝瀛樺湪杩涜涓换鍔★紒锛侊紒", agvNo);
+ News.warn("{}鍙疯溅杈嗛伩璁╁け璐ワ紝瀛樺湪杩涜涓换鍔★紒锛侊紒", agvNo);
return false;
}
@@ -562,7 +563,7 @@
assert avoidPathList.size() >= 2;
RetreatNavigateNode finalNode = retreatNavigateService.execute(agvNo, startNode, avoidPathList, sponsor, jam);
if (null == finalNode) {
- log.warn("{}鍙疯溅杈嗛伩璁╁け璐ワ紝妫�绱㈤伩璁╃偣澶辫触锛侊紒锛�", agvNo);
+ News.warn("{}鍙疯溅杈嗛伩璁╁け璐ワ紝妫�绱㈤伩璁╃偣澶辫触锛侊紒锛�", agvNo);
return false;
}
@@ -573,7 +574,7 @@
if (!Cools.isEmpty(waitingSegList)) {
if (waitingSegList.size() > 1) {
- log.error("閬胯閫氱煡澶辫触锛寋}鍙疯溅杈嗗瓨鍦ㄥ涓瓑寰呬腑鐨凷egment锛侊紒锛�", agvNo);
+ News.error("閬胯閫氱煡澶辫触锛寋}鍙疯溅杈嗗瓨鍦ㄥ涓瓑寰呬腑鐨凷egment锛侊紒锛�", agvNo);
return false;
}
// revert
@@ -582,7 +583,7 @@
seg.setState(SegmentStateType.INIT.toString());
seg.setUpdateTime(now);
if (!segmentService.updateById(seg)) {
- log.error("Segment [{}] 鏇存柊澶辫触 锛侊紒锛�", seg.getTravelId() + " - " + seg.getSerial());
+ News.error("Segment [{}] 鏇存柊澶辫触 锛侊紒锛�", seg.getTravelId() + " - " + seg.getSerial());
}
}
Segment segment = waitingSegList.get(0);
@@ -597,7 +598,7 @@
insertSeg.setPosType(TaskPosDto.PosType.MOVE.toString());
insertSeg.setState(SegmentStateType.WAITING.toString());
if (!segmentService.save(insertSeg)) {
- log.error("Segment [{}] 淇濆瓨澶辫触 锛侊紒锛�", segment.getTravelId() + " - " + segment.getSerial());
+ News.error("Segment [{}] 淇濆瓨澶辫触 锛侊紒锛�", segment.getTravelId() + " - " + segment.getSerial());
return false;
} else {
jam.setAvoSeg(insertSeg.getId());
@@ -623,13 +624,13 @@
jam.setStartTime(new Date());
jam.setState(JamStateType.RUNNING.toString());
if (!jamService.save(jam)) {
- log.error("AGV[{}] failed to save jam", agv.getUuid());
+ News.error("AGV[{}] failed to save jam", agv.getUuid());
throw new CoolException("failed to save jam");
}
} else {
jam.setDuration(System.currentTimeMillis() - jam.getStartTime().getTime());
if (!jamService.updateById(jam)) {
- log.error("AGV[{}] failed to update jam", agv.getUuid());
+ News.error("AGV[{}] failed to update jam", agv.getUuid());
}
}
return jam;
@@ -639,7 +640,7 @@
originJam.setUpdateTime(new Date());
originJam.setState(JamStateType.FINISH.toString());
if (!jamService.updateById(originJam)) {
- log.error("Jam[{}] failed to update", originJam.getUuid());
+ News.error("Jam[{}] failed to update", originJam.getUuid());
return originJam;
} else {
return this.createOrUpdateJam(
@@ -743,7 +744,7 @@
return false;
}
if (jamList.size() > 1) {
- log.error("AvoSeg[id = {}] seg data has exception, result in two jams", avoSeg);
+ News.error("AvoSeg[id = {}] seg data has exception, result in two jams", avoSeg);
}
Jam jam = jamList.get(0);
if (jam.getState().equals(JamStateType.DEPRECATED.toString())) {
@@ -756,4 +757,4 @@
return false;
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1