Commit b414b311 authored by ZWT's avatar ZWT

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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent ef219c0a
...@@ -71,7 +71,7 @@ public class DailyElectricityTrendCloudServiceImpl implements IDailyElectricityT ...@@ -71,7 +71,7 @@ public class DailyElectricityTrendCloudServiceImpl implements IDailyElectricityT
//查去年同期用电趋势 //查去年同期用电趋势
Map<String, List<LineDailyElectricityTrendEnt>> lastElectricityTrendMap = this.getLastElectricityTrendMap(context, yesterday); Map<String, List<LineDailyElectricityTrendEnt>> lastElectricityTrendMap = this.getLastElectricityTrendMap(context, yesterday);
//用电趋势计算结果 //用电趋势计算结果
List<LineDailyElectricityTrendView> saveList = new ArrayList<>(powerMap.size()); List<LineDailyElectricityTrendView> stationSaveList = new ArrayList<>(powerMap.size());
//井口用电趋势计算结果 //井口用电趋势计算结果
List<WellDailyElectricityTrendView> wellSaveList = new ArrayList<>(wellProductionMap.size()); List<WellDailyElectricityTrendView> wellSaveList = new ArrayList<>(wellProductionMap.size());
SpaceOptimizeShortDurationView wellInfo; SpaceOptimizeShortDurationView wellInfo;
...@@ -137,21 +137,21 @@ public class DailyElectricityTrendCloudServiceImpl implements IDailyElectricityT ...@@ -137,21 +137,21 @@ public class DailyElectricityTrendCloudServiceImpl implements IDailyElectricityT
wellSaveList.add(this.getWellDailyElectricityTrendView(wellProductionMap.get(wellNumber), wellNumber, wellSaveList.add(this.getWellDailyElectricityTrendView(wellProductionMap.get(wellNumber), wellNumber,
wellInfo.getRunDuration(), dailyGreenOpenHour, dailyGreenConsumption, yesterday)); wellInfo.getRunDuration(), dailyGreenOpenHour, dailyGreenConsumption, yesterday));
} }
//计算封装数据 //计算封装井场用电趋势数据
} }
} }
//开启事务批量插入 //开启事务批量插入
return XTransactionHelper.begin(context, () -> { return XTransactionHelper.begin(context, () -> {
int size; int size;
if (CollUtil.isNotEmpty(saveList)) { if (CollUtil.isNotEmpty(stationSaveList)) {
LineDailyElectricityTrendViewMapper mapper = context.getBean(LineDailyElectricityTrendViewMapper.class); LineDailyElectricityTrendViewMapper mapper = context.getBean(LineDailyElectricityTrendViewMapper.class);
size = saveList.size(); size = stationSaveList.size();
if (size > BaseUtils.BATCH_SIZE) { if (size > BaseUtils.BATCH_SIZE) {
List<List<LineDailyElectricityTrendView>> subList = BaseUtils.getSubList(saveList); List<List<LineDailyElectricityTrendView>> subList = BaseUtils.getSubList(stationSaveList);
subList.forEach(mapper::batchInsert); subList.forEach(mapper::batchInsert);
} else { } else {
mapper.batchInsert(saveList); mapper.batchInsert(stationSaveList);
} }
} }
if (CollUtil.isNotEmpty(wellSaveList)) { if (CollUtil.isNotEmpty(wellSaveList)) {
......
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