Commit b903dfdc authored by ZWT's avatar ZWT

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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 668b77bf
......@@ -277,8 +277,29 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
List<ThirdDailyAccumulationView> dtoList = new ArrayList<>(outputs.size());
List<ThirdDailyAccumulationUpdateView> updateDtoList = new ArrayList<>(outputs.size());
LambdaQueryWrapper<ThirdDailyAccumulationEnt> queryWrapper = new LambdaQueryWrapper<>();
BigDecimal photovoltaicPower;
BigDecimal dailyElectricityConsumption;
BigDecimal dailyLiquidProduction;
BigDecimal inPlaceConsumption;
BigDecimal energyStorageDischarge;
List<String> stationNameList = new ArrayList<>(outputs.size());
for (GetCumulativePowerGenerationOutput o : outputs) {
//数据处理
photovoltaicPower = Optional.ofNullable(o.getPhotovoltaicPower()).orElse(BigDecimal.ZERO);
dailyElectricityConsumption = Optional.ofNullable(o.getDailyElectricityConsumption()).orElse(BigDecimal.ZERO);
dailyLiquidProduction = Optional.ofNullable(o.getDailyLiquidProduction()).orElse(BigDecimal.ZERO);
inPlaceConsumption = Optional.ofNullable(o.getInPlaceConsumption()).orElse(BigDecimal.ZERO);
energyStorageDischarge = Optional.ofNullable(o.getEnergyStorageDischarge()).orElse(BigDecimal.ZERO);
photovoltaicPower = photovoltaicPower.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : photovoltaicPower;
dailyElectricityConsumption = dailyElectricityConsumption.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : dailyElectricityConsumption;
dailyLiquidProduction = dailyLiquidProduction.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : dailyLiquidProduction;
inPlaceConsumption = inPlaceConsumption.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : inPlaceConsumption;
energyStorageDischarge = energyStorageDischarge.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : energyStorageDischarge;
o.setPhotovoltaicPower(photovoltaicPower);
o.setDailyElectricityConsumption(dailyElectricityConsumption);
o.setDailyLiquidProduction(dailyLiquidProduction);
o.setInPlaceConsumption(inPlaceConsumption);
o.setEnergyStorageDischarge(energyStorageDischarge);
//历史数据
dtoList.add(
ThirdDailyAccumulationView.builder()
......@@ -286,11 +307,11 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
.stationId(plantMap.get(o.getStationName()))
.stationName(o.getStationName())
.createDate(now)
.photovoltaicPower(Optional.ofNullable(o.getPhotovoltaicPower()).orElse(BigDecimal.ZERO))
.dailyElectricityConsumption(Optional.ofNullable(o.getDailyElectricityConsumption()).orElse(BigDecimal.ZERO))
.dailyLiquidProduction(Optional.ofNullable(o.getDailyLiquidProduction()).orElse(BigDecimal.ZERO))
.inPlaceConsumption(Optional.ofNullable(o.getInPlaceConsumption()).orElse(BigDecimal.ZERO))
.energyStorageDischarge(Optional.ofNullable(o.getEnergyStorageDischarge()).orElse(BigDecimal.ZERO))
.photovoltaicPower(o.getPhotovoltaicPower())
.dailyElectricityConsumption(o.getDailyElectricityConsumption())
.dailyLiquidProduction(o.getDailyLiquidProduction())
.inPlaceConsumption(o.getInPlaceConsumption())
.energyStorageDischarge(o.getEnergyStorageDischarge())
.systemSource(ThirdPartyApiConstant.CQ_SOURCE)
.build()
);
......
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