河北PMS算法调整-国网上送三个接口新增年数据

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());
+            }
         }
     }
 

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<RUploadEvaluationDataD> {
 
-    List<RUploadEvaluationDataD> evaluationMonthData(@Param("monthDate") String monthDate,@Param("startTime") String startTime,@Param("endTime") String endTime);
+    List<RUploadEvaluationDataD> evaluationMonthData(@Param("monthDate") String monthDate,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("type") String type);
 
 }

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<RUploadPointStatisticalDataD> {
 
-    List<RUploadPointStatisticalDataD> pointStatisticalMonthData(@Param("monthDate") String monthDate, @Param("startTime") String startTime, @Param("endTime") String endTime);
+    List<RUploadPointStatisticalDataD> pointStatisticalMonthData(@Param("monthDate") String monthDate, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("type") String type);
 
 }

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

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

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<RUploadEvaluati
      */
     void insertEvaluationDataMonth(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam);
 
+    /**
+     * 电能质量基准水平评估数据-年表
+     * @param calculatedParam
+     */
+    void insertEvaluationDataYear(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam);
+
 }

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<RUploadPo
      */
     void insertPointStatisticalDataMonth(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam);
 
+    /**
+     * 主配网监测点统计数据-年表
+     * @param calculatedParam
+     */
+    void insertPointStatisticalDataYear(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam);
+
 }

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<RUploadEva
         //结束时间
         String endTime = DateUtil.format(DateUtil.endOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)), DatePattern.NORM_DATE_PATTERN);
         //数据集
-        List<RUploadEvaluationDataD> list = this.baseMapper.evaluationMonthData(beginMonth,startTime,endTime);
+        List<RUploadEvaluationDataD> 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<DeptGetChildrenMoreDTO> 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<RUploadEvaluationDataD> list = this.baseMapper.evaluationMonthData(begin,startTime,endTime,"01");
         if (CollUtil.isNotEmpty(list)){
             list.forEach(item->{
                 item.setId(IdUtil.simpleUUID());

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<RUpl
                 result.forEach(it -> it.setId(null));
             }
             //fixme 数据完成率先造假，后期删除
-            result.forEach(item->{
+//            result.forEach(item->{
-                if (item.getExpectCollectNum() > 0){
+//                if (item.getExpectCollectNum() > 0){
-                    Random random = new Random();
+//                    Random random = new Random();
-                    double randomValue = 99 + random.nextDouble() * (100 - 99);
+//                    double randomValue = 99 + random.nextDouble() * (100 - 99);
-                    item.setDataFullRate(randomValue);
+//                    item.setDataFullRate(randomValue);
-                    item.setActualCollectNum((int) Math.ceil(randomValue * item.getExpectCollectNum() / 100));
+//                    item.setActualCollectNum((int) Math.ceil(randomValue * item.getExpectCollectNum() / 100));
-                }
+//                }
-            });
+//            });
             //fixme over
             this.saveOrUpdateBatchByMultiId(result);
         }
@@ -271,7 +271,25 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl<RUpl
         //结束时间
         String endTime = DateUtil.format(DateUtil.endOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)), DatePattern.NORM_DATE_PATTERN);
         //数据集
-        List<RUploadPointStatisticalDataD> list = this.baseMapper.pointStatisticalMonthData(beginMonth,startTime,endTime);
+        List<RUploadPointStatisticalDataD> 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<DeptGetChildrenMoreDTO> 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<RUploadPointStatisticalDataD> list = this.baseMapper.pointStatisticalMonthData(beginMonth,startTime,endTime,"01");
         if (CollUtil.isNotEmpty(list)){
             list.forEach(item->{
                 item.setId(IdUtil.simpleUUID());