Commit b108224f authored by ZWT's avatar ZWT

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

[
1.修改日耗电日产液信息定时任务及井口生产情况表表结构,增加来源系统字段,同时修改代码批量插入逻辑;
2.修改日用电趋势计算定时任务,修改代码逻辑,增加区分来源系统逻辑;
3.修改能耗分析定时任务定时任务,修改代码逻辑,增加区分来源系统逻辑;
4.修改第三方有功功率定时任务,修改代码逻辑,增加区分来源系统逻辑;
5.修改第三方当日油井状态定时任务,修改代码逻辑,增加区分来源系统逻辑;
6.修改第三方井场日累计数据定时任务,修改代码逻辑,增加区分来源系统逻辑;
7.修改第三方光伏日发电量定时任务,修改代码逻辑,增加区分来源系统逻辑;
8.修改第三井平均有功功率作业定时任务,修改代码逻辑,增加区分来源系统逻辑;
]
parent eb13b34a
...@@ -383,6 +383,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer ...@@ -383,6 +383,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);
DateTime beginOfDay = DateUtil.date(); DateTime beginOfDay = DateUtil.date();
//封装数据 //封装数据
List<ThirdWellAvgActivePowerView> dtoList = new ArrayList<>(outputs.size()); List<ThirdWellAvgActivePowerView> dtoList = new ArrayList<>(outputs.size());
...@@ -397,7 +398,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer ...@@ -397,7 +398,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
.wellNumber(o.getWellNumber()) .wellNumber(o.getWellNumber())
.inputTime(o.getInputTime()) .inputTime(o.getInputTime())
.avgActivePower(o.getAvgActivePower()) .avgActivePower(o.getAvgActivePower())
.systemSource(ThirdPartyApiConstant.CQ_SOURCE) .systemSource(oilFieldCode)
.saveDate(beginOfDay) .saveDate(beginOfDay)
.build() .build()
); );
...@@ -405,7 +406,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer ...@@ -405,7 +406,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
queryWrapper.or(w -> w.eq(ThirdWellAvgActivePowerEnt::getWellNumber, o.getWellNumber()) queryWrapper.or(w -> w.eq(ThirdWellAvgActivePowerEnt::getWellNumber, o.getWellNumber())
.eq(ThirdWellAvgActivePowerEnt::getInputTime, o.getInputTime()) .eq(ThirdWellAvgActivePowerEnt::getInputTime, o.getInputTime())
.eq(ThirdWellAvgActivePowerEnt::getAvgActivePower, o.getAvgActivePower()) .eq(ThirdWellAvgActivePowerEnt::getAvgActivePower, o.getAvgActivePower())
.eq(ThirdWellAvgActivePowerEnt::getSystemSource, ThirdPartyApiConstant.CQ_SOURCE) .eq(ThirdWellAvgActivePowerEnt::getSystemSource, oilFieldCode)
); );
} }
return XTransactionHelper.begin(context, () -> { return XTransactionHelper.begin(context, () -> {
......
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