Commit 57c8c40a authored by ZWT's avatar ZWT

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

1.修改第三方日累计数据推送表表结构,增加日累计储能放电量字段,同时修改代码对应实体及mapper文件,修改相关接口增加储能日累计放电量接收逻辑;
2.修改首页井场收益分析模块接口,修改获取储能累计放电量逻辑;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent cc5c9388
...@@ -434,6 +434,7 @@ public class HomePageService { ...@@ -434,6 +434,7 @@ public class HomePageService {
.select("IFNULL( SUM( photovoltaic_power ), 0 ) AS photovoltaic_power", .select("IFNULL( SUM( photovoltaic_power ), 0 ) AS photovoltaic_power",
"IFNULL( SUM( daily_electricity_consumption ), 0 ) AS daily_electricity_consumption", "IFNULL( SUM( daily_electricity_consumption ), 0 ) AS daily_electricity_consumption",
"IFNULL( SUM( daily_liquid_production ), 0 ) AS daily_liquid_production", "IFNULL( SUM( daily_liquid_production ), 0 ) AS daily_liquid_production",
"IFNULL( SUM( energy_storage_discharge ), 0 ) AS energy_storage_discharge",
"IFNULL( SUM( in_place_consumption ), 0 ) AS in_place_consumption") "IFNULL( SUM( in_place_consumption ), 0 ) AS in_place_consumption")
.lambda() .lambda()
.in(ThirdDailyAccumulationUpdateEnt::getStationName, lineNameList) .in(ThirdDailyAccumulationUpdateEnt::getStationName, lineNameList)
...@@ -441,6 +442,9 @@ public class HomePageService { ...@@ -441,6 +442,9 @@ public class HomePageService {
//发电量 //发电量
BigDecimal powerGeneration = analysisEnt.getPhotovoltaicPower() BigDecimal powerGeneration = analysisEnt.getPhotovoltaicPower()
.divide(BigDecimal.valueOf(10000), 2, RoundingMode.HALF_UP); .divide(BigDecimal.valueOf(10000), 2, RoundingMode.HALF_UP);
//储能日累计放电量
BigDecimal energyStorageCapacity = analysisEnt.getEnergyStorageDischarge()
.divide(BigDecimal.valueOf(10000), 2, RoundingMode.HALF_UP);
//累计减碳量 //累计减碳量
BigDecimal carbonReduction = analysisEnt.getPhotovoltaicPower() BigDecimal carbonReduction = analysisEnt.getPhotovoltaicPower()
.multiply(BigDecimal.valueOf(6.67)) .multiply(BigDecimal.valueOf(6.67))
...@@ -462,7 +466,7 @@ public class HomePageService { ...@@ -462,7 +466,7 @@ public class HomePageService {
return XSingleResult.success(GetIncomeAnalysisOutput.builder() return XSingleResult.success(GetIncomeAnalysisOutput.builder()
.absorptionRate(BigDecimal.valueOf(100)) .absorptionRate(BigDecimal.valueOf(100))
.avoidPeakRate(avoidPeakRate) .avoidPeakRate(avoidPeakRate)
.energyStorageCapacity(BigDecimal.ZERO) .energyStorageCapacity(energyStorageCapacity)
.powerGeneration(powerGeneration) .powerGeneration(powerGeneration)
.greenElectricityRate(greenElectricityRate) .greenElectricityRate(greenElectricityRate)
.carbonReduction(carbonReduction) .carbonReduction(carbonReduction)
......
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