Commit b125d23c authored by ZWT's avatar ZWT

feat(零碳): 长庆演示系统新增功能

1.修改第三方日累计数据推送表表结构,增加日累计储能放电量字段,同时修改代码对应实体及mapper文件,修改相关接口增加储能日累计放电量接收逻辑;
2.修改首页井场收益分析模块接口,修改获取储能累计放电量逻辑;
3.设计并创建井口日用电趋势表,生成对应实体类及mapper文件;
4.统计分析模块,新增本月累计节电经济效益查询接口,添加线上接口文档并完成接口冒烟测试;
5.统计分析模块,新增本月累计减碳量查询接口,添加线上接口文档并完成接口冒烟测试;
6.统计分析模块,新增光伏发电趋势查询接口,添加线上接口文档并完成接口冒烟测试;
7.统计分析模块,新增月度总览查询接口,添加线上接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent d65371db
......@@ -104,7 +104,7 @@ public class SpaceOptimizeBaseService {
output.setStrategyDetailList(Collections.emptyList());
}
//查功率预测信息
List<DynamicQueryPlantPredictedPowerOutput> hourList = this.getAveragePowerGeneration15List(context, DynamicQueryPlantPredictedPowerInput.builder()
List<DynamicQueryPlantPredictedPowerOutput> powerList = this.getAveragePowerGeneration15List(context, DynamicQueryPlantPredictedPowerInput.builder()
.plantIds(this.getOptimizeLineRelation(context, CollUtil.newArrayList(detailEnt))
.getPlantIdsByLineIdMap()
.get(detailEnt.getLineId()))
......@@ -113,8 +113,8 @@ public class SpaceOptimizeBaseService {
.dateType(dateType)
.build());
Map<String, BigDecimal> collect;
if (CollUtil.isNotEmpty(hourList)) {
collect = hourList.stream()
if (CollUtil.isNotEmpty(powerList)) {
collect = powerList.stream()
.collect(
Collectors.groupingBy(DynamicQueryPlantPredictedPowerOutput::getHourTime,
CollectorsUtil.averagingBigDecimal(DynamicQueryPlantPredictedPowerOutput::getPower, 2, 0))
......@@ -135,7 +135,7 @@ public class SpaceOptimizeBaseService {
}
output.setPowerGenerationList(powerGenerationList);
//查井口列表
output.setWellheadList(this.getSpaceOptimizeWellheadList(context, flag, periodId, optimizeDate));
output.setWellheadList(this.getSpaceOptimizeWellheadList(context, flag, periodId, optimizeDate, powerList));
return output;
}
......@@ -1435,9 +1435,10 @@ public class SpaceOptimizeBaseService {
* @param flag 旗帜
* @param periodId 期间id
* @param optimizeDate 优化日期
* @param powerList 预测列表
* @return {@link List}<{@link GetSpaceOptimizeWellheadOutput}>
*/
private List<GetSpaceOptimizeWellheadOutput> getSpaceOptimizeWellheadList(XContext context, Integer flag, String periodId, DateTime optimizeDate) {
private List<GetSpaceOptimizeWellheadOutput> getSpaceOptimizeWellheadList(XContext context, Integer flag, String periodId, DateTime optimizeDate, List<DynamicQueryPlantPredictedPowerOutput> powerList) {
//井口列表
List<GetSpaceOptimizeWellheadOutput> wellheadOutputs = null;
//配置列表
......
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