Commit 80ba1cac authored by ZWT's avatar ZWT

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

[
1.修改日耗电日产液信息定时任务及井口生产情况表表结构,增加来源系统字段,同时修改代码批量插入逻辑;
2.修改日用电趋势计算定时任务,修改代码逻辑,增加区分来源系统逻辑;
3.修改能耗分析定时任务定时任务,修改代码逻辑,增加区分来源系统逻辑;
4.修改第三方有功功率定时任务,修改代码逻辑,增加区分来源系统逻辑;
]
parent 801de241
...@@ -65,6 +65,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer ...@@ -65,6 +65,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
DateTime now = DateTime.now(); DateTime now = DateTime.now();
DateTime saveDate = DateUtil.beginOfDay(now); DateTime saveDate = DateUtil.beginOfDay(now);
DateTime saveHour = DateUtil.beginOfHour(now); DateTime saveHour = DateUtil.beginOfHour(now);
String oilFieldCode = ServiceUtil.getOilFieldCode(context);
LambdaQueryWrapper<ThirdActivePowerEnt> queryWrapper = new LambdaQueryWrapper<ThirdActivePowerEnt>() LambdaQueryWrapper<ThirdActivePowerEnt> queryWrapper = new LambdaQueryWrapper<ThirdActivePowerEnt>()
.select(ThirdActivePowerEnt::getId); .select(ThirdActivePowerEnt::getId);
for (GetThirdActivePowerViewOutput o : outputs) { for (GetThirdActivePowerViewOutput o : outputs) {
...@@ -81,7 +82,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer ...@@ -81,7 +82,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
.createDate(o.getCreateDate()) .createDate(o.getCreateDate())
.photovoltaicPower(photovoltaicPower) .photovoltaicPower(photovoltaicPower)
.meterPower(meterPower) .meterPower(meterPower)
.systemSource(ThirdPartyApiConstant.CQ_SOURCE) .systemSource(oilFieldCode)
.inputTime(now) .inputTime(now)
.build() .build()
); );
...@@ -89,7 +90,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer ...@@ -89,7 +90,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
.eq(ThirdActivePowerEnt::getCreateDate, o.getCreateDate()) .eq(ThirdActivePowerEnt::getCreateDate, o.getCreateDate())
.eq(ThirdActivePowerEnt::getPhotovoltaicPower, photovoltaicPower) .eq(ThirdActivePowerEnt::getPhotovoltaicPower, photovoltaicPower)
.eq(ThirdActivePowerEnt::getMeterPower, meterPower) .eq(ThirdActivePowerEnt::getMeterPower, meterPower)
.eq(ThirdActivePowerEnt::getSystemSource, ThirdPartyApiConstant.CQ_SOURCE) .eq(ThirdActivePowerEnt::getSystemSource, oilFieldCode)
); );
dtoDailyList.add( dtoDailyList.add(
ThirdActivePowerDailyUpdateView.builder() ThirdActivePowerDailyUpdateView.builder()
...@@ -98,7 +99,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer ...@@ -98,7 +99,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
.createDate(o.getCreateDate()) .createDate(o.getCreateDate())
.photovoltaicPower(photovoltaicPower) .photovoltaicPower(photovoltaicPower)
.meterPower(meterPower) .meterPower(meterPower)
.systemSource(ThirdPartyApiConstant.CQ_SOURCE) .systemSource(oilFieldCode)
.saveDate(saveDate) .saveDate(saveDate)
.saveHour(saveHour) .saveHour(saveHour)
.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