Commit aeac71c2 authored by ZWT's avatar ZWT

feat(吉林演示): 松原

1.修改部分第三方数据处理定时任务,修改系统来源,将固定来源按环境区分改为动态获取;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent cab09948
...@@ -246,7 +246,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer ...@@ -246,7 +246,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
.powerGeneration(power.getPhotovoltaicPower()) .powerGeneration(power.getPhotovoltaicPower())
.powerConsumption(collect.get(lineId)) .powerConsumption(collect.get(lineId))
.dataDate(power.getCreateDate()) .dataDate(power.getCreateDate())
.systemSource(ThirdPartyApiConstant.CQ_SOURCE) .systemSource(oilFieldCode)
.build()); .build());
} }
return XTransactionHelper.begin(context, () -> { return XTransactionHelper.begin(context, () -> {
...@@ -435,6 +435,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer ...@@ -435,6 +435,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
List<ThirdActivePowerDailyUpdateView> dtoDailyList = new ArrayList<>(cachedDataList.size()); List<ThirdActivePowerDailyUpdateView> dtoDailyList = new ArrayList<>(cachedDataList.size());
BigDecimal photovoltaicPower; BigDecimal photovoltaicPower;
BigDecimal meterPower; BigDecimal meterPower;
String oilFieldCode = ServiceUtil.getOilFieldCode(context);
for (ThirdActivePowerExcelData o : cachedDataList) { for (ThirdActivePowerExcelData o : cachedDataList) {
photovoltaicPower = Optional.ofNullable(o.getPhotovoltaicPower()) photovoltaicPower = Optional.ofNullable(o.getPhotovoltaicPower())
.orElse(BigDecimal.ZERO) .orElse(BigDecimal.ZERO)
...@@ -449,13 +450,13 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer ...@@ -449,13 +450,13 @@ 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(o.getCreateDate()) .inputTime(o.getCreateDate())
.build() .build()
); );
queryWrapper.or(w -> w.eq(ThirdActivePowerEnt::getStationName, o.getStationName()) queryWrapper.or(w -> w.eq(ThirdActivePowerEnt::getStationName, o.getStationName())
.eq(ThirdActivePowerEnt::getCreateDate, o.getCreateDate()) .eq(ThirdActivePowerEnt::getCreateDate, o.getCreateDate())
.eq(ThirdActivePowerEnt::getSystemSource, ThirdPartyApiConstant.CQ_SOURCE) .eq(ThirdActivePowerEnt::getSystemSource, oilFieldCode)
); );
dtoDailyList.add( dtoDailyList.add(
ThirdActivePowerDailyUpdateView.builder() ThirdActivePowerDailyUpdateView.builder()
...@@ -464,7 +465,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer ...@@ -464,7 +465,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(DateUtil.beginOfDay(o.getCreateDate())) .saveDate(DateUtil.beginOfDay(o.getCreateDate()))
.saveHour(DateUtil.beginOfHour(o.getCreateDate())) .saveHour(DateUtil.beginOfHour(o.getCreateDate()))
.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