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 | 281 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 219 insertions(+), 62 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 a8882e5..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
@@ -4,16 +4,20 @@
import cn.gistack.alerts.alarmRule.entity.AlarmRecord;
import cn.gistack.alerts.alarmRule.entity.AlarmRecordDetail;
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;
import cn.gistack.alerts.notice.util.FormatUtil;
+import cn.gistack.alerts.push.service.IPushService;
import cn.gistack.alerts.sms.entity.SmsTemplate;
import cn.gistack.alerts.sms.service.ISmsTemplateService;
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;
@@ -24,10 +28,10 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.alibaba.nacos.shaded.com.google.gson.JsonObject;
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;
@@ -37,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
@@ -64,38 +72,51 @@
@Autowired
private IUserClient userClient;
+ @Autowired
+ private IPushService pushService;
+
+ @Autowired
+ private OutCallClient outCallClient;
+
/**
* 短信发送数据组装
*
- * @param jsonArray
- * @param templateId
- * @param alarmRule
+ * @param jsonArray 告警动态数据
+ * @param alarmRule 告警规则信息
+ * @param alarmRuleDetail 告警规则详情信息
* @param columnsList 列名集合信息
* @param flag 是否包含日期
- * @param adCode 行政区编号
+ * @param adCode 行政区编号(是否过滤区县数据)
* @param uuid 本次执行临时编号
+ * @param isSendStation 是否发送站内信
* @return
*/
public SmsRequestTemplate getSendSmsTemplate(JSONArray jsonArray,
- String templateId,
AlarmRule alarmRule,
+ AlarmRuleDetail alarmRuleDetail,
List<String> columnsList,
Boolean flag,
String adCode,
- String uuid) {
- // 通过模板id 查询模板相关信息
- SmsTemplate smsTemplate = smsTemplateService.getOne(new QueryWrapper<SmsTemplate>().eq("template_id",templateId).eq("is_deleted",0));
+ String uuid,
+ Boolean isSendStation) {
+ // 通过模板id 查询模板相关信息(外呼对应的模板id则为场景id)
+ SmsTemplate smsTemplate
+ = smsTemplateService.getOne(new QueryWrapper<SmsTemplate>().eq("id",alarmRuleDetail.getTemplateId()).eq("is_deleted",0));
if (null != smsTemplate) {
+ // 创建消息发送对象
SmsRequestTemplate smsRequestTemplate = new SmsRequestTemplate();
+ // 设置是否发送站内信
+ smsRequestTemplate.setIsSendStation(isSendStation);
+ // 设置告警信息
smsRequestTemplate.setAlarmRule(alarmRule);
// 设置模板信息
smsRequestTemplate.setSmsTemplate(smsTemplate);
// 解析模板并设置 title
smsRequestTemplate.setTitle(FormatUtil.composeMessage(smsTemplate.getContent()));
// 列名数据转换
- getColumnData(jsonArray, columnsList,smsRequestTemplate,alarmRule,flag,adCode,uuid);
+ getColumnData(jsonArray, columnsList,smsRequestTemplate,alarmRuleDetail,flag,adCode,uuid);
//返回
return smsRequestTemplate;
}
@@ -104,22 +125,25 @@
/**
* 列名数据转换
- * @param jsonArray
- * @param columnsList
- * @param smsRequestTemplate
- * @param flag
- * @param adCode
- * @param uuid
+ * @param jsonArray 告警动态数据
+ * @param columnsList 告警动态内容 key
+ * @param smsRequestTemplate 消息发送对象
+ * @param alarmRuleDetail 告警人员角色ids
+ * @param flag 告警内容是否日期
+ * @param adCode 行政区 code ，用于过滤数据
+ * @param uuid 用于过滤数据
* @return
*/
private void getColumnData(JSONArray jsonArray,
List<String> columnsList,
SmsRequestTemplate smsRequestTemplate,
- AlarmRule alarmRule,
+ AlarmRuleDetail alarmRuleDetail,
Boolean flag,
String adCode,
String uuid) {
+ // 告警人员
List<PersonVO> personLists = new ArrayList<>();
+ // 告警内容
List<List<String>> lists = new ArrayList<>();
Set<String> set = new HashSet<>();
for (int i = 0; i < jsonArray.size(); i++) {
@@ -127,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, alarmRule, flag, personLists, lists, i,uuid,set);
+ jointData(jsonArray, columnsList, alarmRuleDetail, flag, personLists, lists, i,uuid,set);
}
}else {
- jointData(jsonArray, columnsList, alarmRule, flag, personLists, lists, i,uuid,set);
+ jointData(jsonArray, columnsList, alarmRuleDetail, flag, personLists, lists, i,uuid,set);
}
}
// 设置信息
@@ -140,18 +164,18 @@
/**
* 拼接列数据设置告警人员信息
- * @param jsonArray
- * @param columnsList
- * @param alarmRule
- * @param flag
- * @param personLists
- * @param lists
- * @param i
+ * @param jsonArray 告警动态数据
+ * @param columnsList 告警动态内容 key
+ * @param alarmRuleDetail 告警人角色ids
+ * @param flag 告警内容是否日期
+ * @param personLists 告警人
+ * @param lists 告警内容
+ * @param i 第几个
* @return
*/
private void jointData(JSONArray jsonArray,
List<String> columnsList,
- AlarmRule alarmRule,
+ AlarmRuleDetail alarmRuleDetail,
Boolean flag,
List<PersonVO> personLists,
List<List<String>> lists,
@@ -166,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 = "";
@@ -181,19 +208,19 @@
flag = false;
}
// 获取告警人员信息
- getAlarmPersonList(jsonArray, columnsList, alarmRule, flag, personLists, lists, i, res_cd, day, hour, minute, stcd);
+ getAlarmPersonList(jsonArray, columnsList, alarmRuleDetail, flag, personLists, lists, i, res_cd, day, hour, minute, stcd);
}
}
/**
* 获取告警人员信息
- * @param jsonArray
- * @param columnsList
- * @param alarmRule
- * @param flag
- * @param personLists
- * @param lists
- * @param i
+ * @param jsonArray 接口水库相关数据
+ * @param columnsList 模板对应列key
+ * @param alarmRuleDetail 告警人员角色ids
+ * @param flag 模板中是否填入时间
+ * @param personLists 告警人员集合
+ * @param lists 告警内容集合
+ * @param i 第 i 个水库
* @param res_cd 水库编码
* @param day 日期
* @param hour 小时
@@ -202,7 +229,7 @@
*/
private void getAlarmPersonList(JSONArray jsonArray,
List<String> columnsList,
- AlarmRule alarmRule,
+ AlarmRuleDetail alarmRuleDetail,
Boolean flag,
List<PersonVO> personLists,
List<List<String>> lists,
@@ -213,7 +240,7 @@
String minute,
String stcd) {
// 查询告警人员信息
- List<PersonVO> personVOList = getPersonListByResGuid(res_cd, alarmRule);
+ List<PersonVO> personVOList = getPersonListByResGuid(res_cd, alarmRuleDetail.getAlarmPerson());
if (personVOList.size() > 0) {
for (PersonVO personVO : personVOList) {
List<String> list = new ArrayList<>();
@@ -221,34 +248,102 @@
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) {
String[] split = column.split(",");
String format = "";
- for (String s : split) {
- if (s.equals("over_z")) {
- String is_danger_res = "is_danger_res";
- if (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")){
- format = format + "超过汛限水位" + jsonArray.getJSONObject(i).getString(s);
- }else {
- format = format + jsonArray.getJSONObject(i).getString(s);
- }
- }else {
- format = format + jsonArray.getJSONObject(i).getString(s);
- }
- }
+ // 内容处理
+ format = addAlarmContent(jsonArray, i, split, format);
+ // 加入集合
list.add(format);
}
lists.add(list);
}
}
personLists.addAll(personVOList);
+ }
+
+ /**
+ * 告警内容拼接处理
+ * @param jsonArray 数据
+ * @param i 第几个
+ * @param split key 值
+ * @param format 值结果
+ * @return
+ */
+ private String addAlarmContent(JSONArray jsonArray, int i,String[] split, String format) {
+ for (String s : split) {
+ // 超汛限水位
+ if (s.equals("over_z")) {
+ String is_danger_res = "is_danger_res";
+ 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 (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);
+ }
+ } else if (s.equals("rz")) {
+ // 水位
+ String rz = "rz";
+ if (null==jsonArray.getJSONObject(i).getString(rz)) {
+ format = format + "无数据";
+ } else {
+ format = format + jsonArray.getJSONObject(i).getString(s) + "米";
+ }
+ } else if (s.equals("alarm_val")) {
+ // 小时雨量
+ String alarm_type = "alarm_type";
+ if (null!=jsonArray.getJSONObject(i).getString(alarm_type) && !jsonArray.getJSONObject(i).getString(alarm_type).equals("")) {
+ format = format + jsonArray.getJSONObject(i).getString(alarm_type) + "小时坝前点雨量" + jsonArray.getJSONObject(i).getString(s);
+ }else {
+ format = format + jsonArray.getJSONObject(i).getString(s);
+ }
+ } else if (s.equals("diff_dam")) {
+ String over_chec_fl_stag = "over_chec_fl_stag";
+ // 如果是超校核的需要判断超值
+ if (null!=jsonArray.getJSONObject(i).getString(over_chec_fl_stag) && !jsonArray.getJSONObject(i).getString(over_chec_fl_stag).equals("")) {
+ // 校核，是否漫过坝顶（正数代表未漫过坝顶，负数则反之）
+ String diff_dam = jsonArray.getJSONObject(i).getString(s);
+ double parseDouble = Double.parseDouble(diff_dam);
+ if (parseDouble>0) {
+ format = format + "距离大坝坝顶仅" + jsonArray.getJSONObject(i).getString(s);
+ }else {
+ 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 {
+ format = format + jsonArray.getJSONObject(i).getString(s);
+ }
+ }
+ // 返回
+ return format;
}
/**
@@ -292,12 +387,12 @@
/**
* 查询告警人员信息
* @param res_cd 水库 guid
- * @param alarmRule
+ * @param roleIds 角色ids
* @return
*/
- private List<PersonVO> getPersonListByResGuid(String res_cd,AlarmRule alarmRule) {
+ private List<PersonVO> getPersonListByResGuid(String res_cd,String roleIds) {
// 查询对应的角色信息
- List<String> roles = sysClient.getRoleNames(alarmRule.getAlarmPerson()).getData();
+ List<String> roles = sysClient.getRoleNames(roleIds).getData();
List<String> personList = new ArrayList<>();
List<String> areaList = new ArrayList<>();
// 遍历
@@ -328,8 +423,9 @@
/**
* 依次添加巡查责任人，技术责任人信息
* @param list
+ * @param isPhone 是否保护电话
*/
- public void addPatrolTechnologyInfo(List<String> list) {
+ public void addPatrolTechnologyInfo(List<String> list,Boolean isPhone) {
// 查询巡查责任人姓名，技术责任人姓名信息
List<PersonVO> personVOList = attResManagePersonClient.getPersonListByResGuid(list.get(1),"4,5");
if (personVOList.size()>0) {
@@ -337,10 +433,10 @@
String jszrr = "-";
for (PersonVO personVO : personVOList) {
if (personVO.getType().equals("5")) {
- xczrr = personVO.getName();
+ xczrr = isPhone?personVO.getName()+":"+personVO.getPhone() : personVO.getName();
}
if (personVO.getType().equals("4")) {
- jszrr = personVO.getName();
+ jszrr = isPhone?personVO.getName()+":"+personVO.getPhone() : personVO.getName();
}
}
// 巡查责任人姓名
@@ -354,7 +450,6 @@
list.add("-");
}
}
-
/**
* 拼接市县水利部人员姓名及联系方式
@@ -436,6 +531,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();
@@ -534,8 +632,17 @@
for (MessageRecord messageRecord : messageRecordList) {
// 通过手机号获取用户id信息
R<List<User>> listR = userClient.userInfoByPhone("000000", messageRecord.getRecipient());
- messageRecord.setRecipient(listR.getData().get(0).getId().toString());
+ if (listR.getData().size()>0) {
+ messageRecord.setRecipient(listR.getData().get(0).getId().toString());
+ }
}
+
+// List<MessageRecord> messageRecordList1 = new ArrayList<>();
+// addSendMsgTest(messageRecordList1);
+ //给app推送消息
+// pushService.pushMessageList(messageRecordList1);
+ pushService.pushMessageList(messageRecordList);
+
// 保存记录
messageClient.saveMessageRecord(messageRecordList);
// 发起通知
@@ -548,4 +655,54 @@
SSEServer.sendMessage("web:"+messageRecord.getRecipient(),new JSONObject(map).toJSONString());
}
}
+
+
+ /**
+ * 新增测试信息
+ * @param messageRecordList
+ */
+ private void addSendMsgTest(List<MessageRecord> messageRecordList) {
+ MessageRecord messageRecord = new MessageRecord();
+ messageRecord.setRecipient("1654164141753593858");
+ messageRecord.setContent("cs12121212==========");
+ messageRecord.setTheme("接近超汛告警");
+ messageRecord.setSender(AuthUtil.getUserId().toString());
+ messageRecord.setSource("智能告警");
+ messageRecord.setStatus(0);
+ // 加入集合
+ 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