Commit 0cf69f2b authored by ZWT's avatar ZWT

feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent ffc8c8da
...@@ -63,9 +63,10 @@ public class SpaceOptimizeApiService extends SpaceOptimizeBaseService { ...@@ -63,9 +63,10 @@ public class SpaceOptimizeApiService extends SpaceOptimizeBaseService {
List<DynamicQueryBasePowerLinePlantViewOutput> plantList; List<DynamicQueryBasePowerLinePlantViewOutput> plantList;
XListResult<GetBasePriceStrategyDetailOutput> strategyResult; XListResult<GetBasePriceStrategyDetailOutput> strategyResult;
List<GetBasePriceStrategyDetailOutput> strategyList; List<GetBasePriceStrategyDetailOutput> strategyList;
List<DynamicQueryPlantPredictedPowerOutput> generationHourList;
List<DynamicQueryBasePowerLineWellheadViewOutput> wellheadList; List<DynamicQueryBasePowerLineWellheadViewOutput> wellheadList;
XListResult<DynamicQueryBasePowerLineWellheadViewOutput> wellheadResult; XListResult<DynamicQueryBasePowerLineWellheadViewOutput> wellheadResult;
SpaceOptimizeShortDurationMapper shortDurationMapper = context.getBean(SpaceOptimizeShortDurationMapper.class);
List<DynamicQueryPlantPredictedPowerOutput> generationHourList;
List<DynamicQueryBasePowerLineOutput> lineList = lineOutputXListResult.getResult(); List<DynamicQueryBasePowerLineOutput> lineList = lineOutputXListResult.getResult();
for (DynamicQueryBasePowerLineOutput line : lineList) { for (DynamicQueryBasePowerLineOutput line : lineList) {
//查线路下所有电站 //查线路下所有电站
...@@ -95,6 +96,19 @@ public class SpaceOptimizeApiService extends SpaceOptimizeBaseService { ...@@ -95,6 +96,19 @@ public class SpaceOptimizeApiService extends SpaceOptimizeBaseService {
if (CollUtil.isEmpty(wellheadList)) { if (CollUtil.isEmpty(wellheadList)) {
continue; continue;
} }
//查间开优化时间段
List<SpaceOptimizeShortDurationEnt> shortDurationList = shortDurationMapper.selectList(new LambdaQueryWrapper<SpaceOptimizeShortDurationEnt>()
.eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
.eq(SpaceOptimizeShortDurationEnt::getOptimizeDate, of)
.in(SpaceOptimizeShortDurationEnt::getWellheadId, wellheadList.stream()
.map(DynamicQueryBasePowerLineWellheadViewOutput::getWellheadId)
.collect(Collectors.toList())
)
.orderByAsc(SpaceOptimizeShortDurationEnt::getOpenWellTime)
);
if (CollUtil.isEmpty(shortDurationList)) {
continue;
}
//查当日预测发电时间段 //查当日预测发电时间段
generationHourList = this.getAveragePowerGenerationHourList(context, DynamicQueryPlantPredictedPowerInput.builder() generationHourList = this.getAveragePowerGenerationHourList(context, DynamicQueryPlantPredictedPowerInput.builder()
.plantIds(plantList.stream() .plantIds(plantList.stream()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment