From c8b03d3da4e29fc3fb9a42ca157738256c331a00 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 13 Mar 2024 13:55:08 +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 | 75 +++++++++++++++++++++++++++++++++----
1 files changed, 67 insertions(+), 8 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 d5f574f..c632fb5 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
@@ -8,6 +8,7 @@
import cn.gistack.alerts.notice.enums.DangerEnum;
import cn.gistack.alerts.sms.service.SmsService;
import cn.gistack.alerts.sms.vo.SmsRequestTemplate;
+import cn.gistack.sm.intelligentCall.feign.OutCallClient;
import com.alibaba.fastjson.JSONArray;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
@@ -175,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()) {
@@ -426,8 +426,7 @@
}
/**
- * 策略9.1: 水位接近设计洪水位告警-电话
- *
+ * 外呼告警信息
* @param alarmRule 告警规则信息
* @param alarmRuleDetail 告警规则详情信息
* @param ztData 告警数据
@@ -438,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,
@@ -447,7 +446,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);
@@ -462,7 +460,8 @@
list.add(alarmRecord.getId().toString());
}
}
- map = smsService.sendSignMsg(smsRequestTemplate);
+ List<String> list = noticeHandle.createOutCallTaskByAlarm(smsRequestTemplate);
+ map.put("list",list);
// 调用短信服务
return map;
}
@@ -887,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);
@@ -933,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);
@@ -955,5 +952,67 @@
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;
+ }
+ public void damSafetySyHandle(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray ztData, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid) {
+ // 只发短信，将发短信信息组装好
+ SmsRequestTemplate smsRequestTemplate
+ = noticeHandle.getSendSmsTemplate(ztData,alarmRule,alarmRuleDetail,columnList ,flag,adCode,uuid,isSendStation);
+ // 拼接内容后面的联系方式,当前模板县水利部人员姓名电话
+ if (smsRequestTemplate.getPersonVOList().size()>0) {
+ // 遍历，拼接县水利部人员电话 拼接发送的模板内容
+ for (List<String> list : smsRequestTemplate.getTemplateContent()) {
+ // 后面依次拼接 巡查责任人姓名，技术责任人姓名，
+// noticeHandle.addPatrolTechnologyInfo(list,false);
+ // 拼接市县水利部人员姓名及联系方式
+// noticeHandle.addCityCountyBusinessPersonInfo(list);
+ // 保存告警记录信息
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list,alarmRule,uuid);
+ if (null != alarmRecord) {
+ list.add(alarmRecord.getId().toString());
+ }
+ }
+ // 保存站内信记录信息
+ noticeHandle.saveInStationInfo(smsRequestTemplate,alarmRule);
+ }
+ }
}
--
Gitblit v1.9.3