Commit 0b3647d9 authored by ZWT's avatar ZWT

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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 3858130d
...@@ -65,15 +65,13 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer ...@@ -65,15 +65,13 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
DateTime now = DateTime.now(); DateTime now = DateTime.now();
DateTime saveDate = DateUtil.beginOfDay(now); DateTime saveDate = DateUtil.beginOfDay(now);
DateTime saveHour = DateUtil.beginOfHour(now); DateTime saveHour = DateUtil.beginOfHour(now);
BigDecimal photovoltaicPower;
BigDecimal meterPower;
LambdaQueryWrapper<ThirdActivePowerEnt> queryWrapper = new LambdaQueryWrapper<ThirdActivePowerEnt>() LambdaQueryWrapper<ThirdActivePowerEnt> queryWrapper = new LambdaQueryWrapper<ThirdActivePowerEnt>()
.select(ThirdActivePowerEnt::getId); .select(ThirdActivePowerEnt::getId);
for (GetThirdActivePowerViewOutput o : outputs) { for (GetThirdActivePowerViewOutput o : outputs) {
photovoltaicPower = Optional.ofNullable(o.getPhotovoltaicPower()) BigDecimal photovoltaicPower = Optional.ofNullable(o.getPhotovoltaicPower())
.orElse(BigDecimal.ZERO) .orElse(BigDecimal.ZERO)
.abs(); .abs();
meterPower = Optional.ofNullable(o.getMeterPower()) BigDecimal meterPower = Optional.ofNullable(o.getMeterPower())
.orElse(BigDecimal.ZERO) .orElse(BigDecimal.ZERO)
.abs(); .abs();
dtoList.add( dtoList.add(
...@@ -89,8 +87,8 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer ...@@ -89,8 +87,8 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
); );
queryWrapper.or(w -> w.eq(ThirdActivePowerEnt::getStationName, o.getStationName()) queryWrapper.or(w -> w.eq(ThirdActivePowerEnt::getStationName, o.getStationName())
.eq(ThirdActivePowerEnt::getCreateDate, o.getCreateDate()) .eq(ThirdActivePowerEnt::getCreateDate, o.getCreateDate())
.eq(ThirdActivePowerEnt::getPhotovoltaicPower, o.getPhotovoltaicPower()) .eq(ThirdActivePowerEnt::getPhotovoltaicPower, photovoltaicPower)
.eq(ThirdActivePowerEnt::getMeterPower, o.getMeterPower()) .eq(ThirdActivePowerEnt::getMeterPower, meterPower)
.eq(ThirdActivePowerEnt::getSystemSource, ThirdPartyApiConstant.CQ_SOURCE) .eq(ThirdActivePowerEnt::getSystemSource, ThirdPartyApiConstant.CQ_SOURCE)
); );
dtoDailyList.add( dtoDailyList.add(
......
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