[update] 态势检测-路口列表手动控制异常优化

signal-control-service/src/main/java/net/wanji/web/service/impl/SituationDetectionServiceImpl.java

@@ -492,6 +492,7 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
         LambdaQueryWrapper<TBaseCrossInfo> queryWrapper = new LambdaQueryWrapper<>();
         List<TBaseCrossInfo> tBaseCrossInfos = tBaseCrossInfoMapper.selectList(queryWrapper);
         if (!CollectionUtils.isEmpty(tCrossControlHists)) {
+            if (Objects.nonNull(operationMode)) {
                 if (operationMode == 1) { //中心优化
                     List<TCrossControlHist> centerOptList = tCrossControlHists.stream().filter(tCrossControlHist -> tCrossControlHist.getType() == 5).collect(Collectors.toList());
                     BeanListUtils.populateList(centerOptList, signalOperationModeDTOS, SignalOperationModeDTO.class);
@@ -508,6 +509,8 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
                     List<TCrossControlHist> specialServiceList = tCrossControlHists.stream().filter(tCrossControlHist -> tCrossControlHist.getType() == 7).collect(Collectors.toList());
                     BeanListUtils.populateList(specialServiceList, signalOperationModeDTOS, SignalOperationModeDTO.class);
                 }
+            } else {
+                BeanListUtils.populateList(tCrossControlHists, signalOperationModeDTOS, SignalOperationModeDTO.class);
             }
 
             for (SignalOperationModeDTO signalOperationModeDTO : signalOperationModeDTOS) {
@@ -518,6 +521,9 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
                     }
                 }
             }
+
+        }
+
         return signalOperationModeDTOS;
     }
 }