diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/OrgPointExecutor.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/OrgPointExecutor.java index a91834329..b20e6048f 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/OrgPointExecutor.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/OrgPointExecutor.java @@ -631,6 +631,12 @@ public class OrgPointExecutor extends BaseExecutor{ //月表 irUploadPointStatisticalDataDService.insertPointStatisticalDataMonth(bindCmp.getRequestData()); } + } else if (tag.equalsIgnoreCase("r_upload_point_statistical_data_y")) { + //数据补招不执行非日表算法 + if (!calculatedParam.isRepair()) { + //月表 + irUploadPointStatisticalDataDService.insertPointStatisticalDataYear(bindCmp.getRequestData()); + } } } @@ -693,6 +699,12 @@ public class OrgPointExecutor extends BaseExecutor{ //月表 irUploadEvaluationDataDService.insertEvaluationDataMonth(bindCmp.getRequestData()); } + } else if (tag.equalsIgnoreCase("r_upload_evaluation_data_y")) { + //数据补招不执行非日表算法 + if (!calculatedParam.isRepair()) { + //月表 + irUploadEvaluationDataDService.insertEvaluationDataYear(bindCmp.getRequestData()); + } } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RUploadEvaluationDataDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RUploadEvaluationDataDMapper.java index cdc015b5f..eb6f9b1b3 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RUploadEvaluationDataDMapper.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RUploadEvaluationDataDMapper.java @@ -19,6 +19,6 @@ import java.util.List; @DS("master") public interface RUploadEvaluationDataDMapper extends MppBaseMapper { - List evaluationMonthData(@Param("monthDate") String monthDate,@Param("startTime") String startTime,@Param("endTime") String endTime); + List evaluationMonthData(@Param("monthDate") String monthDate,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") String type); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RUploadPointStatisticalDataDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RUploadPointStatisticalDataDMapper.java index 11a79ee7d..3bc8bc244 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RUploadPointStatisticalDataDMapper.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RUploadPointStatisticalDataDMapper.java @@ -18,6 +18,6 @@ import java.util.List; @DS("master") public interface RUploadPointStatisticalDataDMapper extends MppBaseMapper { - List pointStatisticalMonthData(@Param("monthDate") String monthDate, @Param("startTime") String startTime, @Param("endTime") String endTime); + List pointStatisticalMonthData(@Param("monthDate") String monthDate, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("type") String type); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/mapping/RUploadEvaluationDataDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/mapping/RUploadEvaluationDataDMapper.xml index 984ff4414..679ff7284 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/mapping/RUploadEvaluationDataDMapper.xml +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/mapping/RUploadEvaluationDataDMapper.xml @@ -20,7 +20,7 @@ ifnull(round(avg(nullif(standard_deviation,3.1415926)),8),3.1415926) standardDeviation, #{monthDate} statisticalDate, statistical_level statisticalLevel, - '02' statisticalType, + #{type} statisticalType, voltage_level voltageLevel, 0 uploadStatus from diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/mapping/RUploadPointStatisticalDataDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/mapping/RUploadPointStatisticalDataDMapper.xml index d2d8e56c8..7d200a0d4 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/mapping/RUploadPointStatisticalDataDMapper.xml +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/mapping/RUploadPointStatisticalDataDMapper.xml @@ -21,7 +21,7 @@ round(avg(station_monitor_num)) stationMonitorNum, #{monthDate} statisticalDate, statistical_level statisticalLevel, - '02' statisticalType, + #{type} statisticalType, distribution_flag distributionFlag, 0 uploadStatus from diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRUploadEvaluationDataDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRUploadEvaluationDataDService.java index 19c65ad44..0d29abe5e 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRUploadEvaluationDataDService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRUploadEvaluationDataDService.java @@ -27,4 +27,10 @@ public interface IRUploadEvaluationDataDService extends IService calculatedParam); + /** + * 电能质量基准水平评估数据-年表 + * @param calculatedParam + */ + void insertEvaluationDataYear(CalculatedParam calculatedParam); + } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRUploadPointStatisticalDataDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRUploadPointStatisticalDataDService.java index 2f213a39a..5888d4625 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRUploadPointStatisticalDataDService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRUploadPointStatisticalDataDService.java @@ -27,4 +27,10 @@ public interface IRUploadPointStatisticalDataDService extends IService calculatedParam); + /** + * 主配网监测点统计数据-年表 + * @param calculatedParam + */ + void insertPointStatisticalDataYear(CalculatedParam calculatedParam); + } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadEvaluationDataDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadEvaluationDataDServiceImpl.java index 1d23fae4b..5831f02ec 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadEvaluationDataDServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadEvaluationDataDServiceImpl.java @@ -182,7 +182,29 @@ public class RUploadEvaluationDataDServiceImpl extends MppServiceImpl list = this.baseMapper.evaluationMonthData(beginMonth,startTime,endTime); + List list = this.baseMapper.evaluationMonthData(beginMonth,startTime,endTime,"02"); + if (CollUtil.isNotEmpty(list)){ + list.forEach(item->{ + item.setId(IdUtil.simpleUUID()); + }); + this.saveOrUpdateBatchByMultiId(list,1000); + } + } + + /** + * 通过日表取平均值，作为年表数据 + * @param calculatedParam + */ + @Override + public void insertEvaluationDataYear(CalculatedParam calculatedParam) { + //开始年 + String begin = DateUtil.format(DateUtil.beginOfYear(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_YEAR_PATTERN)), DatePattern.NORM_YEAR_PATTERN); + //起始时间 + String startTime = DateUtil.format(DateUtil.beginOfYear(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)), DatePattern.NORM_DATE_PATTERN); + //结束时间 + String endTime = DateUtil.format(DateUtil.endOfYear(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)), DatePattern.NORM_DATE_PATTERN); + //数据集 + List list = this.baseMapper.evaluationMonthData(begin,startTime,endTime,"01"); if (CollUtil.isNotEmpty(list)){ list.forEach(item->{ item.setId(IdUtil.simpleUUID()); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java index 63a7275db..3bf7653b9 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java @@ -249,14 +249,14 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl it.setId(null)); } //fixme 数据完成率先造假，后期删除 - result.forEach(item->{ - if (item.getExpectCollectNum() > 0){ - Random random = new Random(); - double randomValue = 99 + random.nextDouble() * (100 - 99); - item.setDataFullRate(randomValue); - item.setActualCollectNum((int) Math.ceil(randomValue * item.getExpectCollectNum() / 100)); - } - }); +// result.forEach(item->{ +// if (item.getExpectCollectNum() > 0){ +// Random random = new Random(); +// double randomValue = 99 + random.nextDouble() * (100 - 99); +// item.setDataFullRate(randomValue); +// item.setActualCollectNum((int) Math.ceil(randomValue * item.getExpectCollectNum() / 100)); +// } +// }); //fixme over this.saveOrUpdateBatchByMultiId(result); } @@ -271,7 +271,25 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl list = this.baseMapper.pointStatisticalMonthData(beginMonth,startTime,endTime); + List list = this.baseMapper.pointStatisticalMonthData(beginMonth,startTime,endTime,"02"); + if (CollUtil.isNotEmpty(list)){ + list.forEach(item->{ + item.setId(IdUtil.simpleUUID()); + }); + this.saveOrUpdateBatchByMultiId(list,1000); + } + } + + @Override + public void insertPointStatisticalDataYear(CalculatedParam calculatedParam) { + //开始年 + String beginMonth = DateUtil.format(DateUtil.beginOfYear(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_YEAR_PATTERN)), DatePattern.NORM_YEAR_PATTERN); + //起始时间 + String startTime = DateUtil.format(DateUtil.beginOfYear(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)), DatePattern.NORM_DATE_PATTERN); + //结束时间 + String endTime = DateUtil.format(DateUtil.endOfYear(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)), DatePattern.NORM_DATE_PATTERN); + //数据集 + List list = this.baseMapper.pointStatisticalMonthData(beginMonth,startTime,endTime,"01"); if (CollUtil.isNotEmpty(list)){ list.forEach(item->{ item.setId(IdUtil.simpleUUID());