feat(零碳): 长庆

1.修复登录页面登录接口验证码输入后不需要验证直接能登录的问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C09-base/pps-cloud-base/src/main/java/pps/cloud/base/service/data/base_power_line_wellhead/DynamicQueryBasePowerLineWellheadInput.java

@@ -31,4 +31,10 @@ public class DynamicQueryBasePowerLineWellheadInput {
 
     @XText("电站ID集合")
     private List<String> plantIds;
+
+    /**
+     * 运行类型
+     */
+    @XText("运行类型key(字典获取)")
+    private String runTypeKey;
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePowerLineCloudServiceImpl.java

@@ -129,6 +129,7 @@ public class BasePowerLineCloudServiceImpl implements IBasePowerLineCloudService
         BasePowerLineWellheadViewMapper wellheadViewMapper = context.getBean(BasePowerLineWellheadViewMapper.class);
         List<BasePowerLineWellheadView> wellheadViews = wellheadViewMapper.selectWellheadListByParam(
                 BasePowerLineWellheadView.builder()
+                        .runTypeKey(input.getRunTypeKey())
                         .lineId(input.getLineId())
                         .lineIds(input.getLineIds())
                         .wellheadIds(input.getWellheadIds())

C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BasePowerLineWellheadViewMapper.xml

@@ -77,6 +77,9 @@
         base_power_line_wellhead l
         JOIN base_wellhead w ON l.wellhead_id = w.id
         <where>
+            <if test="runTypeKey!=null and runTypeKey!=''">
+                AND w.run_type_key = #{runTypeKey}
+            </if>
             <if test="lineId!=null and lineId!=''">
                 AND l.line_id = #{lineId}
             </if>

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeApiService.java

@@ -10,6 +10,8 @@ import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineInpu
 import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineOutput;
 import pps.cloud.base.service.data.base_power_line_plant.DynamicQueryBasePowerLinePlantInput;
 import pps.cloud.base.service.data.base_power_line_plant.DynamicQueryBasePowerLinePlantViewOutput;
+import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadInput;
+import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadViewOutput;
 import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailInput;
 import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailOutput;
 import pps.cloud.prediction.service.data.plant_predicted_power_data.DynamicQueryPlantPredictedPowerInput;
@@ -62,6 +64,8 @@ public class SpaceOptimizeApiService extends SpaceOptimizeBaseService {
         XListResult<GetBasePriceStrategyDetailOutput> strategyResult;
         List<GetBasePriceStrategyDetailOutput> strategyList;
         List<DynamicQueryPlantPredictedPowerOutput> generationHourList;
+        List<DynamicQueryBasePowerLineWellheadViewOutput> wellheadList;
+        XListResult<DynamicQueryBasePowerLineWellheadViewOutput> wellheadResult;
         List<DynamicQueryBasePowerLineOutput> lineList = lineOutputXListResult.getResult();
         for (DynamicQueryBasePowerLineOutput line : lineList) {
             //查线路下所有电站
@@ -82,6 +86,15 @@ public class SpaceOptimizeApiService extends SpaceOptimizeBaseService {
             if (CollUtil.isEmpty(strategyList)) {
                 continue;
             }
+            //查线路关联井口(间抽井)
+            wellheadResult = lineCloudService.getPowerLineWellheadList(context, DynamicQueryBasePowerLineWellheadInput.builder()
+                    .lineId(line.getId())
+                    .runTypeKey(BusinessConstant.INTERVAL_PUMPING_WELL)
+                    .build());
+            wellheadList = wellheadResult.getResult();
+            if (CollUtil.isEmpty(wellheadList)) {
+                continue;
+            }
             //查当日预测发电时间段
             generationHourList = this.getAveragePowerGenerationHourList(context, DynamicQueryPlantPredictedPowerInput.builder()
                     .plantIds(plantList.stream()