From 3f3b0379cca52d13b377fae4c4d15b15aa18b1a7 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 12 Apr 2024 15:45:06 +0800
Subject: [PATCH] 字典接口逻辑修改，告警表格返回告警等级
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 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 e8ce1bc..0784625 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
@@ -987,7 +987,7 @@
list.add(alarmRecord.getId().toString());
}
}
- map = smsService.sendSignMsg(smsRequestTemplate);
+ map = smsService.sendSignMsgMergeCd(smsRequestTemplate);
// 调用短信服务
return map;
}
@@ -1040,9 +1040,34 @@
}
+ public Map<String, Object> damSafetyHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid) {
+
+ Map<String, Object> map = new HashMap<>();
+ // 只发短信，将发短信信息组装好
+ SmsRequestTemplate smsRequestTemplate
+ = noticeHandle.getSendSmsTemplate(data,alarmRule,alarmRuleDetail,columnList ,flag,adCode,uuid,isSendStation);
+ // 拼接后面内容
+ if (smsRequestTemplate.getPersonVOList().size() > 0) {
+ for (List<String> list : smsRequestTemplate.getTemplateContent()) {
+ // 保存告警记录信息
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
+ if (null != alarmRecord) {
+ list.add(alarmRecord.getId().toString());
+ }
+ }
+ map = smsService.sendSignMsgMergeCd(smsRequestTemplate);
+ // 调用短信服务
+ return map;
+ }
+ return map;
+
+ }
+
+
+ //渗压资料缺失
public Map<String, Object> damSafetySyDataMissingHandle(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid) {
Map<String, Object> map = new HashMap<>();
--
Gitblit v1.9.3