bf mq-全口径低电压跳转补丁

common/common-core/src/main/java/com/hdkj/lt/core/bizms/modle/po/voltageLimitViolation/FhzgInfoLimitTransferScheme.java

@@ -62,6 +62,11 @@ public class FhzgInfoLimitTransferScheme implements Serializable {
      */
     @ApiModelProperty(value = "方案选定状态")
     private String schemeState;
+    /**
+     * 电压治理条转id
+     */
+    @ApiModelProperty(value = "电压越限id")
+    private String schemeNo;
 
     /**
      * 创建人

common/common-core/src/main/java/com/hdkj/lt/modle/dto/voltageLimitViolation/XferPlanDTO.java

@@ -27,7 +27,8 @@ public class XferPlanDTO {
     private Double transferRate;
     // 可行公变和中压用户接入点额定容量之和
     private Double transferCapacity;
-//
+    //
     private List<AllSwitchInfoListDTO> allSwitchInfoList;
+    private String id;
 
 }

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/dto/VolLimitViolationSchemeDetailDTO.java

@@ -14,4 +14,6 @@ public class VolLimitViolationSchemeDetailDTO {
     private String lineId;
     @ApiModelProperty(value = "电压越限调优事件id")
     private String limitId;
+    @ApiModelProperty(value = "电压越限调优事件编号")
+    private String limitNo;
 }

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/dto/VolPowerCutDTO.java

@@ -40,7 +40,11 @@ public class VolPowerCutDTO {
      */
     @ApiModelProperty(value = "所属区县")
     private String countyCode;
-
+    /**
+     * 推演平台json时间id
+     */
+    @ApiModelProperty(value = "全口径低电压id")
+    private String limitNo;
     /**
      * 越限开始时间
      */

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

@@ -87,6 +87,7 @@ public class FhzgVoltageLimitViolationTransferSchemeDetailServiceImpl extends Se
     public List<FhzgInfoLimitTransferScheme> getVolLimitSchemeList(VolLimitViolationSchemeDetailDTO dto) {
         LambdaQueryWrapper<FhzgInfoLimitTransferScheme> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.select(FhzgInfoLimitTransferScheme::getId,
+                        FhzgInfoLimitTransferScheme::getSchemeNo,
                         FhzgInfoLimitTransferScheme::getCheckState,
                         FhzgInfoLimitTransferScheme::getSchemeName,
                         FhzgInfoLimitTransferScheme::getEvaluationScore,
@@ -95,8 +96,8 @@ public class FhzgVoltageLimitViolationTransferSchemeDetailServiceImpl extends Se
                         FhzgInfoLimitTransferScheme::getSchemeState,
                         FhzgInfoLimitTransferScheme::getSwitchNum,
                         FhzgInfoLimitTransferScheme::getNonAutoSwitchNum)
-                .eq(FhzgInfoLimitTransferScheme::getLimitId, dto.getLimitId())
-                .eq(FhzgInfoLimitTransferScheme::getCheckState, dto.getType());
+                .eq(FhzgInfoLimitTransferScheme::getLimitId, dto.getLimitId());
+        //.eq(FhzgInfoLimitTransferScheme::getCheckState, dto.getType());
         List<FhzgInfoLimitTransferScheme> list = transferSchemeMapper.selectList(queryWrapper);
         list.forEach(e -> {
             if (e.getEvaluationScore() != null) {

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

@@ -75,6 +75,9 @@
             <if test="queryDTO.volType != null and queryDTO.volType != ''">
                 and t1.event_type = #{queryDTO.volType}
             </if>
+            <if test="queryDTO.limitNo != null and queryDTO.limitNo != ''">
+                and t1.limit_no = #{queryDTO.limitNo}
+            </if>
         </where>
         order by t1.event_create_time desc
     </select>

services/load-transfer-mq/src/main/java/com/hdkj/lt/mq/service/voltageLimitViolation/impl/FhzgVoltageLimitViolationPowerCutServiceImpl.java

@@ -141,7 +141,7 @@ public class FhzgVoltageLimitViolationPowerCutServiceImpl extends ServiceImpl<Fh
                         data.getXferPlanList().forEach(p -> {
                             Long schemeId = IdUtil.getSnowflakeNextId();
                             FhzgInfoLimitTransferScheme transferScheme = new FhzgInfoLimitTransferScheme();
-                            transferScheme.setId(schemeId).setLimitId(limitId)
+                            transferScheme.setId(schemeId).setLimitId(limitId).setSchemeNo(p.getId())
                                     .setSchemeState("0").setCheckState(1).setSchemeJson(JSON.toJSONString(p));
                             //保存方案基本信息
                             schemeMapper.insert(transferScheme);