Commit 6f26352a authored by duanruiming's avatar duanruiming

[update] 实时监控->优化过的路口不再优化

parent 23d6ea4b
...@@ -172,6 +172,10 @@ public class CrossOptimizeServiceImpl implements CrossOptimizeService { ...@@ -172,6 +172,10 @@ public class CrossOptimizeServiceImpl implements CrossOptimizeService {
Integer inDir = ridInfoEntity.getInDir(); Integer inDir = ridInfoEntity.getInDir();
if (!congestCrossMap.containsKey(ridInfoEntity.getEndCrossId()) && Objects.equals(inDir, dir)) { if (!congestCrossMap.containsKey(ridInfoEntity.getEndCrossId()) && Objects.equals(inDir, dir)) {
String endCrossId = ridInfoEntity.getEndCrossId(); String endCrossId = ridInfoEntity.getEndCrossId();
// 判断当前路口是否已优化
if (CROSS_OPT.contains(endCrossId)) {
continue;
}
List<CrossTurnDataRealtimeDTO> endcrossTurnDataRealtimeDTOS = turnDataRealtimeMap.get(endCrossId); List<CrossTurnDataRealtimeDTO> endcrossTurnDataRealtimeDTOS = turnDataRealtimeMap.get(endCrossId);
if (CollectionUtils.isEmpty(endcrossTurnDataRealtimeDTOS)) { if (CollectionUtils.isEmpty(endcrossTurnDataRealtimeDTOS)) {
log.error("溢出路口:{},优化其下游路口:{}时,路口转向数据为空", crossId, ridInfoEntity.getEndCrossId()); log.error("溢出路口:{},优化其下游路口:{}时,路口转向数据为空", crossId, ridInfoEntity.getEndCrossId());
...@@ -233,10 +237,12 @@ public class CrossOptimizeServiceImpl implements CrossOptimizeService { ...@@ -233,10 +237,12 @@ public class CrossOptimizeServiceImpl implements CrossOptimizeService {
// 拥堵路口对上游路口进行优化 // 拥堵路口对上游路口进行优化
for (RidInfoEntity ridInfoEntity : ridInfoEntities) { for (RidInfoEntity ridInfoEntity : ridInfoEntities) {
String startCrossId = ridInfoEntity.getStartCrossId(); String startCrossId = ridInfoEntity.getStartCrossId();
// 上游路口时拥堵路口时,不进行优化
if (congestCrossMap.containsKey(startCrossId)) { // 上游路口时拥堵路口时,不进行优化或者判断当前路口是否已优化
if (congestCrossMap.containsKey(startCrossId) || CROSS_OPT.contains(startCrossId)) {
continue; continue;
} }
Integer inDir = ridInfoEntity.getInDir(); Integer inDir = ridInfoEntity.getInDir();
// 优化当前开始路口的此方向直行,和逆时针方向左转 // 优化当前开始路口的此方向直行,和逆时针方向左转
if (Objects.equals(inDir, intCongestionDir)) { if (Objects.equals(inDir, intCongestionDir)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment