Commit 204ce06a authored by ZWT's avatar ZWT

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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent cb7fc5cd
...@@ -380,7 +380,7 @@ public class HomePageService { ...@@ -380,7 +380,7 @@ public class HomePageService {
ConfigShowEnt configShowEnt = configMapper.selectOne(new LambdaQueryWrapper<ConfigShowEnt>() ConfigShowEnt configShowEnt = configMapper.selectOne(new LambdaQueryWrapper<ConfigShowEnt>()
.last("LIMIT 1")); .last("LIMIT 1"));
Date showTime = null; Date showTime = null;
if (ObjectUtil.isAllNotEmpty(configShowEnt, configShowEnt.getChoiceDate(), configShowEnt.getChoiceDate())) { if (ObjectUtil.isAllNotEmpty(configShowEnt, configShowEnt.getIsEnable(), configShowEnt.getChoiceDate())) {
day = configShowEnt.getIsEnable().equals(0) ? DateUtil.date(configShowEnt.getChoiceDate()) : day; day = configShowEnt.getIsEnable().equals(0) ? DateUtil.date(configShowEnt.getChoiceDate()) : day;
showTime = DateUtil.parse(day.toString(BusinessConstant.DATE_FORMAT_DAY) + " " + date.toString(BusinessConstant.TIME_FORMAT)); showTime = DateUtil.parse(day.toString(BusinessConstant.DATE_FORMAT_DAY) + " " + date.toString(BusinessConstant.TIME_FORMAT));
} }
......
...@@ -71,7 +71,7 @@ public class PlantPredictedPowerShortTermService { ...@@ -71,7 +71,7 @@ public class PlantPredictedPowerShortTermService {
Date showTime; Date showTime;
DateTime day; DateTime day;
int betweenDay; int betweenDay;
if (ObjectUtil.isAllNotEmpty(configShowEnt, configShowEnt.getChoiceDate(), configShowEnt.getChoiceDate())) { if (ObjectUtil.isAllNotEmpty(configShowEnt, configShowEnt.getIsEnable(), configShowEnt.getChoiceDate())) {
DateTime choiceDate = DateUtil.date(configShowEnt.getChoiceDate()); DateTime choiceDate = DateUtil.date(configShowEnt.getChoiceDate());
day = configShowEnt.getIsEnable().equals(0) ? choiceDate : inputTime; day = configShowEnt.getIsEnable().equals(0) ? choiceDate : inputTime;
showTime = DateUtil.parse(day.toString(BusinessConstant.DATE_FORMAT_DAY) + " " + date.toString(BusinessConstant.TIME_FORMAT)); showTime = DateUtil.parse(day.toString(BusinessConstant.DATE_FORMAT_DAY) + " " + date.toString(BusinessConstant.TIME_FORMAT));
......
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