From abaf72a337248943e037b02d069c094e2ee5d60b Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 05 Jul 2023 14:46:52 +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/NoticeStrategyImpl.java | 338 ++++++++++----------------------------------------------
1 files changed, 61 insertions(+), 277 deletions(-)
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 f77b057..9eec07a 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
@@ -21,6 +21,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
@@ -32,6 +33,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.UUID;
/**
* 通知策略
@@ -49,218 +51,13 @@
private AlarmRuleService alarmRuleService;
@Autowired
- private AlarmRecordService alarmRecordService;
+ private NoticeHandle noticeHandle;
@Autowired
- private ISmsTemplateService smsTemplateService;
-
- @Autowired
- private RestTemplate restTemplate;
-
- @Autowired
- private IAttResManagePersonClient attResManagePersonClient;
+ private AsyncNoticeHandle asyncNoticeHandle;
- /**
- * 短信发送数据组装
- *
- * @param jsonArray
- * @param templateId
- * @param alarmRule
- * @param columnsList 列名集合信息
- * @param flag 是否包含日期
- * @return
- */
- private SmsRequestTemplate getSendSmsTemplate(JSONArray jsonArray,
- String templateId,
- AlarmRule alarmRule,
- List<String> columnsList,
- Boolean flag) {
- // 通过模板id 查询模板相关信息
- SmsTemplate smsTemplate = smsTemplateService.getOne(new QueryWrapper<SmsTemplate>().eq("template_id",templateId).eq("is_deleted",0));
- if (null != smsTemplate) {
- SmsRequestTemplate smsRequestTemplate = new SmsRequestTemplate();
- // 设置模板信息
- smsRequestTemplate.setSmsTemplate(smsTemplate);
- // 解析模板并设置 title
- smsRequestTemplate.setTitle(FormatUtil.composeMessage(smsTemplate.getContent()));
- // 列名数据转换
- getColumnData(jsonArray, columnsList,smsRequestTemplate,alarmRule,flag);
- //返回
- return smsRequestTemplate;
- }
- return null;
- }
- /**
- * 列名数据转换
- * @param jsonArray
- * @param columnsList
- * @param smsRequestTemplate
- * @param flag
- * @return
- */
- private void getColumnData(JSONArray jsonArray,
- List<String> columnsList,
- SmsRequestTemplate smsRequestTemplate,
- AlarmRule alarmRule,
- Boolean flag) {
- List<PersonVO> personLists = new ArrayList<>();
- List<List<String>> lists = new ArrayList<>();
- for (int i = 0; i < jsonArray.size(); i++) {
- // 根据水库编号，所在区域查询需要发送的人员手机号及设置
- String res_cd = jsonArray.getJSONObject(i).getString("res_cd");
- // 判断时间是否存在
- String tm = jsonArray.getJSONObject(i).getString("tm");
- String day = "";
- String hour = "";
- String minute = "";
- if (null!=tm && !tm.equals("") && flag){
- flag = true;
- // 加入天，时，分
- day = tm.substring(8,10);
- hour = tm.substring(11,13);
- minute = tm.substring(14,16);
- }else {
- flag = false;
- }
- // 查询告警人员信息
- List<PersonVO> personVOList = getPersonListByResGuid(res_cd,alarmRule);
- if (personVOList.size() > 0) {
- for (PersonVO personVO : personVOList) {
- List<String> list = new ArrayList<>();
- list.add(res_cd);
- list.add(personVO.getPhone());
- if (flag) {
- list.add(day);
- list.add(hour);
- list.add(minute);
- }
- // 变量将值放入集合中
- for (String column : columnsList) {
- String[] split = column.split(",");
- String format = "";
- for (String s : split) {
- format = format + jsonArray.getJSONObject(i).getString(s);
- }
- list.add(format);
- }
- lists.add(list);
- }
- }
- personLists.addAll(personVOList);
- }
- // 设置信息
- smsRequestTemplate.setPersonVOList(personLists);
- smsRequestTemplate.setTemplateContent(lists);
- }
-
- /**
- * 保存告警记录信息
- * @param list
- * @param alarmRule 告警规则
- * @return
- */
- private AlarmRecord saveAlarmRecord(List<String> list,AlarmRule alarmRule) {
- AlarmRecord alarmRecord = new AlarmRecord();
- // 设置相关信息
- alarmRecord.setAlarmRuleId(alarmRule.getId().toString());
- alarmRecord.setReservoirNumber(list.get(0));
- alarmRecord.setAlarmCondition(alarmRule.getRuleRemark());
- // 新增
- boolean save = alarmRecordService.save(alarmRecord);
- if (save){
- return alarmRecord;
- }
- // 返回
- return null;
- }
-
- /**
- * 查询告警人员信息
- * @param res_cd 水库 guid
- * @param alarmRule
- * @return
- */
- private List<PersonVO> getPersonListByResGuid(String res_cd,AlarmRule alarmRule) {
- // 查询对应的角色信息
- String roles = alarmRule.getAlarmPerson();
- String[] roleArray = roles.split(",");
- List<String> personList = new ArrayList<>();
- List<String> areaList = new ArrayList<>();
- // 遍历
- for (String role : roleArray) {
- if (role.contains("责任人")){
- personList.add(PersonEnum.findByName(role).getType().toString());
- }else {
- areaList.add(role);
- }
- }
- // 根据角色，水库编号查询对应的告警人员信息
- List<PersonVO> list = new ArrayList<>();
- //1. 根据水库编号查询除责任人之外的人员信息
- if (areaList.size() > 0) {
- List<PersonVO> personVOList = attResManagePersonClient.getUserListByResGuid(res_cd);
- list.addAll(personVOList);
- }
- //2. 根据水库编号及责任人类型查询相关责任人信息
- List<PersonVO> personVOList1 = attResManagePersonClient.getPersonListByResGuid(res_cd,String.join(",",personList));
- // 合并人员数据
- list.addAll(personVOList1);
- // 返回数据
- return list;
- }
-
- /**
- * 依次添加巡查责任人，技术责任人信息
- * @param list
- */
- private void addPatrolTechnologyInfo(List<String> list) {
- // 查询巡查责任人姓名，技术责任人姓名信息
- List<PersonVO> personVOList = attResManagePersonClient.getPersonListByResGuid(list.get(0),"4,5");
- if (personVOList.size()>0) {
- String xczrr = "";
- String jszrr = "";
- for (PersonVO personVO : personVOList) {
- if (personVO.getType().equals("5")) {
- xczrr = personVO.getName();
- }
- if (personVO.getType().equals("4")) {
- jszrr = personVO.getName();
- }
- }
- // 巡查责任人姓名
- list.add(xczrr);
- // 技术责任人姓名
- list.add(jszrr);
- }else {
- // 巡查责任人姓名
- list.add("?");
- // 技术责任人姓名
- list.add("?");
- }
- }
-
-
- /**
- * 拼接市县水利部人员姓名及联系方式
- * @param list
- */
- private void addCityCountyBusinessPersonInfo(List<String> list) {
- // 根据水库编号查询市县水利部人员姓名及联系方式
- List<PersonVO> personVOList = attResManagePersonClient.getCityCountyPersonListByResGuid(list.get(0));
- if (personVOList.size()>0){
- // 如果没有找到人员？
- StringBuilder builder = new StringBuilder();
- for (PersonVO personVO : personVOList) {
- builder.append(personVO.getName()).append(":").append(personVO.getPhone()).append(",");
- }
- // 拼接水利部人员信息
- list.add(builder.substring(0,builder.length()-1));
- }else {
- list.add("?");
- }
- }
/**
* 默认实现
@@ -282,20 +79,20 @@
* @return
*/
public String waterInfoNotHandle(String arg1, String arg2) {
+ String templateId = "2431012216668";
+ String uuid = templateId + UUID.randomUUID().toString();
// 查询当前策略对应的告警规则信息
AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
if (null!=alarmRule) {
// 调用中台服务接口查询数据
- JSONArray ztData = getZtData("", ZtApiUrlConstant.res_z_null_api);
+ JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.res_z_null_api);
// 只发短信，将发短信信息组装好
- SmsRequestTemplate smsRequestTemplate = getSendSmsTemplate(ztData, "2431012216668",alarmRule, ZtApiDataColumnConstant.waterInfoNotList,false);
+ SmsRequestTemplate smsRequestTemplate = noticeHandle.getSendSmsTemplate(ztData, templateId,alarmRule, ZtApiDataColumnConstant.waterInfoNotList,false,null);
// 拼接内容后面的联系方式,当前模板拼接平台服务电话
// 遍历，拼接平台服务电话
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
- // 添加平台电话
- list.add(PtInfoConstant.serverPhone);
// 保存告警记录信息
- AlarmRecord alarmRecord = saveAlarmRecord(list,alarmRule);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list,alarmRule,uuid);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
@@ -315,18 +112,20 @@
* @return
*/
public String waterDataExcHandle(String arg1, String arg2) {
+ String templateId = "2431012248591";
+ String uuid = templateId + UUID.randomUUID().toString();
// 查询当前策略对应的告警规则信息
AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
if (null!=alarmRule) {
// 调用中台服务接口查询数据
- JSONArray ztData = getZtData("", ZtApiUrlConstant.res_z_not_normal_api);
+ JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.res_z_not_normal_api);
// 只发短信，将发短信信息组装好
SmsRequestTemplate smsRequestTemplate
- = getSendSmsTemplate(ztData, "2431012248591",alarmRule, ZtApiDataColumnConstant.waterDataExcList,false);
+ = noticeHandle.getSendSmsTemplate(ztData, templateId,alarmRule, ZtApiDataColumnConstant.waterDataExcList,false,null);
// 拼接后面内容
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
// 保存告警记录信息
- AlarmRecord alarmRecord = saveAlarmRecord(list,alarmRule);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list,alarmRule,uuid);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
@@ -346,32 +145,36 @@
* @return
*/
public String waterLessDeadHandle(String arg1, String arg2) {
+ String templateId = "2431012248594";
+ String uuid = templateId + UUID.randomUUID().toString();
// 查询当前策略对应的告警规则信息
AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
if (null!=alarmRule) {
// 调用中台服务接口查询数据
- JSONArray ztData = getZtData("", ZtApiUrlConstant.res_diff_dead_z_api);
+ JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.res_diff_dead_z_api);
// 只发短信，将发短信信息组装好
- SmsRequestTemplate smsRequestTemplate = getSendSmsTemplate(ztData, "2431012248594",alarmRule, ZtApiDataColumnConstant.waterLessDeadList,true);
+ SmsRequestTemplate smsRequestTemplate = noticeHandle.getSendSmsTemplate(ztData, templateId,alarmRule, ZtApiDataColumnConstant.waterLessDeadList,true,null);
// 拼接内容后面的联系方式,当前模板县水利部人员姓名电话
// 遍历，拼接县水利部人员电话
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
// 查询县水利部人员（通过水库编号）
// list.add("测试:13112341234");
// 保存告警记录信息
- AlarmRecord alarmRecord = saveAlarmRecord(list,alarmRule);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list,alarmRule,uuid);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
}
}
// 调用短信服务
- Map<String,Object> map = smsService.sendSignMsg(smsRequestTemplate);
+ Map<String, Object> map = smsService.sendSignMsg(smsRequestTemplate);
// 返回
return "本次-水位初次超汛限告警短信成功通知数量：" + map.get("smsRecord");
}
// 返回
return "水位超低于死水位";
}
+
+
/**
* 策略4: 水位高于死水位，低于旱警水位
@@ -393,22 +196,24 @@
* @return
*/
public String waterComeOverHandle(String arg1, String arg2) {
+ String templateId = "znxsw10000001";
+ String uuid = templateId + UUID.randomUUID().toString();
// 查询当前策略对应的告警规则信息
AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
if (null!=alarmRule) {
// 调用中台服务接口查询数据
- JSONArray ztData = getZtData("", ZtApiUrlConstant.res_diff_dead_z_api);
+ JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.res_diff_dead_z_api);
// 只发送站内信
- SmsRequestTemplate smsRequestTemplate = getSendSmsTemplate(ztData, "znxsw10000001",alarmRule, ZtApiDataColumnConstant.waterLessDeadList,true);
+ SmsRequestTemplate smsRequestTemplate = noticeHandle.getSendSmsTemplate(ztData, templateId,alarmRule, ZtApiDataColumnConstant.waterLessDeadList,true,null);
// 拼接内容后面的联系方式,当前模板县水利部人员姓名电话
// 遍历，拼接县水利部人员电话
for (List<String> list : smsRequestTemplate.getTemplateContent()) {
// 后面依次拼接 巡查责任人姓名，技术责任人姓名，市县水利部门人员姓名电话（暂时不要）
- addPatrolTechnologyInfo(list);
+ noticeHandle.addPatrolTechnologyInfo(list);
// 市县水利部门人员姓名电话（暂时不要）
// list.add("测试:13112341234");
// 保存告警记录信息
- AlarmRecord alarmRecord = saveAlarmRecord(list,alarmRule);
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list,alarmRule,uuid);
if (null != alarmRecord) {
list.add(alarmRecord.getId().toString());
// list.add("999");
@@ -430,31 +235,36 @@
* @return
*/
public String waterFirstOverHandle(String arg1, String arg2) {
+ String adCode = "421303000000";
+ String templateId = "2431012216671";
+ String uuid = templateId + UUID.randomUUID().toString();
// 查询当前策略对应的告警规则信息
AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
if (null!=alarmRule) {
// 调用中台服务接口查询数据
- JSONArray ztData = getZtData("", ZtApiUrlConstant.over_z_res_api);
+ JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.over_z_res_api);
// 只发短信，将发短信信息组装好
SmsRequestTemplate smsRequestTemplate
- = getSendSmsTemplate(ztData, "2431012216671",alarmRule, ZtApiDataColumnConstant.waterFirstOverList,true);
+ = noticeHandle.getSendSmsTemplate(ztData, templateId,alarmRule, ZtApiDataColumnConstant.waterFirstOverList,true,adCode);
// 拼接后面内容
- for (List<String> list : smsRequestTemplate.getTemplateContent()) {
- // 依次拼接巡查责任人，技术责任人姓名
- addPatrolTechnologyInfo(list);
- // 拼接市县水利部人员姓名及联系方式
- addCityCountyBusinessPersonInfo(list);
- // 保存告警记录信息
- AlarmRecord alarmRecord = saveAlarmRecord(list,alarmRule);
- if (null != alarmRecord) {
- list.add(alarmRecord.getId().toString());
-// list.add("999");
+ if (smsRequestTemplate.getPersonVOList().size()>0) {
+ for (List<String> list : smsRequestTemplate.getTemplateContent()) {
+ // 依次拼接巡查责任人，技术责任人姓名
+ noticeHandle.addPatrolTechnologyInfo(list);
+ // 拼接市县水利部人员姓名及联系方式
+ noticeHandle.addCityCountyBusinessPersonInfo(list);
+ // 保存告警记录信息
+ AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list,alarmRule,uuid);
+ if (null != alarmRecord) {
+ list.add(alarmRecord.getId().toString());
+// list.add("999");
+ }
}
+ // 调用短信服务
+ Map<String, Object> map = smsService.sendSignMsg(smsRequestTemplate);
+ // 返回
+ return "本次-水位初次超汛限告警短信成功通知数量：" + map.get("smsRecord");
}
- // 调用短信服务
- Map<String, Object> map = smsService.sendSignMsg(smsRequestTemplate);
- // 返回
- return "本次-水位初次超汛限告警短信成功通知数量：" + map.get("smsRecord");
}
// 返回
return "水位初次超汛限告警";
@@ -505,8 +315,18 @@
* @return
*/
public String waterMoreDesignHandle(String arg1, String arg2) {
- // 业务逻辑处理 2...
- return "";
+ String templateId = "2431012248604";
+ String uuid = templateId + UUID.randomUUID().toString();
+ // 查询当前策略对应的告警规则信息
+ AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
+ if (null!=alarmRule) {
+ // 异步处理，暂时解决超时重置问题
+ Map<String, Object> map = asyncNoticeHandle.handleAlarmInfo(templateId, uuid, alarmRule);
+ // 返回
+ return "水位超设计洪水位告警";
+ }
+ // 返回
+ return "水位超设计洪水位告警";
}
/**
@@ -605,40 +425,4 @@
return "";
}
- /**
- * 调用中台接口查询数据
- *
- * @param params
- * @param url
- * @return
- */
- private JSONArray getZtData(String params, String url) {
- // 获取环境
- String activeProfile = SpringContextUtil.getActiveProfile();
- if (activeProfile.equals("dev")){
- url = ZtApiUrlConstant.url_prefix_dev + url;
- }
- if (activeProfile.equals("prod")){
- url = ZtApiUrlConstant.url_prefix_prod + url;
- }
- //设置请求头
- HttpHeaders headers = new HttpHeaders();
- headers.add(ZtConfigConstant.header_key, ZtConfigConstant.header_value);
- //封装请求头
- HttpEntity<MultiValueMap<String, Object>> formEntity = new HttpEntity<MultiValueMap<String, Object>>(headers);
- try {
- //有请求头，有参数请求
- ResponseEntity<String> responseEntity =
- restTemplate.exchange(url + params,
- HttpMethod.GET,
- formEntity,
- String.class);
- JSONObject jsonObject = JSON.parseObject(responseEntity.getBody());
- // 返回
- return JSONArray.parseArray(jsonObject.get("data").toString());
- } catch (Exception e) {
- e.printStackTrace();
- }
- return null;
- }
}
--
Gitblit v1.9.3