Skip to content

G
gf_back
Commit abe94082 authored by ZWT's avatar ZWT
Browse files
Options

得到的

parent 433a818a
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 69 deletions
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/ThirdDataAccessCloudServiceImpl.java
View file @ abe94082
......@@ -108,12 +108,8 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
LambdaQueryWrapper<ThirdActivePowerEnt> queryWrapper = new LambdaQueryWrapper<ThirdActivePowerEnt>()
.select(ThirdActivePowerEnt::getId);
for (GetThirdActivePowerViewOutput o : outputs) {
BigDecimal photovoltaicPower = Optional.ofNullable(o.getPhotovoltaicPower())
.orElse(BigDecimal.ZERO)
.abs();
BigDecimal meterPower = Optional.ofNullable(o.getMeterPower())
.orElse(BigDecimal.ZERO)
.abs();
BigDecimal photovoltaicPower = ObjectUtil.defaultIfNull(o.getPhotovoltaicPower(), BigDecimal.ZERO).abs();
BigDecimal meterPower = ObjectUtil.defaultIfNull(o.getMeterPower(), BigDecimal.ZERO).abs();
dtoList.add(
ThirdActivePowerView.builder()
.id(BaseUtils.randomUUIDString())
......@@ -215,51 +211,6 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
});
}
/**
* 第三方光伏日发电量定时任务
*
* @param context 上下文
* @return {@link XServiceResult}
*/
public XServiceResult test2(XContext context) {
IThirdPhotovoltaicPowerCloudService service = context.getBean(IThirdPhotovoltaicPowerCloudService.class);
XListResult<GetThirdPhotovoltaicPowerOutput> result = service.getPhotovoltaicPowerList(context, GetThirdPhotovoltaicPowerInput.builder()
.createDate(DateUtil.beginOfDay(DateUtil.yesterday()))
.build());
result.throwIfFail();
List<GetThirdPhotovoltaicPowerViewOutput> outputs = XCopyUtils.copyNewList(result.getResult(), GetThirdPhotovoltaicPowerViewOutput.class);
if (CollUtil.isEmpty(outputs)) {
return XServiceResult.OK;
}
BigDecimal photovoltaicPower;
List<ThirdPhotovoltaicPowerView> dtoList = new ArrayList<>(outputs.size());
for (GetThirdPhotovoltaicPowerViewOutput output : outputs) {
photovoltaicPower = Optional.ofNullable(output.getPhotovoltaicPower()).orElse(BigDecimal.ZERO);
photovoltaicPower = photovoltaicPower.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : photovoltaicPower;
dtoList.add(
ThirdPhotovoltaicPowerView.builder()
.id(BaseUtils.randomUUIDString())
.stationName(output.getStationName())
.createDate(output.getCreateDate())
.photovoltaicPower(photovoltaicPower)
.systemSource("SY")
.build()
);
}
return XTransactionHelper.begin(context, () -> {
ThirdPhotovoltaicPowerViewMapper mapper = context.getBean(ThirdPhotovoltaicPowerViewMapper.class);
if (CollUtil.isNotEmpty(dtoList)) {
if (dtoList.size() > BaseUtils.BATCH_SIZE) {
List<List<ThirdPhotovoltaicPowerView>> subList = BaseUtils.getSubList(dtoList);
subList.forEach(mapper::batchInsertList);
} else {
mapper.batchInsertList(dtoList);
}
}
return XServiceResult.OK;
});
}
/**
* 第三方光伏日发电量定时任务
*
......@@ -298,7 +249,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
BigDecimal photovoltaicPower;
List<ThirdPhotovoltaicPowerView> dtoList = new ArrayList<>(outputs.size());
for (GetThirdPhotovoltaicPowerViewOutput output : outputs) {
photovoltaicPower = Optional.ofNullable(output.getPhotovoltaicPower()).orElse(BigDecimal.ZERO);
photovoltaicPower = ObjectUtil.defaultIfNull(output.getPhotovoltaicPower(), BigDecimal.ZERO);
photovoltaicPower = photovoltaicPower.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : photovoltaicPower;
dtoList.add(
ThirdPhotovoltaicPowerView.builder()
......@@ -425,11 +376,11 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
List<String> stationNameList = new ArrayList<>(outputs.size());
for (GetCumulativePowerGenerationOutput o : outputs) {
//数据处理
photovoltaicPower = Optional.ofNullable(o.getPhotovoltaicPower()).orElse(BigDecimal.ZERO);
dailyElectricityConsumption = Optional.ofNullable(o.getDailyElectricityConsumption()).orElse(BigDecimal.ZERO);
dailyLiquidProduction = Optional.ofNullable(o.getDailyLiquidProduction()).orElse(BigDecimal.ZERO);
inPlaceConsumption = Optional.ofNullable(o.getInPlaceConsumption()).orElse(BigDecimal.ZERO);
energyStorageDischarge = Optional.ofNullable(o.getEnergyStorageDischarge()).orElse(BigDecimal.ZERO);
photovoltaicPower = ObjectUtil.defaultIfNull(o.getPhotovoltaicPower(), BigDecimal.ZERO);
dailyElectricityConsumption = ObjectUtil.defaultIfNull(o.getDailyElectricityConsumption(), BigDecimal.ZERO);
dailyLiquidProduction = ObjectUtil.defaultIfNull(o.getDailyLiquidProduction(), BigDecimal.ZERO);
inPlaceConsumption = ObjectUtil.defaultIfNull(o.getInPlaceConsumption(), BigDecimal.ZERO);
energyStorageDischarge = ObjectUtil.defaultIfNull(o.getEnergyStorageDischarge(), BigDecimal.ZERO);
photovoltaicPower = photovoltaicPower.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : photovoltaicPower;
dailyElectricityConsumption = dailyElectricityConsumption.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : dailyElectricityConsumption;
dailyLiquidProduction = dailyLiquidProduction.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : dailyLiquidProduction;
......@@ -473,11 +424,11 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
.stationId(plantMap.get(o.getStationName()))
.stationName(o.getStationName())
.createDate(now)
.photovoltaicPower(Optional.ofNullable(o.getPhotovoltaicPower()).orElse(BigDecimal.ZERO))
.dailyElectricityConsumption(Optional.ofNullable(o.getDailyElectricityConsumption()).orElse(BigDecimal.ZERO))
.dailyLiquidProduction(Optional.ofNullable(o.getDailyLiquidProduction()).orElse(BigDecimal.ZERO))
.inPlaceConsumption(Optional.ofNullable(o.getInPlaceConsumption()).orElse(BigDecimal.ZERO))
.energyStorageDischarge(Optional.ofNullable(o.getEnergyStorageDischarge()).orElse(BigDecimal.ZERO))
.photovoltaicPower(ObjectUtil.defaultIfNull(o.getPhotovoltaicPower(), BigDecimal.ZERO))
.dailyElectricityConsumption(ObjectUtil.defaultIfNull(o.getDailyElectricityConsumption(), BigDecimal.ZERO))
.dailyLiquidProduction(ObjectUtil.defaultIfNull(o.getDailyLiquidProduction(), BigDecimal.ZERO))
.inPlaceConsumption(ObjectUtil.defaultIfNull(o.getInPlaceConsumption(), BigDecimal.ZERO))
.energyStorageDischarge(ObjectUtil.defaultIfNull(o.getEnergyStorageDischarge(), BigDecimal.ZERO))
.systemSource(oilFieldCode)
.saveHour(now)
.build()
......@@ -556,7 +507,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
LambdaQueryWrapper<ThirdWellAvgActivePowerEnt> queryWrapper = new LambdaQueryWrapper<>();
BigDecimal avgActivePower;
for (GetThirdWellAvgActivePowerOutput o : outputs) {
avgActivePower = Optional.ofNullable(o.getAvgActivePower()).orElse(BigDecimal.ZERO);
avgActivePower = ObjectUtil.defaultIfNull(o.getAvgActivePower(), BigDecimal.ZERO);
avgActivePower = avgActivePower.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : avgActivePower;
o.setAvgActivePower(avgActivePower);
dtoList.add(
......@@ -611,12 +562,8 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
BigDecimal meterPower;
String oilFieldCode = ServiceUtil.getOilFieldCode(context);
for (ThirdActivePowerExcelData o : cachedDataList) {
photovoltaicPower = Optional.ofNullable(o.getPhotovoltaicPower())
.orElse(BigDecimal.ZERO)
.abs();
meterPower = Optional.ofNullable(o.getMeterPower())
.orElse(BigDecimal.ZERO)
.abs();
photovoltaicPower = ObjectUtil.defaultIfNull(o.getPhotovoltaicPower(), BigDecimal.ZERO).abs();
meterPower = ObjectUtil.defaultIfNull(o.getMeterPower(), BigDecimal.ZERO).abs();
dtoList.add(
ThirdActivePowerView.builder()
.id(BaseUtils.randomUUIDString())
......
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