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/NoticeHandle.java | 105 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 87 insertions(+), 18 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java
index bfc6b9c..b47f33c 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java
@@ -6,6 +6,7 @@
import cn.gistack.alerts.alarmRule.entity.AlarmRule;
import cn.gistack.alerts.alarmRule.entity.AlarmRuleDetail;
import cn.gistack.alerts.alarmRule.service.AlarmRecordService;
+import cn.gistack.alerts.notice.constant.ZnwhColumnConstant;
import cn.gistack.alerts.notice.constant.ZtApiUrlConstant;
import cn.gistack.alerts.notice.constant.ZtConfigConstant;
import cn.gistack.alerts.notice.enums.PersonEnum;
@@ -16,6 +17,7 @@
import cn.gistack.alerts.sms.vo.SmsRequestTemplate;
import cn.gistack.alerts.sse.server.SSEServer;
import cn.gistack.common.utils.SpringContextUtil;
+import cn.gistack.sm.intelligentCall.feign.OutCallClient;
import cn.gistack.sm.message.entity.MessageRecord;
import cn.gistack.sm.message.feign.IMessageClient;
import cn.gistack.sm.sjztmd.feign.IAttResManagePersonClient;
@@ -29,6 +31,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
@@ -38,6 +41,10 @@
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.*;
@Component
@@ -68,6 +75,9 @@
@Autowired
private IPushService pushService;
+ @Autowired
+ private OutCallClient outCallClient;
+
/**
@@ -91,7 +101,7 @@
String adCode,
String uuid,
Boolean isSendStation) {
- // 通过模板id 查询模板相关信息
+ // 通过模板id 查询模板相关信息(外呼对应的模板id则为场景id)
SmsTemplate smsTemplate
= smsTemplateService.getOne(new QueryWrapper<SmsTemplate>().eq("id",alarmRuleDetail.getTemplateId()).eq("is_deleted",0));
if (null != smsTemplate) {
@@ -106,7 +116,7 @@
// 解析模板并设置 title
smsRequestTemplate.setTitle(FormatUtil.composeMessage(smsTemplate.getContent()));
// 列名数据转换
- getColumnData(jsonArray, columnsList,smsRequestTemplate,alarmRuleDetail.getAlarmPerson(),flag,adCode,uuid);
+ getColumnData(jsonArray, columnsList,smsRequestTemplate,alarmRuleDetail,flag,adCode,uuid);
//返回
return smsRequestTemplate;
}
@@ -118,7 +128,7 @@
* @param jsonArray 告警动态数据
* @param columnsList 告警动态内容 key
* @param smsRequestTemplate 消息发送对象
- * @param roleIds 告警人员角色ids
+ * @param alarmRuleDetail 告警人员角色ids
* @param flag 告警内容是否日期
* @param adCode 行政区 code ，用于过滤数据
* @param uuid 用于过滤数据
@@ -127,7 +137,7 @@
private void getColumnData(JSONArray jsonArray,
List<String> columnsList,
SmsRequestTemplate smsRequestTemplate,
- String roleIds,
+ AlarmRuleDetail alarmRuleDetail,
Boolean flag,
String adCode,
String uuid) {
@@ -141,10 +151,10 @@
// city_cd,county_cd 过滤数据
String county_cd = jsonArray.getJSONObject(i).getString("county_cd");
if (null!= county_cd && county_cd.equals(adCode)) {
- jointData(jsonArray, columnsList, roleIds, flag, personLists, lists, i,uuid,set);
+ jointData(jsonArray, columnsList, alarmRuleDetail, flag, personLists, lists, i,uuid,set);
}
}else {
- jointData(jsonArray, columnsList, roleIds, flag, personLists, lists, i,uuid,set);
+ jointData(jsonArray, columnsList, alarmRuleDetail, flag, personLists, lists, i,uuid,set);
}
}
// 设置信息
@@ -156,7 +166,7 @@
* 拼接列数据设置告警人员信息
* @param jsonArray 告警动态数据
* @param columnsList 告警动态内容 key
- * @param roleIds 告警人角色ids
+ * @param alarmRuleDetail 告警人角色ids
* @param flag 告警内容是否日期
* @param personLists 告警人
* @param lists 告警内容
@@ -165,7 +175,7 @@
*/
private void jointData(JSONArray jsonArray,
List<String> columnsList,
- String roleIds,
+ AlarmRuleDetail alarmRuleDetail,
Boolean flag,
List<PersonVO> personLists,
List<List<String>> lists,
@@ -180,6 +190,9 @@
set.add(tempStr);
// 取出测站编码
String stcd = jsonArray.getJSONObject(i).getString("stcd");
+ if (StringUtil.isBlank(stcd)) {
+ stcd = jsonArray.getJSONObject(i).getString("cd");
+ }
// 判断时间是否存在
String tm = jsonArray.getJSONObject(i).getString("tm");
String day = "";
@@ -195,7 +208,7 @@
flag = false;
}
// 获取告警人员信息
- getAlarmPersonList(jsonArray, columnsList, roleIds, flag, personLists, lists, i, res_cd, day, hour, minute, stcd);
+ getAlarmPersonList(jsonArray, columnsList, alarmRuleDetail, flag, personLists, lists, i, res_cd, day, hour, minute, stcd);
}
}
@@ -203,7 +216,7 @@
* 获取告警人员信息
* @param jsonArray 接口水库相关数据
* @param columnsList 模板对应列key
- * @param roleIds 告警人员角色ids
+ * @param alarmRuleDetail 告警人员角色ids
* @param flag 模板中是否填入时间
* @param personLists 告警人员集合
* @param lists 告警内容集合
@@ -216,7 +229,7 @@
*/
private void getAlarmPersonList(JSONArray jsonArray,
List<String> columnsList,
- String roleIds,
+ AlarmRuleDetail alarmRuleDetail,
Boolean flag,
List<PersonVO> personLists,
List<List<String>> lists,
@@ -227,7 +240,7 @@
String minute,
String stcd) {
// 查询告警人员信息
- List<PersonVO> personVOList = getPersonListByResGuid(res_cd, roleIds);
+ List<PersonVO> personVOList = getPersonListByResGuid(res_cd, alarmRuleDetail.getAlarmPerson());
if (personVOList.size() > 0) {
for (PersonVO personVO : personVOList) {
List<String> list = new ArrayList<>();
@@ -235,9 +248,15 @@
list.add(res_cd);
list.add(personVO.getPhone());
if (flag) {
- list.add(day);
- list.add(hour);
- list.add(minute);
+ // 如果是电话告警，需要把日期拼到一起
+ if (alarmRuleDetail.getAlarmMode().equals("电话")){
+ String tem = day + "日" + hour + "时" + minute + "分";
+ list.add(tem);
+ }else {
+ list.add(day);
+ list.add(hour);
+ list.add(minute);
+ }
}
// 变量将值放入集合中
for (String column : columnsList) {
@@ -267,9 +286,9 @@
// 超汛限水位
if (s.equals("over_z")) {
String is_danger_res = "is_danger_res";
- if (jsonArray.getJSONObject(i).getString(is_danger_res).equals("true")) {
+ if (null!= jsonArray.getJSONObject(i).getString(is_danger_res) && jsonArray.getJSONObject(i).getString(is_danger_res).equals("true")) {
format = format + "控制运用水位" + jsonArray.getJSONObject(i).getString(s);
- } else if (jsonArray.getJSONObject(i).getString(is_danger_res).equals("false")) {
+ } else if (null!= jsonArray.getJSONObject(i).getString(is_danger_res) && jsonArray.getJSONObject(i).getString(is_danger_res).equals("false")) {
format = format + "汛限水位" + jsonArray.getJSONObject(i).getString(s);
} else {
format = format + jsonArray.getJSONObject(i).getString(s);
@@ -303,6 +322,20 @@
format = format + "已漫过坝顶" + (-parseDouble);
}
}else {
+ format = format + jsonArray.getJSONObject(i).getString(s);
+ }
+ } else if (s.equals("ms_flag")) {
+ // 水位
+ String ms_flag = "ms_flag";
+ if (null!= jsonArray.getJSONObject(i).getString(ms_flag) && jsonArray.getJSONObject(i).getString(ms_flag).equals("sy")) {
+ format = format + "渗压";
+ } else if (null!= jsonArray.getJSONObject(i).getString(ms_flag) && jsonArray.getJSONObject(i).getString(ms_flag).equals("sl")) {
+ format = format + "渗流" ;
+ } else if (null!= jsonArray.getJSONObject(i).getString(ms_flag) && jsonArray.getJSONObject(i).getString(ms_flag).equals("by")) {
+ format = format + "白蚁" ;
+ } else if (null!= jsonArray.getJSONObject(i).getString(ms_flag) && jsonArray.getJSONObject(i).getString(ms_flag).equals("bx")) {
+ format = format + "变形" ;
+ } else {
format = format + jsonArray.getJSONObject(i).getString(s);
}
} else {
@@ -499,6 +532,9 @@
if (activeProfile.equals("prod")){
url = ZtApiUrlConstant.url_prefix_prod + url;
}
+ if (activeProfile.equals("test")){
+ url = ZtApiUrlConstant.url_prefix_test + url;
+ }
//设置请求头
HttpHeaders headers = new HttpHeaders();
headers.add(ZtConfigConstant.header_key, ZtConfigConstant.header_value);
@@ -605,7 +641,7 @@
// addSendMsgTest(messageRecordList1);
//给app推送消息
// pushService.pushMessageList(messageRecordList1);
-// pushService.pushMessageList(messageRecordList);
+ pushService.pushMessageList(messageRecordList);
// 保存记录
messageClient.saveMessageRecord(messageRecordList);
@@ -636,4 +672,37 @@
// 加入集合
messageRecordList.add(messageRecord);
}
+
+ /**
+ * 创建告警外呼任务
+ * @param smsRequestTemplate
+ * @return
+ */
+ public List<String> createOutCallTaskByAlarm(SmsRequestTemplate smsRequestTemplate) {
+ Map<String, Object> map = new HashMap<>();
+ List<Map<String, String>> mapList = new ArrayList<>();
+ // 拼装数据
+ List<String> titles = new ArrayList<>(Arrays.asList(smsRequestTemplate.getTitle().split(",")));
+ // 修改手机号码为被叫号码
+ titles.set(0, "被叫号码");
+ titles.add("告警记录id");
+ titles.add(0,"水库编号");
+ map.put("titles",titles);
+ // 处理人员及预警相关数据并组装
+ for (List<String> list : smsRequestTemplate.getTemplateContent()) {
+ Map<String, String> stringMap = new HashMap<>();
+ for (int i = 0; i < titles.size(); i++) {
+ stringMap.put(titles.get(i),list.get(i));
+ }
+ mapList.add(stringMap);
+ }
+ map.put("list",mapList);
+ map.put("scenesId",smsRequestTemplate.getSmsTemplate().getTemplateId());
+ String taskName = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH:mm:ss")) + smsRequestTemplate.getAlarmRule().getRuleName() + "智能外呼";
+ map.put("taskName",taskName);
+ String taskScheduleTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ map.put("taskScheduleTime",taskScheduleTime);
+ // 创建外呼任务
+ return outCallClient.createOutCallTaskByAlarm(map);
+ }
}
--
Gitblit v1.9.3