From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +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 | 49 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 42 insertions(+), 7 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 708157e..d19c267 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
@@ -176,7 +176,6 @@
// 只发短信，将发短信信息组装好
SmsRequestTemplate smsRequestTemplate
= noticeHandle.getSendSmsTemplate(ztData,alarmRule,alarmRuleDetail,columnList ,flag,adCode,uuid,isSendStation);
-
// 拼接后面内容
if (smsRequestTemplate.getPersonVOList().size()>0) {
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
@@ -427,8 +426,7 @@
}
/**
- * 策略9.1: 水位接近设计洪水位告警-电话
- *
+ * 外呼告警信息
* @param alarmRule 告警规则信息
* @param alarmRuleDetail 告警规则详情信息
* @param ztData 告警数据
@@ -439,7 +437,7 @@
* @return
*/
@Async
- public Map<String, Object> waterComeDesignHandleCall(AlarmRule alarmRule,
+ public Map<String, Object> outCallHandleCall(AlarmRule alarmRule,
AlarmRuleDetail alarmRuleDetail,
JSONArray ztData,
List<String> columnList,
@@ -888,7 +886,6 @@
Boolean isSendStation,
String uuid) {
Map<String, Object> map = new HashMap<>();
-// String uuid = alarmRuleDetail.getTemplateId() + UUID.randomUUID().toString();
// 只发短信，将发短信信息组装好
SmsRequestTemplate smsRequestTemplate
= noticeHandle.getSendSmsTemplate(ztData,alarmRule,alarmRuleDetail,columnList ,flag,adCode,uuid,isSendStation);
@@ -934,7 +931,6 @@
Boolean isSendStation,
String uuid) {
Map<String, Object> map = new HashMap<>();
-// String uuid = alarmRuleDetail.getTemplateId() + UUID.randomUUID().toString();
// 只发短信，将发短信信息组装好
SmsRequestTemplate smsRequestTemplate
= noticeHandle.getSendSmsTemplate(ztData,alarmRule,alarmRuleDetail,columnList ,flag,adCode,uuid,isSendStation);
@@ -956,5 +952,44 @@
return map;
}
-
+ /**
+ * 策略19: 大坝安全监测告警-短信
+ *
+ * @param alarmRule 告警规则信息
+ * @param alarmRuleDetail 告警规则详情信息
+ * @param ztData 告警数据
+ * @param columnList 告警模板动态内容key
+ * @param flag 是否包含日期
+ * @param adCode 行政区code用户过滤数据
+ * @param isSendStation 是否发送站内信
+ * @return
+ */
+ @Async
+ public Map<String, Object> damSafetyHandle(AlarmRule alarmRule,
+ AlarmRuleDetail alarmRuleDetail,
+ JSONArray ztData,
+ List<String> columnList,
+ Boolean flag,
+ String adCode,
+ Boolean isSendStation,
+ String uuid) {
+ Map<String, Object> map = new HashMap<>();
+ // 只发短信，将发短信信息组装好
+ SmsRequestTemplate smsRequestTemplate
+ = noticeHandle.getSendSmsTemplate(ztData,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.sendSignMsg(smsRequestTemplate);
+ // 调用短信服务
+ return map;
+ }
+ return map;
+ }
}
--
Gitblit v1.9.3