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

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

@@ -492,32 +492,38 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
         LambdaQueryWrapper<TBaseCrossInfo> queryWrapper = new LambdaQueryWrapper<>();
         List<TBaseCrossInfo> tBaseCrossInfos = tBaseCrossInfoMapper.selectList(queryWrapper);
         if (!CollectionUtils.isEmpty(tCrossControlHists)) {
-            if (operationMode == 1) { //中心优化
-                List<TCrossControlHist> centerOptList = tCrossControlHists.stream().filter(tCrossControlHist -> tCrossControlHist.getType() == 5).collect(Collectors.toList());
-                BeanListUtils.populateList(centerOptList, signalOperationModeDTOS, SignalOperationModeDTO.class);
-            }
-            if (operationMode == 2) { // 手动控制
-                List<TCrossControlHist> manualControlList = tCrossControlHists.stream().filter(item -> item.getType() < 5 && item.getType() > 1).collect(Collectors.toList());
-                BeanListUtils.populateList(manualControlList, signalOperationModeDTOS, SignalOperationModeDTO.class);
-            }
-            if (operationMode == 3) { // 边缘优化
-                List<TCrossControlHist> edgeOptList = tCrossControlHists.stream().filter(tCrossControlHist -> tCrossControlHist.getType() == 6).collect(Collectors.toList());
-                BeanListUtils.populateList(edgeOptList, signalOperationModeDTOS, SignalOperationModeDTO.class);
-            }
-            if (operationMode == 4) { // 特勤控制
-                List<TCrossControlHist> specialServiceList = tCrossControlHists.stream().filter(tCrossControlHist -> tCrossControlHist.getType() == 7).collect(Collectors.toList());
-                BeanListUtils.populateList(specialServiceList, signalOperationModeDTOS, SignalOperationModeDTO.class);
+            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);
+                }
+                if (operationMode == 2) { // 手动控制
+                    List<TCrossControlHist> manualControlList = tCrossControlHists.stream().filter(item -> item.getType() < 5 && item.getType() > 1).collect(Collectors.toList());
+                    BeanListUtils.populateList(manualControlList, signalOperationModeDTOS, SignalOperationModeDTO.class);
+                }
+                if (operationMode == 3) { // 边缘优化
+                    List<TCrossControlHist> edgeOptList = tCrossControlHists.stream().filter(tCrossControlHist -> tCrossControlHist.getType() == 6).collect(Collectors.toList());
+                    BeanListUtils.populateList(edgeOptList, signalOperationModeDTOS, SignalOperationModeDTO.class);
+                }
+                if (operationMode == 4) { // 特勤控制
+                    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) {
-            for (TBaseCrossInfo tBaseCrossInfo : tBaseCrossInfos) {
-                if (StringUtils.equals(signalOperationModeDTO.getCrossId(), tBaseCrossInfo.getId())) {
-                    signalOperationModeDTO.setCrossName(tBaseCrossInfo.getName());
-                    signalOperationModeDTO.setOperationTime(signalOperationModeDTO.getStartTime().toString().substring(11, 19));
+            for (SignalOperationModeDTO signalOperationModeDTO : signalOperationModeDTOS) {
+                for (TBaseCrossInfo tBaseCrossInfo : tBaseCrossInfos) {
+                    if (StringUtils.equals(signalOperationModeDTO.getCrossId(), tBaseCrossInfo.getId())) {
+                        signalOperationModeDTO.setCrossName(tBaseCrossInfo.getName());
+                        signalOperationModeDTO.setOperationTime(signalOperationModeDTO.getStartTime().toString().substring(11, 19));
+                    }
                 }
             }
+
         }
+
         return signalOperationModeDTOS;
     }
 }