Commit 02e853ab authored by ZWT's avatar ZWT

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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent f85472a5
......@@ -109,12 +109,12 @@ public class BusinessConstant {
/**
* 0.25
*/
public static final BigDecimal BIG_DECIMAL_025 = BigDecimal.valueOf(0.25);
public static final BigDecimal BIG_DECIMAL_0_25 = BigDecimal.valueOf(0.25);
/**
* 6.67
*/
public static final BigDecimal BIG_DECIMAL_667 = BigDecimal.valueOf(6.67);
public static final BigDecimal BIG_DECIMAL_6_67 = BigDecimal.valueOf(6.67);
/**
* 60
......
......@@ -123,9 +123,9 @@ public class DailyElectricityTrendCloudServiceImpl implements IDailyElectricityT
//在时间范围内,并且总运行功率满足运行
if (DateUtil.isIn(thirdActivePower.getCreateDate(), openWellTime, closeWellTime) && thirdActivePower.getPhotovoltaicPower().compareTo(serviceRating) >= 0) {
//单井绿电用电:运行功率*绿电阶段开井时间(0.25h)
photovoltaicPower = photovoltaicPower.add(currentServiceRating.multiply(BusinessConstant.BIG_DECIMAL_025));
photovoltaicPower = photovoltaicPower.add(currentServiceRating.multiply(BusinessConstant.BIG_DECIMAL_0_25));
//当前井口绿电运行时长
dailyGreenOpenHour = dailyGreenOpenHour.add(BusinessConstant.BIG_DECIMAL_025);
dailyGreenOpenHour = dailyGreenOpenHour.add(BusinessConstant.BIG_DECIMAL_0_25);
}
}
}
......@@ -143,7 +143,7 @@ public class DailyElectricityTrendCloudServiceImpl implements IDailyElectricityT
.dailyElectricityConsumption(productionSituationOutput.getDailyElectricityConsumption())
.dailyLiquidProduction(productionSituationOutput.getDailyLiquidProduction())
//日减碳量:日绿电用电量*6.67
.dailyCarbonReduction(photovoltaicPower.multiply(BusinessConstant.BIG_DECIMAL_667))
.dailyCarbonReduction(photovoltaicPower.multiply(BusinessConstant.BIG_DECIMAL_6_67))
//绿电占比:绿电开井时长/开井时长*100%
.greenElectricityRate(this.getRate(dailyGreenOpenHour, runDuration))
.createDate(yesterday)
......
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