From cc1adec06e08b82808eb7e4a2919e08218d86519 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 12 十二月 2024 16:32:43 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 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 20eb1e0..3cd06a6 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,7 +109,7 @@
}
// deprecate jam
- if (this.isJamBeDeprecatedByAvo(segment.getId())) {
+ if (this.isExpiredJamByAvo(segment.getId())) {
mainService.settleSegmentList(Utils.singletonList(segment), null);
return;
}
@@ -590,6 +590,9 @@
List<String> waveCodeList = mapService.getWaveScopeByCode(lev, firstCodeNode, avoidDistance)
.stream().map(NavigateNode::getCodeData).distinct().collect(Collectors.toList());
list.addAll(waveCodeList);
+ } else {
+ // 濡傛灉琚樆濉炶溅杈嗗凡缁忎笉鍦ㄥ師鏉ョ殑闃诲璺緞涓紝鑰冭檻閬胯杞﹁蛋琛屾椂涓嶉渶瑕佹妸涔嬪墠鐨勯樆濉炶矾寰勫姞鍏ラ粦鍚嶅崟
+ list = new ArrayList<>();
}
}
@@ -625,12 +628,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())
- );
+ .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