From b3b5e64e0715027a388c97b5f854a713adf2152c Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Tue, 25 Mar 2025 15:31:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/device/pq/mapper/mapping/NodeMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/NodeMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/NodeMapper.xml index 9a5996559..8853b9679 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/NodeMapper.xml +++ b/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 - LEFT JOIN pq_device ON pq_node.Id = pq_device.Node_Id + pq_device + 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 From 20e1b8cce7e79e4775a731a875e00eaa5e777ae1 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Tue, 25 Mar 2025 16:09:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml index 36706f577..6b1f4a1e6 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml +++ b/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 From 6ee4da44225e07132b856f7e5414f167befd5004 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Tue, 25 Mar 2025 20:28:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=AE=97=E6=B3=95=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E6=89=A7=E8=A1=8C=E9=93=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../algorithm/DeviceAlgorithmTaskRunner.java | 39 ++++++++++++++++++ .../MeasurementAlgorithmTaskRunner.java | 39 ++++++++++++++++++ .../MeasurementHourAlgorithmTaskRunner.java | 41 +++++++++++++++++++ .../algorithm/OrgAlgorithmTaskRunner.java | 37 +++++++++++++++++ .../SubstationAlgorithmTaskRunner.java | 37 +++++++++++++++++ 5 files changed, 193 insertions(+) create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/algorithm/DeviceAlgorithmTaskRunner.java create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/algorithm/MeasurementAlgorithmTaskRunner.java create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/algorithm/MeasurementHourAlgorithmTaskRunner.java create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/algorithm/OrgAlgorithmTaskRunner.java create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/algorithm/SubstationAlgorithmTaskRunner.java diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/algorithm/DeviceAlgorithmTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/algorithm/DeviceAlgorithmTaskRunner.java new file mode 100644 index 000000000..2acdfbd2c --- /dev/null +++ b/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); + } + + +} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/algorithm/MeasurementAlgorithmTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/algorithm/MeasurementAlgorithmTaskRunner.java new file mode 100644 index 000000000..e480a8c5c --- /dev/null +++ b/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); + } + + +} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/algorithm/MeasurementHourAlgorithmTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/algorithm/MeasurementHourAlgorithmTaskRunner.java new file mode 100644 index 000000000..42e6b6eed --- /dev/null +++ b/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); + } + + +} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/algorithm/OrgAlgorithmTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/algorithm/OrgAlgorithmTaskRunner.java new file mode 100644 index 000000000..3364999a7 --- /dev/null +++ b/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); + } +} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/algorithm/SubstationAlgorithmTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/algorithm/SubstationAlgorithmTaskRunner.java new file mode 100644 index 000000000..f82fa9c6f --- /dev/null +++ b/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); + } +}