Commit 8fffe8ba authored by ZWT's avatar ZWT

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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent dacce5c1
......@@ -107,8 +107,6 @@ public class DailyElectricityTrendCloudServiceImpl implements IDailyElectricityT
serviceRating.add(currentServiceRating);
//绿电开井时间(h)
BigDecimal dailyGreenOpenHour = BigDecimal.ZERO;
//绿电用电量
BigDecimal dailyGreenConsumption = BigDecimal.ZERO;
//记录每一次计算结束位置
int index = 0;
for (SpaceOptimizeShortDurationView duration : durationList) {
......@@ -125,15 +123,15 @@ public class DailyElectricityTrendCloudServiceImpl implements IDailyElectricityT
thirdActivePower = thirdActivePowerList.get(i1);
//在时间范围内,并且总运行功率满足运行
if (DateUtil.isIn(thirdActivePower.getCreateDate(), openWellTime, closeWellTime) && thirdActivePower.getPhotovoltaicPower().compareTo(serviceRating) >= 0) {
//单井绿电用电:运行功率*绿电阶段开井时间(0.25h)
dailyGreenConsumption = dailyGreenConsumption.add(currentServiceRating.multiply(BusinessConstant.BIG_DECIMAL_0_25));
//井场绿电用电累加
photovoltaicPower = photovoltaicPower.add(dailyGreenConsumption);
//当前井口绿电运行时长
//当前井口绿电运行时长(累加0.25小时)
dailyGreenOpenHour = dailyGreenOpenHour.add(BusinessConstant.BIG_DECIMAL_0_25);
}
}
}
//单井绿电用电:运行功率*绿电阶段开井时间
BigDecimal dailyGreenConsumption = dailyGreenOpenHour.multiply(currentServiceRating);
//井场绿电用电累加
photovoltaicPower = photovoltaicPower.add(dailyGreenConsumption);
//用电趋势结果计算
wellSaveList.add(this.getWellDailyElectricityTrendView(wellProductionMap.get(wellNumber), wellNumber,
wellInfo.getRunDuration(), dailyGreenOpenHour, dailyGreenConsumption, 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