Commit cd11efe0 authored by ZWT's avatar ZWT

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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 6da4eba9
...@@ -371,11 +371,11 @@ public class DailyElectricityTrendCloudServiceImpl implements IDailyElectricityT ...@@ -371,11 +371,11 @@ public class DailyElectricityTrendCloudServiceImpl implements IDailyElectricityT
private LineDailyElectricityTrendView getLineDailyElectricityTrendView(LineDailyElectricityTrendEnt ent, BigDecimal dailyElectricityConsumption, private LineDailyElectricityTrendView getLineDailyElectricityTrendView(LineDailyElectricityTrendEnt ent, BigDecimal dailyElectricityConsumption,
BigDecimal photovoltaicPower, String stationName, Date yesterday) { BigDecimal photovoltaicPower, String stationName, Date yesterday) {
LineDailyElectricityTrendView view; LineDailyElectricityTrendView view;
BigDecimal municipalPower = dailyElectricityConsumption.subtract(photovoltaicPower);
if (municipalPower.compareTo(BigDecimal.ZERO) < 0) {
municipalPower = BigDecimal.ZERO;
}
if (ObjectUtil.isNotNull(ent)) { if (ObjectUtil.isNotNull(ent)) {
BigDecimal municipalPower = dailyElectricityConsumption.subtract(photovoltaicPower);
if (municipalPower.compareTo(BigDecimal.ZERO) < 0) {
municipalPower = BigDecimal.ZERO;
}
view = LineDailyElectricityTrendView.builder() view = LineDailyElectricityTrendView.builder()
.stationName(stationName) .stationName(stationName)
.totalPower(dailyElectricityConsumption) .totalPower(dailyElectricityConsumption)
...@@ -398,7 +398,7 @@ public class DailyElectricityTrendCloudServiceImpl implements IDailyElectricityT ...@@ -398,7 +398,7 @@ public class DailyElectricityTrendCloudServiceImpl implements IDailyElectricityT
.totalPower(dailyElectricityConsumption) .totalPower(dailyElectricityConsumption)
.photovoltaicPower(photovoltaicPower) .photovoltaicPower(photovoltaicPower)
//市电日用电量:总用电-光伏用电 //市电日用电量:总用电-光伏用电
.municipalPower(dailyElectricityConsumption.subtract(photovoltaicPower)) .municipalPower(municipalPower)
.lastTotalPower(BigDecimal.ZERO) .lastTotalPower(BigDecimal.ZERO)
.lastPhotovoltaicPower(BigDecimal.ZERO) .lastPhotovoltaicPower(BigDecimal.ZERO)
.lastMunicipalPower(BigDecimal.ZERO) .lastMunicipalPower(BigDecimal.ZERO)
......
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