问题修复

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/vo/ReconSwitchSeqVO.java

@@ -26,6 +26,12 @@ public class ReconSwitchSeqVO {
     /** 热校验是否通过 */
     private Boolean hotCheckPassed;
 
+    /** 热校验校验原因 */
+    private String hotCheckReason;
+
+    /** 安全校验校验原因 */
+    private String safetyCheckReason;
+
     /** 安全校验是否通过 */
     private Boolean safetyCheckPassed;
 }

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/ReconQueryServiceImpl.java

@@ -100,6 +100,7 @@ public class ReconQueryServiceImpl implements ReconQueryService {
         // 安全校验从主表获取
         FhzgReconResult result = reconResultMapper.selectById(reqDTO.getId());
         Boolean safetyCheckPassed = Objects.nonNull(result) ? result.getFinalCheckIsSafe() : null;
+        String safetyCheckReason = Objects.nonNull(result) ? result.getFinalCheckDetails() : null;
 
         Page<FhzgReconSwitchOp> page = new Page<>(reqDTO.getPageNum(), reqDTO.getPageSize());
         Page<FhzgReconSwitchOp> resultPage = reconSwitchOpMapper.selectPage(page,
@@ -111,9 +112,13 @@ public class ReconQueryServiceImpl implements ReconQueryService {
                 new LambdaQueryWrapper<FhzgReconSwitchSeq>()
                         .eq(FhzgReconSwitchSeq::getResultId, reqDTO.getId()));
         Map<String, Boolean> hotCheckMap = new HashMap<>();
+        Map<String, String> hotCheckReasonMap = new HashMap<>();
         switchSeqList.forEach(i -> {
             hotCheckMap.put(i.getOpenBreakerId(), i.getHotCheckIsSafe());
             hotCheckMap.put(i.getCloseBreakerId(), i.getHotCheckIsSafe());
+            hotCheckReasonMap.put(i.getOpenBreakerId(), i.getHotCheckReason());
+            hotCheckReasonMap.put(i.getCloseBreakerId(), i.getHotCheckReason());
+
         });
 
         PageVO<ReconSwitchSeqVO> voPage = new PageVO<>();
@@ -123,7 +128,9 @@ public class ReconQueryServiceImpl implements ReconQueryService {
         List<ReconSwitchSeqVO> collect = resultPage.getRecords().stream().map(this::buildSwitchSeqVO).collect(Collectors.toList());
         collect.forEach(i -> {
             i.setSafetyCheckPassed(safetyCheckPassed);
+            i.setSafetyCheckReason(safetyCheckReason);
             i.setHotCheckPassed(hotCheckMap.get(i.getSwitchId()));
+            i.setHotCheckReason(hotCheckReasonMap.get(i.getSwitchId()));
         });
         voPage.setRecords(collect);
         return voPage;
@@ -388,9 +395,9 @@ public class ReconQueryServiceImpl implements ReconQueryService {
     }
 
     private Integer isOverLimit(BigDecimal vol) {
-        if (vol.compareTo(new BigDecimal("9.3")) < 0) {
+        if (vol.compareTo(new BigDecimal("9.3")) <= 0) {
             return 1;
-        } else if (vol.compareTo(new BigDecimal("10.7")) > 0) {
+        } else if (vol.compareTo(new BigDecimal("10.7")) >= 0) {
             return 2;
         }
         return 0;

services/load-transfer-bf/src/main/resources/mapper/FhzgReconVolDetailMapper.xml

@@ -8,14 +8,14 @@
         select *
         from fhzg_recon_vol_detail
         where result_id = #{id}
-        and (before_u > 10.7 or before_u < 9.3
-        or after_u > 10.7 or after_u < 9.3)
+        and (before_u >= 10.7 or 9.3 >= before_u
+        or after_u >= 10.7 or 9.3 >= after_u)
         union
         select *
         from fhzg_recon_vol_detail
         where result_id = #{id}
-        and (before_u < 10.7 or before_u > 9.3
-        or after_u < 10.7 or after_u > 9.3)
+        and (10.7 > before_u or before_u > 9.3
+        or 10.7 > after_u or after_u > 9.3)
         order by abs(after_u-before_u)) a limit 10
     </select>
 </mapper>

services/load-transfer-si/src/main/resources/bootstrap.yml

@@ -3,7 +3,4 @@ spring:
     active: @environment@
 
 simulation:
-  xToken: 1sadasd123-dadasd
-
-server:
-  address: 127.0.0.1
+  xToken: 1sadasd123-dadasd