[add] 运行模式只展示信控路口

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

@@ -624,26 +624,28 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
     @Override
     public List<SignalOperationModeVO> listSignalControlList(Integer operationMode) {
         List<SignalOperationModeVO> signalOperationModeVOS = new ArrayList<>();
-        List<TCrossControlHist> tCrossControlHists = controlHistMapper.selectRecentList();
         LambdaQueryWrapper<TBaseCrossInfo> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(TBaseCrossInfo::getIsSignal, "1");
         List<TBaseCrossInfo> tBaseCrossInfos = tBaseBaseCrossInfoMapper.selectList(wrapper);
-        if (!CollectionUtils.isEmpty(tCrossControlHists)) {
+        List<TCrossControlHist> tCrossControlHists = controlHistMapper.selectRecentList();
+        if (!CollectionUtils.isEmpty(tCrossControlHists) && !CollectionUtils.isEmpty(tBaseCrossInfos)) {
+            List<String> isSignalControlList = tBaseCrossInfos.stream().map(TBaseCrossInfo::getId).collect(Collectors.toList());
+            List<TCrossControlHist> filter = tCrossControlHists.stream().filter(vo -> isSignalControlList.contains(vo.getCrossId())).collect(Collectors.toList());
             if (Objects.nonNull(operationMode)) {
                 if (operationMode == 1) { //中心优化
-                    List<TCrossControlHist> centerOptList = tCrossControlHists.stream().filter(tCrossControlHist -> tCrossControlHist.getType() <= 5 || tCrossControlHist.getType() >= 1).collect(Collectors.toList());
+                    List<TCrossControlHist> centerOptList = filter.stream().filter(tCrossControlHist -> tCrossControlHist.getType() <= 5 || tCrossControlHist.getType() >= 1).collect(Collectors.toList());
                     BeanListUtils.populateList(centerOptList, signalOperationModeVOS, SignalOperationModeVO.class);
                 }
                 if (operationMode == 2) { // 手动控制
-                    List<TCrossControlHist> manualControlList = tCrossControlHists.stream().filter(item -> item.getType() ==7).collect(Collectors.toList());
+                    List<TCrossControlHist> manualControlList = filter.stream().filter(item -> item.getType() ==7).collect(Collectors.toList());
                     BeanListUtils.populateList(manualControlList, signalOperationModeVOS, SignalOperationModeVO.class);
                 }
                 if (operationMode == 3) { // 边缘优化
-                    List<TCrossControlHist> edgeOptList = tCrossControlHists.stream().filter(tCrossControlHist -> tCrossControlHist.getType() == 6).collect(Collectors.toList());
+                    List<TCrossControlHist> edgeOptList = filter.stream().filter(tCrossControlHist -> tCrossControlHist.getType() == 6).collect(Collectors.toList());
                     BeanListUtils.populateList(edgeOptList, signalOperationModeVOS, SignalOperationModeVO.class);
                 }
                 if (operationMode == 4) { // 特勤控制
-                    List<TCrossControlHist> specialServiceList = tCrossControlHists.stream().filter(tCrossControlHist -> tCrossControlHist.getType() == 8).collect(Collectors.toList());
+                    List<TCrossControlHist> specialServiceList = filter.stream().filter(tCrossControlHist -> tCrossControlHist.getType() == 8).collect(Collectors.toList());
                     BeanListUtils.populateList(specialServiceList, signalOperationModeVOS, SignalOperationModeVO.class);
                 }
             } else {