Commit cddfd9ba authored by ZWT's avatar ZWT

feat[零碳项目]: 松原演示

[
1.修改日耗电日产液信息定时任务及井口生产情况表表结构,增加来源系统字段,同时修改代码批量插入逻辑;
2.修改日用电趋势计算定时任务,修改代码逻辑,增加区分来源系统逻辑;
3.修改能耗分析定时任务定时任务,修改代码逻辑,增加区分来源系统逻辑;
4.修改第三方有功功率定时任务,修改代码逻辑,增加区分来源系统逻辑;
5.修改第三方当日油井状态定时任务,修改代码逻辑,增加区分来源系统逻辑;
6.修改第三方井场日累计数据定时任务,修改代码逻辑,增加区分来源系统逻辑;
]
parent 4488fd8a
...@@ -271,6 +271,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer ...@@ -271,6 +271,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
if (CollUtil.isEmpty(outputs)) { if (CollUtil.isEmpty(outputs)) {
return XServiceResult.OK; return XServiceResult.OK;
} }
String oilFieldCode = ServiceUtil.getOilFieldCode(context);
//取电站 //取电站
Map<String, String> plantMap = this.getPhotovoltaicPlantMap(context); Map<String, String> plantMap = this.getPhotovoltaicPlantMap(context);
DateTime now = DateUtil.date(); DateTime now = DateUtil.date();
...@@ -314,7 +315,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer ...@@ -314,7 +315,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
.dailyLiquidProduction(o.getDailyLiquidProduction()) .dailyLiquidProduction(o.getDailyLiquidProduction())
.inPlaceConsumption(o.getInPlaceConsumption()) .inPlaceConsumption(o.getInPlaceConsumption())
.energyStorageDischarge(o.getEnergyStorageDischarge()) .energyStorageDischarge(o.getEnergyStorageDischarge())
.systemSource(ThirdPartyApiConstant.CQ_SOURCE) .systemSource(oilFieldCode)
.build() .build()
); );
//组装去重删除条件 //组装去重删除条件
...@@ -324,7 +325,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer ...@@ -324,7 +325,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
.eq(ThirdDailyAccumulationEnt::getDailyElectricityConsumption, o.getDailyElectricityConsumption()) .eq(ThirdDailyAccumulationEnt::getDailyElectricityConsumption, o.getDailyElectricityConsumption())
.eq(ThirdDailyAccumulationEnt::getDailyLiquidProduction, o.getDailyLiquidProduction()) .eq(ThirdDailyAccumulationEnt::getDailyLiquidProduction, o.getDailyLiquidProduction())
.eq(ThirdDailyAccumulationEnt::getInPlaceConsumption, o.getInPlaceConsumption()) .eq(ThirdDailyAccumulationEnt::getInPlaceConsumption, o.getInPlaceConsumption())
.eq(ThirdDailyAccumulationEnt::getSystemSource, ThirdPartyApiConstant.CQ_SOURCE) .eq(ThirdDailyAccumulationEnt::getSystemSource, oilFieldCode)
); );
//每日最新数据 //每日最新数据
updateDtoList.add( updateDtoList.add(
...@@ -338,7 +339,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer ...@@ -338,7 +339,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
.dailyLiquidProduction(Optional.ofNullable(o.getDailyLiquidProduction()).orElse(BigDecimal.ZERO)) .dailyLiquidProduction(Optional.ofNullable(o.getDailyLiquidProduction()).orElse(BigDecimal.ZERO))
.inPlaceConsumption(Optional.ofNullable(o.getInPlaceConsumption()).orElse(BigDecimal.ZERO)) .inPlaceConsumption(Optional.ofNullable(o.getInPlaceConsumption()).orElse(BigDecimal.ZERO))
.energyStorageDischarge(Optional.ofNullable(o.getEnergyStorageDischarge()).orElse(BigDecimal.ZERO)) .energyStorageDischarge(Optional.ofNullable(o.getEnergyStorageDischarge()).orElse(BigDecimal.ZERO))
.systemSource(ThirdPartyApiConstant.CQ_SOURCE) .systemSource(oilFieldCode)
.saveHour(now) .saveHour(now)
.build() .build()
); );
......
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