Skip to content

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

feat(吉林演示): 松原 

1.排查并修复各时段间开优化功能执行异常导致未执行间开优化问题;
2.排查并修复15天间开优化功能执行后,优化结果时间段展示错乱问题;
3.排查并修复光伏功率预测展示功能,实际功率未展示问题;
4.排查并修复天气数据获取服务,数据处理后入库缺少数据问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 99d72d3a
Hide whitespace changes
Inline Side-by-side
Showing with 115 additions and 14 deletions
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/PlantPredictedPowerCloudServiceImpl.java
View file @ 0de03dde
......@@ -16,6 +16,7 @@ import pps.cloud.prediction.service.data.plant_predicted_power_data.DynamicQuery
import pps.cloud.prediction.service.data.plant_predicted_power_data.DynamicQueryPlantPredictedPowerOutput;
import pps.core.auth.HttpRequestClient;
import pps.core.common.constant.BusinessConstant;
import pps.core.common.utils.BaseUtils;
import pps.core.prediction.constant.ThirdPartyApiConstant;
import pps.core.prediction.entity.PredictedPowerView;
import pps.core.prediction.entity.WellheadDailyProductionSituationView;
......@@ -237,7 +238,14 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
}
return XTransactionHelper.begin(context, () -> {
WellheadDailyProductionSituationViewMapper mapper = context.getBean(WellheadDailyProductionSituationViewMapper.class);
mapper.batchInsertList(dtoList);
if (CollUtil.isNotEmpty(dtoList)) {
if (dtoList.size() > BaseUtils.BATCH_SIZE) {
List<List<WellheadDailyProductionSituationView>> subList = BaseUtils.getSubList(dtoList);
subList.forEach(mapper::batchInsertList);
} else {
mapper.batchInsertList(dtoList);
}
}
return XServiceResult.OK;
});
}
......@@ -339,7 +347,14 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
}
return XTransactionHelper.begin(context, () -> {
WellheadDailyProductionSituationViewMapper mapper = context.getBean(WellheadDailyProductionSituationViewMapper.class);
mapper.batchInsertList(dtoList);
if (CollUtil.isNotEmpty(dtoList)) {
if (dtoList.size() > BaseUtils.BATCH_SIZE) {
List<List<WellheadDailyProductionSituationView>> subList = BaseUtils.getSubList(dtoList);
subList.forEach(mapper::batchInsertList);
} else {
mapper.batchInsertList(dtoList);
}
}
return XServiceResult.OK;
});
}
......
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/StationDailyCloudServiceImpl.java
View file @ 0de03dde
......@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadInput;
import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadViewOutput;
import pps.cloud.prediction.service.IStationDailyCloudService;
import pps.core.common.utils.BaseUtils;
import pps.core.prediction.entity.StationDailyProductionSituationView;
import pps.core.prediction.entity.ThirdPhotovoltaicPowerEnt;
import pps.core.prediction.entity.WellheadDailyProductionSituationEnt;
......@@ -124,7 +125,14 @@ public class StationDailyCloudServiceImpl implements IStationDailyCloudService {
return XTransactionHelper.begin(context, () -> {
StationDailyProductionSituationViewMapper dailyMapper = context.getBean(StationDailyProductionSituationViewMapper.class);
//保存当日最新数据
dailyMapper.batchInsert(dtoDailyList);
if (CollUtil.isNotEmpty(dtoDailyList)) {
if (dtoDailyList.size() > BaseUtils.BATCH_SIZE) {
List<List<StationDailyProductionSituationView>> subList = BaseUtils.getSubList(dtoDailyList);
subList.forEach(dailyMapper::batchInsert);
} else {
dailyMapper.batchInsert(dtoDailyList);
}
}
return XServiceResult.OK;
});
}
......@@ -218,7 +226,14 @@ public class StationDailyCloudServiceImpl implements IStationDailyCloudService {
return XTransactionHelper.begin(context, () -> {
StationDailyProductionSituationViewMapper dailyMapper = context.getBean(StationDailyProductionSituationViewMapper.class);
//保存当日最新数据
dailyMapper.batchInsert(dtoDailyList);
if (CollUtil.isNotEmpty(dtoDailyList)) {
if (dtoDailyList.size() > BaseUtils.BATCH_SIZE) {
List<List<StationDailyProductionSituationView>> subList = BaseUtils.getSubList(dtoDailyList);
subList.forEach(dailyMapper::batchInsert);
} else {
dailyMapper.batchInsert(dtoDailyList);
}
}
return XServiceResult.OK;
});
}
......
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/ThirdDataAccessCloudServiceImpl.java
View file @ 0de03dde
......@@ -22,6 +22,7 @@ import pps.cloud.middle.service.data.third_photovoltaic_power.GetThirdPhotovolta
import pps.cloud.middle.service.data.third_well_avg_active_power.GetThirdWellAvgActivePowerInput;
import pps.cloud.prediction.service.IThirdDataAccessCloudService;
import pps.core.common.constant.BusinessConstant;
import pps.core.common.utils.BaseUtils;
import pps.core.prediction.constant.ThirdPartyApiConstant;
import pps.core.prediction.entity.*;
import pps.core.prediction.mapper.*;
......@@ -116,12 +117,26 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
powerMapper.delete(queryWrapper);
ThirdActivePowerViewMapper mapper = context.getBean(ThirdActivePowerViewMapper.class);
//保存历史数据
mapper.batchInsertList(dtoList);
if (CollUtil.isNotEmpty(dtoList)) {
if (dtoList.size() > BaseUtils.BATCH_SIZE) {
List<List<ThirdActivePowerView>> subList = BaseUtils.getSubList(dtoList);
subList.forEach(mapper::batchInsertList);
} else {
mapper.batchInsertList(dtoList);
}
}
ThirdActivePowerDailyUpdateViewMapper dailyMapper = context.getBean(ThirdActivePowerDailyUpdateViewMapper.class);
//删除当日最新数据
dailyMapper.deleteByCurrentDayData(dtoDailyList, saveHour);
//保存当日最新数据
dailyMapper.batchInsertList(dtoDailyList);
if (CollUtil.isNotEmpty(dtoDailyList)) {
if (dtoDailyList.size() > BaseUtils.BATCH_SIZE) {
List<List<ThirdActivePowerDailyUpdateView>> subList = BaseUtils.getSubList(dtoDailyList);
subList.forEach(dailyMapper::batchInsertList);
} else {
dailyMapper.batchInsertList(dtoDailyList);
}
}
return XServiceResult.OK;
});
}
......@@ -221,12 +236,26 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
powerMapper.delete(queryWrapper);
ThirdActivePowerViewMapper mapper = context.getBean(ThirdActivePowerViewMapper.class);
//保存历史数据
mapper.batchInsertList(dtoList);
if (CollUtil.isNotEmpty(dtoList)) {
if (dtoList.size() > BaseUtils.BATCH_SIZE) {
List<List<ThirdActivePowerView>> subList = BaseUtils.getSubList(dtoList);
subList.forEach(mapper::batchInsertList);
} else {
mapper.batchInsertList(dtoList);
}
}
ThirdActivePowerDailyUpdateViewMapper dailyMapper = context.getBean(ThirdActivePowerDailyUpdateViewMapper.class);
//删除当日最新数据
dailyMapper.deleteByCurrentDayData(dtoDailyList, saveHour);
//保存当日最新数据
dailyMapper.batchInsertList(dtoDailyList);
if (CollUtil.isNotEmpty(dtoDailyList)) {
if (dtoDailyList.size() > BaseUtils.BATCH_SIZE) {
List<List<ThirdActivePowerDailyUpdateView>> subList = BaseUtils.getSubList(dtoDailyList);
subList.forEach(dailyMapper::batchInsertList);
} else {
dailyMapper.batchInsertList(dtoDailyList);
}
}
return XServiceResult.OK;
});
}
......@@ -284,7 +313,14 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
return XTransactionHelper.begin(context, () -> {
ThirdCurrentWellConditionViewMapper mapper = context.getBean(ThirdCurrentWellConditionViewMapper.class);
mapper.deleteByParams(dtoList);
mapper.batchInsertList(dtoList);
if (CollUtil.isNotEmpty(dtoList)) {
if (dtoList.size() > BaseUtils.BATCH_SIZE) {
List<List<ThirdCurrentWellConditionView>> subList = BaseUtils.getSubList(dtoList);
subList.forEach(mapper::batchInsertList);
} else {
mapper.batchInsertList(dtoList);
}
}
return XServiceResult.OK;
});
}
......@@ -321,7 +357,14 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
}
return XTransactionHelper.begin(context, () -> {
ThirdPhotovoltaicPowerViewMapper mapper = context.getBean(ThirdPhotovoltaicPowerViewMapper.class);
mapper.batchInsertList(dtoList);
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;
});
}
......@@ -377,7 +420,14 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
}
return XTransactionHelper.begin(context, () -> {
ThirdPhotovoltaicPowerViewMapper mapper = context.getBean(ThirdPhotovoltaicPowerViewMapper.class);
mapper.batchInsertList(dtoList);
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;
});
}
......@@ -546,7 +596,14 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
bean.delete(queryWrapper);
//保存当日最新数据
ThirdDailyAccumulationViewMapper mapper = context.getBean(ThirdDailyAccumulationViewMapper.class);
mapper.batchInsertList(dtoList);
if (CollUtil.isNotEmpty(dtoList)) {
if (dtoList.size() > BaseUtils.BATCH_SIZE) {
List<List<ThirdDailyAccumulationView>> subList = BaseUtils.getSubList(dtoList);
subList.forEach(mapper::batchInsertList);
} else {
mapper.batchInsertList(dtoList);
}
}
//删除每日最新数据
ThirdDailyAccumulationUpdateMapper updateMapper = context.getBean(ThirdDailyAccumulationUpdateMapper.class);
updateMapper.delete(new LambdaQueryWrapper<ThirdDailyAccumulationUpdateEnt>()
......@@ -555,7 +612,14 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
);
//保存每日最新数据
ThirdDailyAccumulationUpdateViewMapper updateViewMapper = context.getBean(ThirdDailyAccumulationUpdateViewMapper.class);
updateViewMapper.batchInsertList(updateDtoList);
if (CollUtil.isNotEmpty(updateDtoList)) {
if (updateDtoList.size() > BaseUtils.BATCH_SIZE) {
List<List<ThirdDailyAccumulationUpdateView>> subList = BaseUtils.getSubList(updateDtoList);
subList.forEach(updateViewMapper::batchInsertList);
} else {
updateViewMapper.batchInsertList(updateDtoList);
}
}
return XServiceResult.OK;
});
}
......@@ -622,7 +686,14 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
bean.delete(queryWrapper);
//保存当日最新数据
ThirdWellAvgActivePowerViewMapper mapper = context.getBean(ThirdWellAvgActivePowerViewMapper.class);
mapper.batchInsertList(dtoList);
if (CollUtil.isNotEmpty(dtoList)) {
if (dtoList.size() > BaseUtils.BATCH_SIZE) {
List<List<ThirdWellAvgActivePowerView>> subList = BaseUtils.getSubList(dtoList);
subList.forEach(mapper::batchInsertList);
} else {
mapper.batchInsertList(dtoList);
}
}
return XServiceResult.OK;
});
}
......
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