故障开关顺序修改

services/load-transfer-mq/src/main/java/com/hdkj/lt/mq/service/fault/impl/FhzgFaultAnalyzeCalculateDecudeServiceImpl.java

@@ -88,10 +88,10 @@ public class FhzgFaultAnalyzeCalculateDecudeServiceImpl implements FhzgFaultAnal
      * @param xferFaultMap
      */
     @Override
-    public void analyzeXferFaultList(Long faultId, Map<Long, XferPlanDTO> xferFaultMap, LoopCheckRuleDTO loopCheckRuledto,Map<String, FeederCheckRuleDTO> feederCheckRuleDTOMap) {
+    public void analyzeXferFaultList(Long faultId, Map<Long, XferPlanDTO> xferFaultMap, LoopCheckRuleDTO loopCheckRuledto, Map<String, FeederCheckRuleDTO> feederCheckRuleDTOMap) {
         // 查询本侧线路
         FhzgFaultPowerCut fhzgFaultPowerCut = fhzgFaultAnalyzeCalculateDecudeMapper.getLineNameByFaultId(faultId);
-        Snowflake snowflake = IdUtil.getSnowflake(1,1);
+        Snowflake snowflake = IdUtil.getSnowflake(1, 1);
         for (Long schemeId : xferFaultMap.keySet()) {
             // 根据方案ID获取方案数据
             XferPlanDTO xferFaultDTO = xferFaultMap.get(schemeId);
@@ -107,6 +107,7 @@ public class FhzgFaultAnalyzeCalculateDecudeServiceImpl implements FhzgFaultAnal
                     .collect(Collectors.toMap(k -> k.getLinkSwitch().getPsrID(), v -> v));
             int seq = 0;
             boolean orderIdIsAllNull = breakerOperationOrderList.stream().allMatch(i -> i.getOrderId() == null);
+            breakerOperationOrderList.sort(Comparator.comparing(BreakerInfoDTO::getBreakerOperation));
             for (BreakerInfoDTO breakerInfoDTO : breakerOperationOrderList) {
                 FaultTransferSchemeSwitchingSequence switchingSequence = new FaultTransferSchemeSwitchingSequence();
                 Long switchingSequenceId = snowflake.nextId();
@@ -123,9 +124,9 @@ public class FhzgFaultAnalyzeCalculateDecudeServiceImpl implements FhzgFaultAnal
                 }
                 switchingSequence.setOperationContent(String.valueOf(breakerInfoDTO.getBreakerOperation()));
                 //操作顺序
-                if(orderIdIsAllNull) {
+                if (orderIdIsAllNull) {
                     switchingSequence.setSwitchingSeq(seq++);
-                }else {
+                } else {
                     switchingSequence.setSwitchingSeq(breakerInfoDTO.getOrderId());
                 }
                 //switchingSequence.setLoopCloseCheck();
@@ -150,7 +151,7 @@ public class FhzgFaultAnalyzeCalculateDecudeServiceImpl implements FhzgFaultAnal
 
                     FeederCheckRuleDTO feederCheckRuleDTO = feederCheckRuleDTOMap.get(linkLineInfo.getPsrID());
                     //对侧线路 额定电流
-                    if(feederCheckRuleDTO != null) {
+                    if (feederCheckRuleDTO != null) {
                         switchingFinalCheck.setAllowMaxCurrent(String.valueOf(feederCheckRuleDTO.getRateCurrent()));
                     }
                     // 对侧预估最大电流
@@ -206,7 +207,7 @@ public class FhzgFaultAnalyzeCalculateDecudeServiceImpl implements FhzgFaultAnal
                     List<FinalBreakerSafetyCheckResultDTO> finalBreakerSafetyCheckResultDTO = finalCheck.getBreakerSafetyCheckResult();
                     if (CollUtil.isNotEmpty(finalBreakerSafetyCheckResultDTO)) {
                         //在校验不通过的开关列表中筛选出终态校验不通过的数据checkType ='2' 或者"3"
-                        List<FinalBreakerSafetyCheckResultDTO> finalBreakerSafetyCheckResultFinalDTO = finalBreakerSafetyCheckResultDTO.stream().filter(e -> StrUtil.equals(e.getCheckType(), "2")||StrUtil.equals(e.getCheckType(), "3")).collect(Collectors.toList());
+                        List<FinalBreakerSafetyCheckResultDTO> finalBreakerSafetyCheckResultFinalDTO = finalBreakerSafetyCheckResultDTO.stream().filter(e -> StrUtil.equals(e.getCheckType(), "2") || StrUtil.equals(e.getCheckType(), "3")).collect(Collectors.toList());
                         if (CollUtil.isNotEmpty(finalBreakerSafetyCheckResultFinalDTO)) {
                             //只要有数据则说明开关 电流校验不通过
                             switchingFinalCheck.setSwitchCurrentCheck("0");