From 1d7711fbd1d6fa4cb0cbf2d52052b3cf582d1b75 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 06 十二月 2024 13:24:13 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 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 b1afab4..5384b38 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
@@ -109,10 +109,9 @@
}
// deprecate jam
- if (this.isJamBeDeprecatedByAvo(segment.getId())) {
- if (this.skipCurrSegment(segment)) {
- return;
- }
+ if (this.isExpiredJamByAvo(segment.getId())) {
+ mainService.settleSegmentList(Utils.singletonList(segment), null);
+ return;
}
// execute -----------------------------------------------
@@ -626,23 +625,31 @@
return false;
}
- private boolean isJamBeDeprecatedByAvo(Long avoSeg) {
- return 0 < jamService.count(new LambdaQueryWrapper<Jam>()
+ /**
+ * 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)
- .eq(Jam::getState, JamStateType.DEPRECATED.toString())
- );
- }
-
- private boolean skipCurrSegment(Segment currSegment) {
- currSegment.setState(SegmentStateType.FINISH.toString());
- currSegment.setUpdateTime(new Date());
- if (!segmentService.updateById(currSegment)) {
- log.error("Segment [{}] failed to update 锛侊紒锛�", currSegment.getTravelId() + " - " + currSegment.getSerial());
+ .eq(Jam::getAvoSeg, avoSeg));
+ if (Cools.isEmpty(jamList)) {
return false;
}
- segmentService.processNext(Utils.singletonList(currSegment));
- return true;
+ 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