[update] 实时监控-恢复原始方案优化

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/CrossOptimizeServiceImpl.java

@@ -67,7 +67,7 @@ public class CrossOptimizeServiceImpl implements CrossOptimizeService {
             Map<String, List<CrossTurnDataRealtimeDTO>> turnDataRealtime = listTurnDataRealtime(abnormalCrossList);
 
             // 恢复优化路口原始方案
-            restoreOptCrossOriPlan(abnormalCrossList, phaseMap);
+            restoreOptCrossOriSchema(abnormalCrossList, phaseMap);
 
             Map<Integer, List<CrossDataRealtimeDTO>> crossDataMap = abnormalCrossList.stream().collect(Collectors.groupingBy(CrossDataRealtimeDTO::getStatus));
             abnormalCrossList = crossDataMap.get(CrossStatusEnum.SPILLOVER.getCode());  // 溢出
@@ -121,26 +121,18 @@ public class CrossOptimizeServiceImpl implements CrossOptimizeService {
      *
      * @param abnormalCrossList
      */
-    private void restoreOptCrossOriPlan(List<CrossDataRealtimeDTO> abnormalCrossList, Map<String, CrossPhaseDTO> phaseMap) throws Exception {
+    private void restoreOptCrossOriSchema(List<CrossDataRealtimeDTO> abnormalCrossList, Map<String, CrossPhaseDTO> phaseMap) throws Exception {
         List<String> abnormalCrossIdList = abnormalCrossList.stream().map(CrossDataRealtimeDTO::getCrossId).collect(Collectors.toList());
         for (String optCrossId : CROSS_OPT) {
-            String crossId = null;
             if (!abnormalCrossIdList.contains(optCrossId)) {
-                // 路口原始方案 todo 优化后恢复方案
-                CrossSchemeDTO oriCrossSchemeDTO = null;
-                List<CrossSchemeDTO> schemeDTOList = crossSchemeService.listCrossSchemeDetails(optCrossId);
-                if (!CollectionUtils.isEmpty(schemeDTOList) && schemeDTOList.size() == 1) {
-                    crossId = optCrossId;
-                    oriCrossSchemeDTO = schemeDTOList.get(0);
+                // 下发原始方案
+                SchemeSendVO schemeSendVO = getSchemeSendVO(optCrossId, phaseMap, null);
+                JsonViewObject jsonViewObject = utcFeignClients.schemeSend(schemeSendVO);
+                if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
+                    log.error("实时监控路口优化方案下发远程调用异常！", jsonViewObject);
+                    throw new Exception();
                 }
             }
-            // 下发原始方案
-            SchemeSendVO schemeSendVO = getSchemeSendVO(crossId, phaseMap, null);
-            JsonViewObject jsonViewObject = utcFeignClients.schemeSend(schemeSendVO);
-            if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
-                log.error("实时监控路口优化方案下发异常！");
-                throw new Exception();
-            }
         }
     }
 
@@ -187,7 +179,7 @@ public class CrossOptimizeServiceImpl implements CrossOptimizeService {
             SchemeSendVO schemeSendVO = getSchemeSendVO(crossId, phaseMap, phaseTimeOptResultMap);
             JsonViewObject jsonViewObject = utcFeignClients.schemeSend(schemeSendVO);
             if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
-                log.error("实时监控路口优化方案下发异常！");
+                log.error("实时监控路口优化方案下发远程调用异常！", jsonViewObject);
                 throw new Exception();
             }