[update] 中心优化和时间表为中心控制

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

@@ -632,7 +632,7 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
         if (!CollectionUtils.isEmpty(tCrossControlHists)) {
             if (Objects.nonNull(operationMode)) {
                 if (operationMode == 1) { //中心优化
-                    List<TCrossControlHist> centerOptList = tCrossControlHists.stream().filter(tCrossControlHist -> tCrossControlHist.getType() == 5).collect(Collectors.toList());
+                    List<TCrossControlHist> centerOptList = tCrossControlHists.stream().filter(tCrossControlHist -> tCrossControlHist.getType() == 5 || tCrossControlHist.getType() == 1).collect(Collectors.toList());
                     BeanListUtils.populateList(centerOptList, signalOperationModeVOS, SignalOperationModeVO.class);
                 }
                 if (operationMode == 2) { // 手动控制
@@ -678,7 +678,7 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
         for (SignalOperationModeVO modeVO : signalOperationModeVOS) {
             Integer type = modeVO.getType();
             if (Objects.nonNull(type)) {
-                if (type == 5) {
+                if (type == 1 || type == 5) {
                     centerOptCount++;
                 }
                 if (type == 6) { // todo 提供测试数据，边缘优化还没有