From d2cb8a20207a4b45a8fd1553bbf1ff1268e393cb Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Thu, 22 Aug 2024 19:03:24 +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/AsyncNoticeHandle.java |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java
index dcdf543..d9e4e43 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java
@@ -827,10 +827,9 @@
 
 				// 保存告警记录信息
 				AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
-//				if (null != alarmRecord) {
-//					list.add(alarmRecord.getId().toString());
-					list.add("445566544112");
-//				}
+				if (null != alarmRecord) {
+					list.add(alarmRecord.getId().toString());
+				}
 			}
 			if (!isTimeSend()) return map;
 			map = smsService.sendSignMsg(smsRequestTemplate);

--
Gitblit v1.9.3