From 6609eaa37c491fc13ab12e1114425dd0f728fdd2 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Mon, 02 Sep 2024 17:03:05 +0800
Subject: [PATCH] 告警优化

---
 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java |    9 +++++----
 1 files changed, 5 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 29087b9..30ea002 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
@@ -203,7 +203,7 @@
 		String uuid = alarmRuleDetail.getTemplateId() + UUID.randomUUID().toString();
 		// 只发短信,将发短信信息组装好
 		SmsRequestTemplate smsRequestTemplate
-			= noticeHandle.getSendSmsTemplate(ztData, alarmRule, alarmRuleDetail, columnList, flag, adCode, uuid, isSendStation);
+			= noticeHandle.getSendSmsTemplate(ztData, alarmRule, alarmRuleDetail, columnList, ZtApiDataColumnConstant.waterFirstOverMergeWaterList,flag, adCode, uuid, isSendStation);
 		// 拼接后面内容
 		if (smsRequestTemplate.getPersonVOList().size() > 0) {
 			for (List<String> list : smsRequestTemplate.getTemplateContent()) {
@@ -219,9 +219,10 @@
 
 				// 保存告警记录信息
 				AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, null);
-				if (null != alarmRecord) {
-					list.add(alarmRecord.getId().toString());
-				}
+//				if (null != alarmRecord) {
+//					list.add(alarmRecord.getId().toString());
+					list.add("111");
+//				}
 			}
 
 			if (!isTimeSend()) return map;

--
Gitblit v1.9.3