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

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FaultPowerCutMapper.java

@@ -34,4 +34,6 @@ public interface FaultPowerCutMapper extends BaseMapper<FaultPowerCut> {
 
     @Select("select * from fhzg_fault_power_cut where id=#{faultId}  ")
     FhzgFaultPowerCutVO getSchemeByFaultId(Long faultId);
+
+    FaultPowerCut getPowerCutByFaultNo(@Param("faultNo")String faultNo);
 }

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

@@ -4,26 +4,24 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Maps;
-import com.hdkj.lt.bf.mapper.*;
-import com.hdkj.lt.core.bizms.modle.po.FeederTopo;
-import com.hdkj.lt.feign.IFaultCreateClient;
-import com.hdkj.lt.modle.dto.fault.RegenerateFaultRequest;
 import com.hdkj.lt.base.exception.BusinessException;
 import com.hdkj.lt.bf.entity.dto.HasDataTagDTO;
 import com.hdkj.lt.bf.entity.vo.FhzgFaultPowerCutSectionVO;
 import com.hdkj.lt.bf.entity.vo.FhzgFaultPowerCutVO;
+import com.hdkj.lt.bf.mapper.*;
 import com.hdkj.lt.bf.service.*;
 import com.hdkj.lt.bf.service.aspect.UserCountyCodeAuto;
 import com.hdkj.lt.core.bizms.modle.dto.FhzgFaultAwaitTransferUsersCountDTO;
 import com.hdkj.lt.core.bizms.modle.dto.FhzgFaultDistCustomerDTO;
 import com.hdkj.lt.core.bizms.modle.dto.FhzgFaultDistMappingFileDTO;
+import com.hdkj.lt.core.bizms.modle.po.FeederTopo;
 import com.hdkj.lt.core.bizms.modle.po.fault.*;
+import com.hdkj.lt.feign.IFaultCreateClient;
+import com.hdkj.lt.modle.dto.fault.RegenerateFaultRequest;
 import com.hdkj.lt.modle.dto.jsty.AllSwitchInfoListDTO;
-import com.ruoyi.common.core.utils.StringUtils;
 import io.jsonwebtoken.lang.Assert;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.utils.Lists;
@@ -291,6 +289,11 @@ public class FaultPowerCutServiceImpl extends ServiceImpl<FaultPowerCutMapper, F
 
     @Override
     public void regenerateFault(RegenerateFaultRequest request) {
+        FaultPowerCut entity = this.baseMapper.getPowerCutByFaultNo(request.getFaultNo());
+        FaultPowerCutSwitch one = faultPowerCutSwitchService.getOne(new LambdaQueryWrapper<FaultPowerCutSwitch>().eq(FaultPowerCutSwitch::getFaultId, entity.getId()));
+        if (Objects.equals(request.getStartSwitch(), one.getStartSwitch()) && Objects.equals(one.getEndSwitch(), request.getEndSwitch())) {
+            throw new BusinessException("所选区段与默认区段相同");
+        }
         log.info(request.toString());
         faultCreateClient.regenerateFault(request);
     }

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

@@ -97,4 +97,10 @@
         </where>
 
     </select>
+    <select id="getPowerCutByFaultNo" resultType="com.hdkj.lt.core.bizms.modle.po.fault.FaultPowerCut">
+        select *
+        from fhzg_fault_power_cut pc
+                 left join grid_pd_outage_event_base oe on pc.fault_no = oe.id
+        where pc.fault_source = '供指' and oe.outage_number = #{faultNo}
+    </select>
 </mapper>