From 24e0993e719a3d6b985ca385f3f7c53b470d5136 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 25 Jul 2023 15:49:10 +0800
Subject: [PATCH] 水位异常告警修改

---
 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java |   18 +++---------------
 1 files changed, 3 insertions(+), 15 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 06b2e02..7268f12 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
@@ -101,25 +101,13 @@
 	 */
 	public String waterDataExcHandle(String arg1, String arg2) {
 		String templateId = "2431012248591";
+		//String adCode = "421181000000";
+		String adCode = null;
 		String uuid = templateId + UUID.randomUUID().toString();
 		// 查询当前策略对应的告警规则信息
 		AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
 		if (null!=alarmRule) {
-			// 调用中台服务接口查询数据
-			JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.res_z_not_normal_api);
-			// 只发短信,将发短信信息组装好
-			SmsRequestTemplate smsRequestTemplate
-				= noticeHandle.getSendSmsTemplate(ztData, templateId,alarmRule, ZtApiDataColumnConstant.waterDataExcList,false,null,uuid);
-			// 拼接后面内容
-			for (List<String> list : smsRequestTemplate.getTemplateContent()) {
-				// 保存告警记录信息
-				AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list,alarmRule,uuid);
-				if (null != alarmRecord) {
-					list.add(alarmRecord.getId().toString());
-				}
-			}
-			// 调用短信服务
-			smsService.sendSignMsg(smsRequestTemplate);
+			asyncNoticeHandle.waterDataExcHandle(alarmRule,templateId,uuid,adCode,false);
 		}
 		// 返回
 		return "水位数据异常";

--
Gitblit v1.9.3