From 3124fabb2026df05385068694a87205bfef22469 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 27 Jul 2023 11:45:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java | 43 +++++++++++++++++++++++++++++++++++--------
1 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java
index 6ad623a..9c9a86f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java
@@ -149,7 +149,7 @@
}
/**
- * 策略5: 水位接近汛限告警
+ * 策略5: 水位接近汛限告警（站内信）
*
* @param arg1
* @param arg2
@@ -162,7 +162,7 @@
// 查询当前策略对应的告警规则信息
AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
if (null!=alarmRule) {
- asyncNoticeHandle.waterComeOverHandle(templateId,uuid,alarmRule, null);
+ asyncNoticeHandle.waterComeOverHandle(templateId,uuid,alarmRule, adCode,true);
}
return "水位接近汛限告警";
}
@@ -307,8 +307,17 @@
* @return
*/
public String alreadyHeavyRainHandle(String arg1, String arg2) {
- // 业务逻辑处理 2...
- return "";
+ //String adCode = "420607000000";
+ String adCode = null;
+ String templateId = "2431012248569";
+ String uuid = templateId + UUID.randomUUID().toString();
+ // 查询当前策略对应的告警规则信息
+ AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
+ if (null!=alarmRule) {
+ asyncNoticeHandle.alreadyHeavyRainHandle(templateId,uuid,alarmRule,adCode,false);
+ }
+ // 返回
+ return "已降大雨告警";
}
/**
@@ -319,8 +328,17 @@
* @return
*/
public String alreadyRainstormHandle(String arg1, String arg2) {
- // 业务逻辑处理 2...
- return "";
+ //String adCode = "420607000000";
+ String adCode = null;
+ String templateId = "2431012216683";
+ String uuid = templateId + UUID.randomUUID().toString();
+ // 查询当前策略对应的告警规则信息
+ AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
+ if (null!=alarmRule) {
+ asyncNoticeHandle.alreadyRainstormHandle(templateId,uuid,alarmRule,adCode,false);
+ }
+ // 返回
+ return "已降暴雨告警";
}
/**
@@ -343,8 +361,17 @@
* @return
*/
public String sixHourRainHandle(String arg1, String arg2) {
- // 业务逻辑处理 2...
- return "";
+ //String adCode = "420607000000";
+ String adCode = null;
+ String templateId = "2431012216686";
+ String uuid = templateId + UUID.randomUUID().toString();
+ // 查询当前策略对应的告警规则信息
+ AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
+ if (null!=alarmRule) {
+ asyncNoticeHandle.sixHourRainHandle(templateId,uuid,alarmRule,adCode,false);
+ }
+ // 返回
+ return "6小时降雨告警";
}
}
--
Gitblit v1.9.3