监测点分钟数据转日数据算法调整

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/MeasurementExecutor.java

@@ -1,6 +1,10 @@
 package com.njcn.prepare.executor;
 
 import com.njcn.prepare.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.service.mysql.line.DayDataService;
+import com.njcn.prepare.harmonic.service.mysql.line.RMpEventDetailDService;
+import com.njcn.prepare.harmonic.service.mysql.line.RMpEventDetailService;
+import com.njcn.prepare.harmonic.service.mysql.line.RMpMonitorEvaluateDService;
 import com.njcn.prepare.harmonic.service.mysql.line.*;
 import com.yomahub.liteflow.annotation.LiteflowComponent;
 import com.yomahub.liteflow.annotation.LiteflowMethod;
@@ -25,6 +29,8 @@ public class MeasurementExecutor extends BaseExecutor {
 
     private final RMpEventDetailDService rMpEventDetailDService;
 
+    private final DayDataService dayDataService;
+
     private final RStatAbnormalDService rStatAbnormalDService;
     private final ROperatingMonitorService rOperatingMonitorService;
 
@@ -71,6 +77,20 @@ public class MeasurementExecutor extends BaseExecutor {
         }
     }
 
+    /**
+     * 算法名: 3.4.1.1-----监测点报表_日表
+     *
+     * @author xuyang
+     * @date 2023年11月09日 10:08
+     */
+    @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "dataToDay", nodeType = NodeTypeEnum.COMMON)
+    public boolean dataToDayAccess(NodeComponent bindCmp) {
+        return isAccess(bindCmp);
+    }
+    @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "dataToDay", nodeType = NodeTypeEnum.COMMON)
+    public void dataToDayProcess(NodeComponent bindCmp) {
+        dayDataService.dataToDayHandler(bindCmp.getRequestData());
+    }
     /**
      * 3.3.1.2.	监测点数据异常_日表
      * @param bindCmp

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java

@@ -102,10 +102,10 @@ public class DayDataController extends BaseController {
                 log.info(item+"-->开始执行");
                 startTime = item+" "+"00:00:00";
                 endTime = item+" "+"23:59:59";
-                dayDataService.dataToDayHandler(indexLists,startTime,endTime,jobParam.getLineType());
+//                dayDataService.dataToDayHandler(indexLists,startTime,endTime,jobParam.getLineType());
             }
         } else {
-            dayDataService.dataToDayHandler(indexLists,jobParam.getBeginTime(),jobParam.getEndTime(),jobParam.getLineType());
+//            dayDataService.dataToDayHandler(indexLists,jobParam.getBeginTime(),jobParam.getEndTime(),jobParam.getLineType());
         }
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
     }

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/day/IRStatDataHarmpowerPDService.java

@@ -1,10 +1,11 @@
 package com.njcn.prepare.harmonic.service.mysql.day;
 
+import com.github.jeffreyning.mybatisplus.service.IMppService;
 import com.njcn.harmonic.pojo.po.day.RStatDataHarmpowerPDPO;
 
 import java.util.List;
 
-public interface IRStatDataHarmpowerPDService {
+public interface IRStatDataHarmpowerPDService extends IMppService<RStatDataHarmpowerPDPO> {
 
     void insert(List<RStatDataHarmpowerPDPO> list);
 }

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/DayDataService.java

@@ -1,6 +1,6 @@
 package com.njcn.prepare.harmonic.service.mysql.line;
 
-import java.util.List;
+import com.njcn.prepare.bo.CalculatedParam;
 
 /**
  * Description:
@@ -11,21 +11,13 @@ import java.util.List;
  * @version V1.0.0
  */
 public interface DayDataService {
-    /**
-    * @Description: 生成day表相关数据
-    * @Param: [indexLists, startTime, endTime]
-    * @return: void
-    * @Author: clam
-    * @Date: 2022/10/24
-    */
-    //void dayDataJobHandler(List<String> indexLists, String startTime, String endTime);
 
-    /**
-     * 处理day表，并将数据入MySQL库中
-     * @param indexLists
-     * @param startTime
-     * @param endTime
-     * @param calType 0.mysql 1.influxb 2.两个都处理
+    /***
+     * 监测点报表_日表
+     * @author xuyang
+     * @date 2023/11/09 10:08
+     * @param calculatedParam 查询条件
      */
-    void dataToDayHandler(List<String> indexLists, String startTime, String endTime,Integer calType);
+    void dataToDayHandler(CalculatedParam calculatedParam);
+
 }