From c8b03d3da4e29fc3fb9a42ca157738256c331a00 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 13 Mar 2024 13:55:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/AlarmXxlJob.java | 138 ++++++++++++++++++++++++++++++++++------------
1 files changed, 102 insertions(+), 36 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/AlarmXxlJob.java b/skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/AlarmXxlJob.java
index c802a92..24a39c1 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/AlarmXxlJob.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/AlarmXxlJob.java
@@ -4,8 +4,11 @@
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
import com.xxl.job.core.log.XxlJobLogger;
+import feign.Request;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
+import java.util.concurrent.TimeUnit;
/**
* 告警定时任务执行器
@@ -28,8 +31,7 @@
public ReturnT<String> waterInfoNotHandle(String param){
XxlJobLogger.log("开始执行任务...");
// 创建外呼任务
- String result = noticeClient.createAlarmNoticeTaskJobHandler("水位信息接收不到","","waterInfoNotHandle");
- XxlJobLogger.log("任务响应结果：" + result);
+ noticeClient.createAlarmNoticeTaskJobHandler("水位信息接收不到","","waterInfoNotHandle");
XxlJobLogger.log("结束自动创建任务...");
// 返回
return ReturnT.SUCCESS;
@@ -45,8 +47,7 @@
public ReturnT<String> waterDataExcHandle(String param){
XxlJobLogger.log("开始执行任务...");
// 创建外呼任务
- String result = noticeClient.createAlarmNoticeTaskJobHandler("水位数据异常","","waterDataExcHandle");
- XxlJobLogger.log("任务响应结果：" + result);
+ noticeClient.createAlarmNoticeTaskJobHandler("水位数据异常","","waterDataExcHandle");
XxlJobLogger.log("结束自动创建任务...");
// 返回
return ReturnT.SUCCESS;
@@ -62,8 +63,7 @@
public ReturnT<String> waterLessDeadHandle(String param){
XxlJobLogger.log("开始执行任务...");
// 创建外呼任务
- String result = noticeClient.createAlarmNoticeTaskJobHandler("水位超低于死水位","","waterLessDeadHandle");
- XxlJobLogger.log("任务响应结果：" + result);
+ noticeClient.createAlarmNoticeTaskJobHandler("水位超低于死水位","","waterLessDeadHandle");
XxlJobLogger.log("结束自动创建任务...");
// 返回
return ReturnT.SUCCESS;
@@ -79,8 +79,7 @@
public ReturnT<String> waterMoreDeadLessHJHandle(String param){
XxlJobLogger.log("开始执行任务...");
// 创建外呼任务
- String result = noticeClient.createAlarmNoticeTaskJobHandler("水位高于死水位，低于旱警水位","","waterMoreDeadLessHJHandle");
- XxlJobLogger.log("任务响应结果：" + result);
+ noticeClient.createAlarmNoticeTaskJobHandler("水位高于死水位，低于旱警水位","","waterMoreDeadLessHJHandle");
XxlJobLogger.log("结束自动创建任务...");
// 返回
return ReturnT.SUCCESS;
@@ -96,8 +95,7 @@
public ReturnT<String> waterComeOverHandle(String param){
XxlJobLogger.log("开始执行任务...");
// 创建外呼任务
- String result = noticeClient.createAlarmNoticeTaskJobHandler("水位接近汛限告警","","waterComeOverHandle");
- XxlJobLogger.log("任务响应结果：" + result);
+ noticeClient.createAlarmNoticeTaskJobHandler("水位接近汛限告警","","waterComeOverHandle");
XxlJobLogger.log("结束自动创建任务...");
// 返回
return ReturnT.SUCCESS;
@@ -113,8 +111,7 @@
public ReturnT<String> waterFirstOverHandle(String param){
XxlJobLogger.log("开始执行任务...");
// 创建外呼任务
- String result = noticeClient.createAlarmNoticeTaskJobHandler("水位初次超汛限告警","","waterFirstOverHandle");
- XxlJobLogger.log("任务响应结果：" + result);
+ noticeClient.createAlarmNoticeTaskJobHandler("水位初次超汛限告警","","waterFirstOverHandle");
XxlJobLogger.log("结束自动创建任务...");
// 返回
return ReturnT.SUCCESS;
@@ -130,8 +127,7 @@
public ReturnT<String> waterSmallScaleOverHandle(String param){
XxlJobLogger.log("开始执行任务...");
// 创建外呼任务
- String result = noticeClient.createAlarmNoticeTaskJobHandler("水位小幅超汛限告警","","waterSmallScaleOverHandle");
- XxlJobLogger.log("任务响应结果：" + result);
+ noticeClient.createAlarmNoticeTaskJobHandler("水位小幅超汛限告警","","waterSmallScaleOverHandle");
XxlJobLogger.log("结束自动创建任务...");
// 返回
return ReturnT.SUCCESS;
@@ -147,8 +143,7 @@
public ReturnT<String> waterBigScaleOverHandle(String param){
XxlJobLogger.log("开始执行任务...");
// 创建外呼任务
- String result = noticeClient.createAlarmNoticeTaskJobHandler("水位大幅超汛限告警","","waterBigScaleOverHandle");
- XxlJobLogger.log("任务响应结果：" + result);
+ noticeClient.createAlarmNoticeTaskJobHandler("水位大幅超汛限告警","","waterBigScaleOverHandle");
XxlJobLogger.log("结束自动创建任务...");
// 返回
return ReturnT.SUCCESS;
@@ -164,8 +159,7 @@
public ReturnT<String> waterComeDesignHandle(String param){
XxlJobLogger.log("开始执行任务...");
// 创建外呼任务
- String result = noticeClient.createAlarmNoticeTaskJobHandler("水位接近设计洪水位告警","","waterComeDesignHandle");
- XxlJobLogger.log("任务响应结果：" + result);
+ noticeClient.createAlarmNoticeTaskJobHandler("水位接近设计洪水位告警","","waterComeDesignHandle");
XxlJobLogger.log("结束自动创建任务...");
// 返回
return ReturnT.SUCCESS;
@@ -181,8 +175,7 @@
public ReturnT<String> waterMoreDesignHandle(String param){
XxlJobLogger.log("开始执行任务...");
// 创建外呼任务
- String result = noticeClient.createAlarmNoticeTaskJobHandler("水位超设计洪水位告警","","waterMoreDesignHandle");
- XxlJobLogger.log("任务响应结果：" + result);
+ noticeClient.createAlarmNoticeTaskJobHandler("水位超设计洪水位告警","","waterMoreDesignHandle");
XxlJobLogger.log("结束自动创建任务...");
// 返回
return ReturnT.SUCCESS;
@@ -198,8 +191,7 @@
public ReturnT<String> waterMoreCheckHandle(String param){
XxlJobLogger.log("开始执行任务...");
// 创建外呼任务
- String result = noticeClient.createAlarmNoticeTaskJobHandler("水位超校核洪水位告警","","waterMoreCheckHandle");
- XxlJobLogger.log("任务响应结果：" + result);
+ noticeClient.createAlarmNoticeTaskJobHandler("水位超校核洪水位告警","","waterMoreCheckHandle");
XxlJobLogger.log("结束自动创建任务...");
// 返回
return ReturnT.SUCCESS;
@@ -215,8 +207,7 @@
public ReturnT<String> waterComeOneHourUpHandle(String param){
XxlJobLogger.log("开始执行任务...");
// 创建外呼任务
- String result = noticeClient.createAlarmNoticeTaskJobHandler("近1h水位陡升","","waterComeOneHourUpHandle");
- XxlJobLogger.log("任务响应结果：" + result);
+ noticeClient.createAlarmNoticeTaskJobHandler("近1h水位陡升","","waterComeOneHourUpHandle");
XxlJobLogger.log("结束自动创建任务...");
// 返回
return ReturnT.SUCCESS;
@@ -232,8 +223,7 @@
public ReturnT<String> waterComeOneHourDownHandle(String param){
XxlJobLogger.log("开始执行任务...");
// 创建外呼任务
- String result = noticeClient.createAlarmNoticeTaskJobHandler("近1h水位陡降","","waterComeOneHourDownHandle");
- XxlJobLogger.log("任务响应结果：" + result);
+ noticeClient.createAlarmNoticeTaskJobHandler("近1h水位陡降","","waterComeOneHourDownHandle");
XxlJobLogger.log("结束自动创建任务...");
// 返回
return ReturnT.SUCCESS;
@@ -249,8 +239,7 @@
public ReturnT<String> rainstormHandle(String param){
XxlJobLogger.log("开始执行任务...");
// 创建外呼任务
- String result = noticeClient.createAlarmNoticeTaskJobHandler("暴雨降雨预警","","rainstormHandle");
- XxlJobLogger.log("任务响应结果：" + result);
+ noticeClient.createAlarmNoticeTaskJobHandler("暴雨降雨预警","","rainstormHandle");
XxlJobLogger.log("结束自动创建任务...");
// 返回
return ReturnT.SUCCESS;
@@ -266,8 +255,7 @@
public ReturnT<String> alreadyHeavyRainHandle(String param){
XxlJobLogger.log("开始执行任务...");
// 创建外呼任务
- String result = noticeClient.createAlarmNoticeTaskJobHandler("已降大雨告警","","alreadyHeavyRainHandle");
- XxlJobLogger.log("任务响应结果：" + result);
+ noticeClient.createAlarmNoticeTaskJobHandler("已降大雨告警","","alreadyHeavyRainHandle");
XxlJobLogger.log("结束自动创建任务...");
// 返回
return ReturnT.SUCCESS;
@@ -283,8 +271,7 @@
public ReturnT<String> alreadyRainstormHandle(String param){
XxlJobLogger.log("开始执行任务...");
// 创建外呼任务
- String result = noticeClient.createAlarmNoticeTaskJobHandler("已降暴雨告警","","alreadyRainstormHandle");
- XxlJobLogger.log("任务响应结果：" + result);
+ noticeClient.createAlarmNoticeTaskJobHandler("已降暴雨告警","","alreadyRainstormHandle");
XxlJobLogger.log("结束自动创建任务...");
// 返回
return ReturnT.SUCCESS;
@@ -300,8 +287,7 @@
public ReturnT<String> twoHourRainHandle(String param){
XxlJobLogger.log("开始执行任务...");
// 创建外呼任务
- String result = noticeClient.createAlarmNoticeTaskJobHandler("2小时降雨告警","","twoHourRainHandle");
- XxlJobLogger.log("任务响应结果：" + result);
+ noticeClient.createAlarmNoticeTaskJobHandler("2小时降雨告警","","twoHourRainHandle");
XxlJobLogger.log("结束自动创建任务...");
// 返回
return ReturnT.SUCCESS;
@@ -317,10 +303,90 @@
public ReturnT<String> sixHourRainHandle(String param){
XxlJobLogger.log("开始执行任务...");
// 创建外呼任务
- String result = noticeClient.createAlarmNoticeTaskJobHandler("6小时降雨告警","","sixHourRainHandle");
- XxlJobLogger.log("任务响应结果：" + result);
+ noticeClient.createAlarmNoticeTaskJobHandler("6小时降雨告警","","sixHourRainHandle");
XxlJobLogger.log("结束自动创建任务...");
// 返回
return ReturnT.SUCCESS;
}
+
+ /**
+ * 策略19: 大坝安全监测告警-监测数据缺失-定时任务执行器
+ * @param param
+ * @return
+ * @throws Exception
+ */
+ @XxlJob("damSafetyHandle")
+ public ReturnT<String> damSafetyHandle(String param){
+ XxlJobLogger.log("开始执行任务...");
+ // 创建外呼任务
+ noticeClient.createAlarmNoticeTaskJobHandler("监测数据缺失","","damSafetyHandle");
+ XxlJobLogger.log("结束自动创建任务...");
+ // 返回
+ return ReturnT.SUCCESS;
+ }
+
+ /**
+ * 策略20: 大坝安全监测告警-测压管水位大于校核洪水位-定时任务执行器
+ * @param param
+ * @return
+ * @throws Exception
+ */
+ @XxlJob("damSafetySyHandle")
+ public ReturnT<String> damSafetySyHandle(String param){
+ XxlJobLogger.log("开始执行任务...");
+ // 创建外呼任务
+ noticeClient.createAlarmNoticeTaskJobHandler("测压管水位大于校核洪水位","","damSafetySyHandle");
+ XxlJobLogger.log("结束自动创建任务...");
+ // 返回
+ return ReturnT.SUCCESS;
+ }
+
+ /**
+ * 策略21: 大坝安全监测告警-渗压监测数据缺失-定时任务执行器
+ * @param param
+ * @return
+ * @throws Exception
+ */
+ @XxlJob("damSafetySyNoneHandle")
+ public ReturnT<String> damSafetySyNoneHandle(String param){
+ XxlJobLogger.log("开始执行任务...");
+ // 创建外呼任务
+ noticeClient.createAlarmNoticeTaskJobHandler("监测数据缺失","","damSafetySyNoneHandle");
+ XxlJobLogger.log("结束自动创建任务...");
+ // 返回
+ return ReturnT.SUCCESS;
+ }
+
+ /**
+ * 策略22: 大坝安全监测告警-渗流监测数据缺失-定时任务执行器
+ * @param param
+ * @return
+ * @throws Exception
+ */
+ @XxlJob("damSafetySlNoneHandle")
+ public ReturnT<String> damSafetySlNoneHandle(String param){
+ XxlJobLogger.log("开始执行任务...");
+ // 创建外呼任务
+ noticeClient.createAlarmNoticeTaskJobHandler("监测数据缺失","","damSafetySlNoneHandle");
+ XxlJobLogger.log("结束自动创建任务...");
+ // 返回
+ return ReturnT.SUCCESS;
+ }
+
+ /**
+ * 策略23: 大坝安全监测告警-位移监测数据缺失-定时任务执行器
+ * @param param
+ * @return
+ * @throws Exception
+ */
+ @XxlJob("damSafetyWyNoneHandle")
+ public ReturnT<String> damSafetyWyNoneHandle(String param){
+ XxlJobLogger.log("开始执行任务...");
+ // 创建外呼任务
+ noticeClient.createAlarmNoticeTaskJobHandler("监测数据缺失","","damSafetyWyNoneHandle");
+ XxlJobLogger.log("结束自动创建任务...");
+ // 返回
+ return ReturnT.SUCCESS;
+ }
+
}
--
Gitblit v1.9.3