Commit acbfe0aa authored by ZWT's avatar ZWT

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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent ffe6896f
...@@ -443,6 +443,9 @@ public class HomePageService { ...@@ -443,6 +443,9 @@ public class HomePageService {
//发电量 //发电量
BigDecimal powerGeneration = analysisEnt.getPhotovoltaicPower() BigDecimal powerGeneration = analysisEnt.getPhotovoltaicPower()
.divide(BusinessConstant.BIG_DECIMAL_10000, 2, RoundingMode.HALF_UP); .divide(BusinessConstant.BIG_DECIMAL_10000, 2, RoundingMode.HALF_UP);
//用电量
BigDecimal dailyElectricityConsumption = analysisEnt.getDailyElectricityConsumption()
.divide(BusinessConstant.BIG_DECIMAL_10000, 2, RoundingMode.HALF_UP);
//储能日累计放电量 //储能日累计放电量
BigDecimal energyStorageCapacity = analysisEnt.getEnergyStorageDischarge() BigDecimal energyStorageCapacity = analysisEnt.getEnergyStorageDischarge()
.divide(BusinessConstant.BIG_DECIMAL_10000, 2, RoundingMode.HALF_UP); .divide(BusinessConstant.BIG_DECIMAL_10000, 2, RoundingMode.HALF_UP);
...@@ -472,6 +475,7 @@ public class HomePageService { ...@@ -472,6 +475,7 @@ public class HomePageService {
.greenElectricityRate(greenElectricityRate) .greenElectricityRate(greenElectricityRate)
.carbonReduction(carbonReduction) .carbonReduction(carbonReduction)
.economicBenefit(economicBenefit) .economicBenefit(economicBenefit)
.dailyElectricityConsumption(dailyElectricityConsumption)
.build()); .build());
} }
......
...@@ -40,4 +40,7 @@ public class GetIncomeAnalysisOutput { ...@@ -40,4 +40,7 @@ public class GetIncomeAnalysisOutput {
@XText("经济效益") @XText("经济效益")
private BigDecimal economicBenefit; private BigDecimal economicBenefit;
@XText("累计用电量")
private BigDecimal dailyElectricityConsumption;
} }
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