From 0efd88e08bfb1cc911fa41319f10853d84ee444e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 01 Aug 2023 17:15:34 +0800
Subject: [PATCH] 告警智能外呼提取，全部放开
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java | 34 +++++++++++++++++-----------------
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java | 6 ++----
2 files changed, 19 insertions(+), 21 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..57ac1fd 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,
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 41492ed..70b988c 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
@@ -305,15 +305,15 @@
if (alarmRuleDetailList.size()>0){
// 遍历
for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
-// if (alarmRuleDetail.getAlarmMode().equals("短信")) {
-// asyncNoticeHandle.waterComeDesignHandleBySms(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterComeDesignList1,true, adCode, false,uuid);
-// }
- if (alarmRuleDetail.getAlarmMode().equals("电话")) {
- asyncNoticeHandle.waterComeDesignHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterComeDesignList2,true, adCode, false,uuid);
+ if (alarmRuleDetail.getAlarmMode().equals("短信")) {
+ asyncNoticeHandle.waterComeDesignHandleBySms(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterComeDesignList1,true, adCode, false,uuid);
}
-// if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
-// asyncNoticeHandle.waterComeDesignHandleStation(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterComeDesignList3,true, adCode, true,uuid);
-// }
+ if (alarmRuleDetail.getAlarmMode().equals("电话")) {
+ asyncNoticeHandle.outCallHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterComeDesignList2,true, adCode, false,uuid);
+ }
+ if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
+ asyncNoticeHandle.waterComeDesignHandleStation(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterComeDesignList3,true, adCode, true,uuid);
+ }
}
}
}
@@ -344,9 +344,9 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.waterMoreDesignHandle(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterMoreDesignList,true, adCode, false,uuid);
}
-// if (alarmRuleDetail.getAlarmMode().equals("电话")) {
-// asyncNoticeHandle.waterMoreDesignHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterMoreDesignList,true, adCode, false,uuid);
-// }
+ if (alarmRuleDetail.getAlarmMode().equals("电话")) {
+ asyncNoticeHandle.outCallHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterMoreDesignList,true, adCode, false,uuid);
+ }
}
}
}
@@ -378,9 +378,9 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.waterMoreCheckHandle(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterMoreCheckList,true, adCode, false,uuid);
}
-// if (alarmRuleDetail.getAlarmMode().equals("电话")) {
-// asyncNoticeHandle.waterMoreCheckHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterMoreCheckList,true, adCode, false,uuid);
-// }
+ if (alarmRuleDetail.getAlarmMode().equals("电话")) {
+ asyncNoticeHandle.outCallHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterMoreCheckList,true, adCode, false,uuid);
+ }
}
}
}
@@ -561,9 +561,9 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.sixHourRainHandle(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.sixHourRainList,true, adCode, false,uuid);
}
-// if (alarmRuleDetail.getAlarmMode().equals("电话")) {
-// asyncNoticeHandle.sixHourRainHandleByCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.sixHourRainList,true, adCode, false,uuid);
-// }
+ if (alarmRuleDetail.getAlarmMode().equals("电话")) {
+ asyncNoticeHandle.outCallHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.sixHourRainList,true, adCode, false,uuid);
+ }
}
}
}
--
Gitblit v1.9.3