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 | 4 ++--
1 files changed, 2 insertions(+), 2 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 a898f78..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 "水位接近汛限告警";
}
--
Gitblit v1.9.3