feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -3,6 +3,7 @@ package pps.core.space.service;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import pps.cloud.base.service.IBasePowerLineCloudService;
 import pps.cloud.base.service.IBasePriceStrategyCloudService;
@@ -10,16 +11,18 @@ 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;
 import pps.cloud.prediction.service.data.plant_predicted_power_data.DynamicQueryPlantPredictedPowerOutput;
 import pps.core.common.constant.BusinessConstant;
 import pps.core.common.entity.BaseModel;
+import pps.core.space.entity.SpaceInstitutionDetailEnt;
+import pps.core.space.entity.SpaceInstitutionWellheadEnt;
 import pps.core.space.entity.SpaceOptimizeShortDurationEnt;
 import pps.core.space.entity.SpaceOptimizeShortWellheadEnt;
+import pps.core.space.mapper.SpaceInstitutionDetailMapper;
+import pps.core.space.mapper.SpaceInstitutionWellheadMapper;
 import pps.core.space.mapper.SpaceOptimizeShortDurationMapper;
 import pps.core.space.mapper.SpaceOptimizeShortWellheadMapper;
 import pps.core.space.service.data.SpaceOptimizeDateDuration;
@@ -59,13 +62,15 @@ public class SpaceOptimizeApiService extends SpaceOptimizeBaseService {
                 .build());
         //市电峰谷
         IBasePriceStrategyCloudService strategyCloudService = context.getBean(IBasePriceStrategyCloudService.class);
+        SpaceInstitutionDetailMapper detailMapper = context.getBean(SpaceInstitutionDetailMapper.class);
+        SpaceInstitutionWellheadMapper wellheadMapper = context.getBean(SpaceInstitutionWellheadMapper.class);
+        SpaceOptimizeShortDurationMapper shortDurationMapper = context.getBean(SpaceOptimizeShortDurationMapper.class);
         XListResult<DynamicQueryBasePowerLinePlantViewOutput> plantResult;
         List<DynamicQueryBasePowerLinePlantViewOutput> plantList;
         XListResult<GetBasePriceStrategyDetailOutput> strategyResult;
         List<GetBasePriceStrategyDetailOutput> strategyList;
-        List<DynamicQueryBasePowerLineWellheadViewOutput> wellheadList;
-        XListResult<DynamicQueryBasePowerLineWellheadViewOutput> wellheadResult;
-        SpaceOptimizeShortDurationMapper shortDurationMapper = context.getBean(SpaceOptimizeShortDurationMapper.class);
+        SpaceInstitutionDetailEnt detailEnt;
+        List<SpaceInstitutionWellheadEnt> wellheadList;
         List<DynamicQueryPlantPredictedPowerOutput> generationHourList;
         List<DynamicQueryBasePowerLineOutput> lineList = lineOutputXListResult.getResult();
         for (DynamicQueryBasePowerLineOutput line : lineList) {
@@ -87,12 +92,22 @@ 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();
+            //查对应间开制度
+            detailEnt = detailMapper.selectOne(new LambdaQueryWrapper<SpaceInstitutionDetailEnt>()
+                    .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
+                    .eq(SpaceInstitutionDetailEnt::getLineId, line.getId())
+            );
+            if (ObjectUtil.isEmpty(detailEnt)) {
+                continue;
+            }
+            //查间开关联井口(间抽井,小间开)
+            wellheadList = wellheadMapper.selectList(new LambdaQueryWrapper<SpaceInstitutionWellheadEnt>()
+                    .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
+                    .eq(SpaceInstitutionWellheadEnt::getInstitutionId, detailEnt.getId())
+                    .eq(SpaceInstitutionWellheadEnt::getRunTypeKey, BusinessConstant.INTERVAL_PUMPING_WELL)
+                    .eq(SpaceInstitutionWellheadEnt::getIntervalTypeKey, "0")
+                    .orderByAsc(SpaceInstitutionWellheadEnt::getStartSeq)
+            );
             if (CollUtil.isEmpty(wellheadList)) {
                 continue;
             }
@@ -101,7 +116,7 @@ public class SpaceOptimizeApiService extends SpaceOptimizeBaseService {
                     .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
                     .eq(SpaceOptimizeShortDurationEnt::getOptimizeDate, of)
                     .in(SpaceOptimizeShortDurationEnt::getWellheadId, wellheadList.stream()
-                            .map(DynamicQueryBasePowerLineWellheadViewOutput::getWellheadId)
+                            .map(SpaceInstitutionWellheadEnt::getWellheadId)
                             .collect(Collectors.toList())
                     )
                     .orderByAsc(SpaceOptimizeShortDurationEnt::getOpenWellTime)