Merge remote-tracking branch 'origin/master'

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml

@@ -1802,7 +1802,7 @@
         line.Name name,
         pq_line_detail.Num lineNo,
         s1.Name voltageLevel,
-        pq_line_detail.PT_Phase_Type ptType,
+        pq_line_detail.PT_Type ptType,
         pq_line_detail.Run_Flag status
         FROM
         pq_line_detail

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/NodeMapper.xml

@@ -17,8 +17,8 @@
         pq_device_process.process_no processNo,
         pq_device.Dev_Key devKey
         FROM
-        pq_node
+        pq_device
-        LEFT JOIN pq_device ON pq_node.Id = pq_device.Node_Id
+        LEFT JOIN pq_node ON pq_node.Id = pq_device.Node_Id
         LEFT JOIN pq_line on pq_device.id = pq_line.id
         LEFT JOIN pq_device_process on pq_device_process.id = pq_device.id
         LEFT JOIN sys_dict_data s1 ON pq_device.Dev_Type = s1.id

pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/algorithm/DeviceAlgorithmTaskRunner.java

@@ -0,0 +1,39 @@
+package com.njcn.system.timer.tasks.algorithm;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.njcn.algorithm.pojo.bo.BaseParam;
+import com.njcn.algorithm.pojo.liteflow.LiteFlowAlgorithmFeignClient;
+import com.njcn.system.timer.TimerTaskRunner;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+/**
+ * 类的介绍：装置算法执行链定时任务
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/12/6 9:35
+ */
+@Component
+@RequiredArgsConstructor
+public class DeviceAlgorithmTaskRunner implements TimerTaskRunner {
+
+    private final LiteFlowAlgorithmFeignClient liteFlowFeignClient;
+
+    @Override
+    public void action(String date) {
+        BaseParam baseParam = new BaseParam();
+        baseParam.setFullChain(true);
+        baseParam.setRepair(false);
+        if(StrUtil.isBlank(date)){
+            baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN));
+        }else {
+            baseParam.setDataDate(date);
+        }
+        liteFlowFeignClient.deviceExecutor(baseParam);
+    }
+
+
+}

pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/algorithm/MeasurementAlgorithmTaskRunner.java

@@ -0,0 +1,39 @@
+package com.njcn.system.timer.tasks.algorithm;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.njcn.algorithm.pojo.bo.BaseParam;
+import com.njcn.algorithm.pojo.liteflow.LiteFlowAlgorithmFeignClient;
+import com.njcn.system.timer.TimerTaskRunner;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+/**
+ * 类的介绍：监测点算法执行链定时任务
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/12/6 9:35
+ */
+@Component
+@RequiredArgsConstructor
+public class MeasurementAlgorithmTaskRunner implements TimerTaskRunner {
+
+    private final LiteFlowAlgorithmFeignClient liteFlowFeignClient;
+
+    @Override
+    public void action(String date) {
+        BaseParam baseParam = new BaseParam();
+        baseParam.setFullChain(true);
+        baseParam.setRepair(false);
+        if(StrUtil.isBlank(date)){
+            baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN));
+        }else {
+            baseParam.setDataDate(date);
+        }
+        liteFlowFeignClient.measurementPointExecutor(baseParam);
+    }
+
+
+}

pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/algorithm/MeasurementHourAlgorithmTaskRunner.java

@@ -0,0 +1,41 @@
+package com.njcn.system.timer.tasks.algorithm;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.njcn.algorithm.pojo.bo.BaseParam;
+import com.njcn.algorithm.pojo.liteflow.LiteFlowAlgorithmFeignClient;
+import com.njcn.system.timer.TimerTaskRunner;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+/**
+ * 类的介绍：监测点算法执行链定时任务
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/12/6 9:35
+ */
+@Component
+@RequiredArgsConstructor
+public class MeasurementHourAlgorithmTaskRunner implements TimerTaskRunner {
+
+    private final LiteFlowAlgorithmFeignClient liteFlowFeignClient;
+
+    @Override
+    public void action(String date) {
+        BaseParam baseParam = new BaseParam();
+        baseParam.setFullChain(true);
+        //由于是按小时跑的，前端其他算法都是按天跑的，因此修改参数
+        if(StrUtil.isBlank(date)){
+            baseParam.setRepair(false);
+            baseParam.setDataDate(DateUtil.now());
+        }else {
+            baseParam.setRepair(true);
+            baseParam.setBeginTime(date+ " 00:00:00");
+            baseParam.setEndTime(date+ " 24:00:00");
+        }
+        liteFlowFeignClient.measurementPointExecutorByHour(baseParam);
+    }
+
+
+}

pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/algorithm/OrgAlgorithmTaskRunner.java

@@ -0,0 +1,37 @@
+package com.njcn.system.timer.tasks.algorithm;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.njcn.algorithm.pojo.bo.BaseParam;
+import com.njcn.algorithm.pojo.liteflow.LiteFlowAlgorithmFeignClient;
+import com.njcn.system.timer.TimerTaskRunner;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+/**
+ * 类的介绍：单位监测点算法执行链定时任务
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/12/6 9:35
+ */
+@Component
+@RequiredArgsConstructor
+public class OrgAlgorithmTaskRunner implements TimerTaskRunner {
+
+    private final LiteFlowAlgorithmFeignClient liteFlowFeignClient;
+
+    @Override
+    public void action(String date) {
+        BaseParam baseParam = new BaseParam();
+        baseParam.setFullChain(true);
+        baseParam.setRepair(false);
+        if(StrUtil.isBlank(date)){
+            baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN));
+        }else {
+            baseParam.setDataDate(date);
+        }
+        liteFlowFeignClient.orgPointExecutor(baseParam);
+    }
+}

pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/algorithm/SubstationAlgorithmTaskRunner.java

@@ -0,0 +1,37 @@
+package com.njcn.system.timer.tasks.algorithm;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.njcn.algorithm.pojo.bo.BaseParam;
+import com.njcn.algorithm.pojo.liteflow.LiteFlowAlgorithmFeignClient;
+import com.njcn.system.timer.TimerTaskRunner;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+/**
+ * 类的介绍：变电站算法执行链定时任务
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/12/6 9:35
+ */
+@Component
+@RequiredArgsConstructor
+public class SubstationAlgorithmTaskRunner implements TimerTaskRunner {
+
+    private final LiteFlowAlgorithmFeignClient liteFlowFeignClient;
+
+    @Override
+    public void action(String date) {
+        BaseParam baseParam = new BaseParam();
+        baseParam.setFullChain(true);
+        baseParam.setRepair(false);
+        if(StrUtil.isBlank(date)){
+            baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN));
+        }else {
+            baseParam.setDataDate(date);
+        }
+        liteFlowFeignClient.substationExecutor(baseParam);
+    }
+}