Commit 03125669 authored by ZWT's avatar ZWT

feat(能源管理系统): 测试问题修复

1.修改间开制度管理-长期间开优化模块详情接口,增加查询当月长期光伏预测功率数据逻辑;
2.开发光伏预测Cloud模块,条件查询每小时长期/中短期光伏预测发电量列表接口,完成接口冒烟测试;
3.修改间开制度管理-中短期间开优化模块详情接口,增加查询当前中短期光伏预测功率数据逻辑;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 2d9e0ce4
package pps.core.space.service; package pps.core.space.service;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailInput; import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailInput;
import pps.cloud.prediction.service.data.plant_predicted_power_data.DynamicQueryPlantPredictedPowerInput;
import pps.core.common.constant.BusinessConstant; import pps.core.common.constant.BusinessConstant;
import pps.core.common.entity.BaseModel; import pps.core.common.entity.BaseModel;
import pps.core.space.entity.*; import pps.core.space.entity.*;
...@@ -38,7 +40,7 @@ import java.util.stream.Collectors; ...@@ -38,7 +40,7 @@ import java.util.stream.Collectors;
*/ */
@XService @XService
@XText("中短期间开优化模块") @XText("中短期间开优化模块")
public class SpaceOptimizeMidPeriodService { public class SpaceOptimizeMidPeriodService extends SpaceOptimizeBaseService {
/** /**
* 中短期间开优化--分页列表 * 中短期间开优化--分页列表
...@@ -145,6 +147,19 @@ public class SpaceOptimizeMidPeriodService { ...@@ -145,6 +147,19 @@ public class SpaceOptimizeMidPeriodService {
} else { } else {
output.setWellheadList(new ArrayList<>(0)); output.setWellheadList(new ArrayList<>(0));
} }
//查功率预测信息
output.setPowerGenerationList(
super.getAveragePowerGenerationHourList(context, DynamicQueryPlantPredictedPowerInput.builder()
.plantIds(super.getOptimizeLineRelation(context, CollUtil.newArrayList(detailEnt))
.getPlantIdsByLineIdMap()
.get(detailEnt.getLineId()))
.startTime(DateUtil.date(period.getCreateTime())
.toString(BusinessConstant.DATE_FORMAT_DAY))
.endTime(DateUtil.date(period.getOptimizeDeadline())
.toString(BusinessConstant.DATE_FORMAT_DAY))
.dateType(BusinessConstant.ONE)
.build())
);
return XSingleResult.success(output); return XSingleResult.success(output);
} }
} }
\ No newline at end of file
...@@ -2,6 +2,7 @@ package pps.core.space.service.data.space_optimize_mid_period; ...@@ -2,6 +2,7 @@ package pps.core.space.service.data.space_optimize_mid_period;
import lombok.Data; import lombok.Data;
import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailOutput; import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailOutput;
import pps.cloud.prediction.service.data.plant_predicted_power_data.DynamicQueryPlantPredictedPowerOutput;
import pps.core.space.service.data.SpaceOptimizeDateOutput; import pps.core.space.service.data.SpaceOptimizeDateOutput;
import pps.core.space.service.data.space_optimize_mid_wellhead.GetSpaceOptimizeMidWellheadOutput; import pps.core.space.service.data.space_optimize_mid_wellhead.GetSpaceOptimizeMidWellheadOutput;
import xstartup.annotation.XText; import xstartup.annotation.XText;
...@@ -59,4 +60,10 @@ public class GetSpaceOptimizeMidPeriodViewOutput { ...@@ -59,4 +60,10 @@ public class GetSpaceOptimizeMidPeriodViewOutput {
*/ */
@XText("井口信息") @XText("井口信息")
List<GetSpaceOptimizeMidWellheadOutput> wellheadList; List<GetSpaceOptimizeMidWellheadOutput> wellheadList;
/**
* 功率预测列表
*/
@XText("功率预测列表")
List<DynamicQueryPlantPredictedPowerOutput> powerGenerationList;
} }
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