重新选定故障区间开关保存

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

@@ -284,6 +284,7 @@ public class FaultPowerCutServiceImpl extends ServiceImpl<FaultPowerCutMapper, F
 
     @Override
     public void regenerateFault(RegenerateFaultRequest request) {
+        log.info(request.toString());
         faultCreateClient.regenerateFault(request);
     }
 }

services/load-transfer-mq/src/main/java/com/hdkj/lt/mq/entity/po/FhzgFaultPowerCut.java

@@ -159,6 +159,16 @@ public class FhzgFaultPowerCut implements Serializable {
      */
     private String feederCheckRuleJson;
 
+    /**
+     * 重新选定故障开始开关
+     */
+    private String reFaultStartSwitchId;
+
+    /**
+     * 重新选定故障结束开关
+     */
+    private String reFaultEndSwitchId;
+
     /**
      * 创建人
      */

services/load-transfer-mq/src/main/java/com/hdkj/lt/mq/feign/FaultCreateClient.java

@@ -12,6 +12,7 @@ import com.hdkj.lt.mq.service.base.GridPdOutageEventBaseService;
 import com.hdkj.lt.mq.service.fault.AcceptFaultPowerCutService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
@@ -32,7 +33,8 @@ public class FaultCreateClient implements IFaultCreateClient {
 
 
     @Override
-    public ApiResponse<Boolean> regenerateFault(RegenerateFaultRequest request) {
+    public ApiResponse<Boolean> regenerateFault(@RequestBody RegenerateFaultRequest request) {
+        log.info(request.toString());
         //根据OutageNumber查询对应的停电事件
         GridPdOutageEventBase event = gridPdOutageEventBaseService.getOne(new LambdaQueryWrapper<GridPdOutageEventBase>()
                         .eq(GridPdOutageEventBase::getOutageNumber, request.getFaultNo())
@@ -63,7 +65,11 @@ public class FaultCreateClient implements IFaultCreateClient {
         breakerInfo.setBreakerPsrId(request.getStartSwitch());
         breakerInfo.setBreakerName(request.getStartSwitchName());
         breakerInfo.setBreakerPsrType(request.getStartSwitchType());
+        BreakerInfo breakerInfo2 = new BreakerInfo();
+        breakerInfo2.setBreakerPsrId(request.getEndSwitch());
+        breakerInfo2.setBreakerName(request.getEndSwitchName());
         breakerInfos.add(breakerInfo);
+        breakerInfos.add(breakerInfo2);
         feederInfo.setBreakerList(breakerInfos);
         feederInfo.setFeederPsrId(event.getRdtFeederId());
         feederInfos.add(feederInfo);

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

@@ -2,7 +2,6 @@ package com.hdkj.lt.mq.service.fault.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Snowflake;
-import cn.hutool.core.lang.generator.SnowflakeGenerator;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
@@ -36,9 +35,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @author luorui
@@ -78,6 +74,7 @@ public class AcceptFaultPowerCutServiceImpl implements AcceptFaultPowerCutServic
         if (CollUtil.isNotEmpty(result) && !"负荷转供".equals(acceptFaultPowerCutDTO.getSourceSystem())) {
             throw new BusinessException("已存在重复的faultNo:" + acceptFaultPowerCutDTO.getFaultNo());
         }
+
         FhzgFaultPowerCut fhzgFaultPowerCut = new FhzgFaultPowerCut();
         //生成主键
         Snowflake snowflake = IdUtil.getSnowflake(1,1);
@@ -128,6 +125,10 @@ public class AcceptFaultPowerCutServiceImpl implements AcceptFaultPowerCutServic
         fhzgFaultPowerCut.setCreateTime(LocalDateTime.now());
         fhzgFaultPowerCut.setCreator(8L);
         fhzgFaultPowerCut.setFeederSwitchInfo(JSON.toJSONString(ss));
+        if ("负荷转供".equals(acceptFaultPowerCutDTO.getSourceSystem())) {
+            fhzgFaultPowerCut.setReFaultStartSwitchId(acceptFaultPowerCutDTO.getFeederList().get(0).getBreakerList().get(0).getBreakerPsrId());
+            fhzgFaultPowerCut.setReFaultEndSwitchId(acceptFaultPowerCutDTO.getFeederList().get(0).getBreakerList().get(1).getBreakerPsrId());
+        }
         faultPowerCutService.save(fhzgFaultPowerCut);
         log.info("保存计划数据成功faultId:{}", faultId);
 //        saveFaultFile(fhzgFaultPowerCut.getLineId(), faultId);

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

@@ -96,6 +96,9 @@ public class FaultFhzgReasoningPlatformServiceImpl implements FaultFhzgReasoning
         // 查询故障信息
         FhzgFaultPowerCut faultPowerCut = faultPowerCutServiceService.getById(faultId);
         GridPdOutageEventBase gridPdOutageEventBase = faultFhzgReasoningPlatformMapper.getFaultInfoById(faultPowerCut.getFaultNo());
+        if("负荷转供".equals(faultPowerCut.getFaultSource())){
+            gridPdOutageEventBase.setFaultEquipId(faultPowerCut.getReFaultStartSwitchId());
+        }
         String feeder = gridPdOutageEventBase.getRdtFeederId();
         result.setFeederId(feeder);