Commit 356893b0 authored by ZWT's avatar ZWT

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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 1b755fd3
......@@ -51,9 +51,10 @@ public class PlantPredictedPowerUltraTermService {
//时间出力截至时间
Date showTime = inputTime;
int betweenDay = 0;
DateTime day = inputTime;
if (ObjectUtil.isAllNotEmpty(configShowEnt, configShowEnt.getIsEnable(), configShowEnt.getChoiceDate())) {
DateTime day = configShowEnt.getIsEnable().equals(0) ? DateUtil.date(configShowEnt.getChoiceDate()) : inputTime;
showTime = DateUtil.parse(day.toString(BusinessConstant.DATE_FORMAT_DAY) + " " + inputTime.toString(BusinessConstant.TIME_FORMAT));
day = configShowEnt.getIsEnable().equals(0) ? DateUtil.parse(DateUtil.date(configShowEnt.getChoiceDate()).toString(BusinessConstant.DATE_FORMAT_DAY) + " " + inputTime.toString(BusinessConstant.TIME_FORMAT)) : inputTime;
showTime = DateUtil.parse(day.toString(BusinessConstant.DATE_FORMAT_DAY) + " " + now.toString(BusinessConstant.TIME_FORMAT));
//计算偏移
betweenDay = (int) DateUtil.betweenDay(inputTime, day, true);
if (DateUtil.compare(day, inputTime) > 0) {
......@@ -61,12 +62,12 @@ public class PlantPredictedPowerUltraTermService {
}
}
//计算时间范围,开始时间往前推1天,结束时间往后推4小时
DateTime beginTime = DateUtil.offsetMinute(showTime, -1441);
DateTime endTime = DateUtil.offsetHour(showTime, 4);
DateTime beginTime = DateUtil.offsetMinute(day, -1441);
DateTime endTime = DateUtil.offsetHour(day, 4);
//查光伏预测
Map<Date, BigDecimal> predictedMap = ServiceUtil.getPredictedPowerMap15(context, 3, input.getPlantId(), beginTime, endTime);
//查实际功率
Map<Date, BigDecimal> powerMap = ServiceUtil.getActivePowerMap15(context, input.getPlantId(), beginTime, showTime);
return XListResult.success(ServiceUtil.getPowerOutput(DateUtil.offsetDay(showTime, -1), endTime, betweenDay, now, predictedMap, powerMap));
return XListResult.success(ServiceUtil.getPowerOutput(DateUtil.offsetDay(day, -1), endTime, betweenDay, now, predictedMap, powerMap));
}
}
\ No newline at end of file
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