From 13a2488a1c825da7e2404f5f1036a42b6c44c849 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Mon, 02 Sep 2024 18:04:09 +0800
Subject: [PATCH] 告警合并发送调整
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java | 128 +++++++++++++++++++++++++++++-------------
1 files changed, 89 insertions(+), 39 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java
index 14ee9e2..6305225 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java
@@ -2,7 +2,6 @@
import cn.com.flaginfo.sdk.cmc.api.result.ComResult;
import cn.com.flaginfo.sdk.cmc.api.sms.dynsend.DynSMSSendDataResult;
-import cn.com.flaginfo.sdk.cmc.api.sms.dynsend.DynSMSSendRequest;
import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendDataResult;
import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendRequest;
import cn.gistack.alerts.alarmRule.entity.AlarmRecordDetail;
@@ -28,25 +27,21 @@
import cn.gistack.alerts.sms.vo.SmsResponseVO;
import cn.gistack.alerts.sms.vo.Temp;
import cn.gistack.sm.intelligentCall.entity.CallNotFillRecord;
-import cn.gistack.sm.intelligentCall.excel.CallExcel;
import cn.gistack.sm.intelligentCall.feign.OutCallClient;
import cn.gistack.sm.message.entity.MessageRecord;
import cn.gistack.sm.sjztmd.feign.IAttResManagePersonClient;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
+import org.apache.logging.log4j.util.Strings;
import org.jetbrains.annotations.NotNull;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
-import java.lang.reflect.Array;
import java.text.SimpleDateFormat;
import java.util.*;
-import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -111,7 +106,7 @@
ComResult<SMSSendDataResult> result = SmsUtils.sendMsg(request);
if(null != smsResult) {
// 保存记录
- saveSendRecord(request, result.getCode().toString(), result.getMsg(), smsResult.getId());
+ saveSendRecord(request, result.getCode().toString(), result.getMsg(), smsResult.getId(),null,null);
}
list.add(result);
}
@@ -209,39 +204,72 @@
@Override
public Map<String, Object> sendSignMsg(SmsRequestTemplate smsRequestTemplate) {
// 取出数据
- SMSSendRequest request = new SMSSendRequest();
SmsTemplate smsTemplate = smsRequestTemplate.getSmsTemplate();
- request.setTemplateId(smsTemplate.getTemplateId());
+ // 合并
+ SmsTemplate smsTemplateMerge = smsRequestTemplate.getSmsTemplateMerge();
+ // 告警内容
List<List<String>> templateContent = smsRequestTemplate.getTemplateContent();
+ // 合并水库告警内容
+ List<List<String>> templateTemplateMergeContent = smsRequestTemplate.getTemplateMergeContent();
+ // 获取告警规则
AlarmRule alarmRule = smsRequestTemplate.getAlarmRule();
// 是否同时发送站内信
Boolean isSendStation = false;
if (null!=smsRequestTemplate.getIsSendStation()){
isSendStation = smsRequestTemplate.getIsSendStation();
}
- // 判断 templateContent 个数，个数超过1000 需要分段发送短信
- List<List<List<String>>> lists = Lists.partition(templateContent, 1000);
- int number = 0;
- for (List<List<String>> list : lists) {
- // 临时保存告警记录用
- List<List<String>> templateList = getAlarmList(list);
- // 批量发送短信
- Map<String, Object> map = batchSendAlertsSms(smsRequestTemplate.getSmsTemplate(), list);
- int count = Integer.parseInt(map.get("errCount").toString());
- ComResult<DynSMSSendDataResult> resultComResult =(ComResult<DynSMSSendDataResult>) map.get("resultComResult");
- // 保存短信结果记录
- SmsResult smsResult = saveSendResult(alarmRule.getId(),resultComResult.getCode().toString(),resultComResult.getMsg(),request, list.size() - count);
- // 保存详情记录（短信详情，告警详情）
- List<SmsRecord> smsRecordList = saveAlertsAndSmsDetail(smsResult,resultComResult,smsRequestTemplate.getSmsTemplate(),
- templateList,request,smsRequestTemplate.getAlarmRule(),isSendStation);
- // number 累加
- number += smsRecordList.size();
- }
- // 设置返回数据
- Map<String, Object> params = new HashMap<>(1);
- params.put("sendNumber",number);
+ Map<String, Object> map = new HashMap<>(2);
+ // 发送消息处理
+ Map<String, Object> params = sendSmsReturnStringObjectMap(smsTemplate, templateContent, alarmRule, isSendStation);
+ // 发送合并水库消息处理
+ Map<String, Object> mergeParams = sendSmsReturnStringObjectMap(smsTemplateMerge, templateTemplateMergeContent, alarmRule, isSendStation);
+ // 合并返回数据
+ map.put("oneMap",params);
+ map.put("moreMap",mergeParams);
// 返回
- return params;
+ return map;
+ }
+
+ /**
+ * 发送消息处理
+ * @param smsTemplate
+ * @param templateContent
+ * @param alarmRule
+ * @param isSendStation
+ * @return
+ */
+ @NotNull
+ private Map<String, Object> sendSmsReturnStringObjectMap(SmsTemplate smsTemplate,
+ List<List<String>> templateContent,
+ AlarmRule alarmRule,
+ Boolean isSendStation) {
+ if (null!=smsTemplate) {
+ // 取出数据
+ SMSSendRequest request = new SMSSendRequest();
+ request.setTemplateId(smsTemplate.getTemplateId());
+ // 判断 templateContent 个数，个数超过1000 需要分段发送短信
+ List<List<List<String>>> lists = Lists.partition(templateContent, 1000);
+ int number = 0;
+ for (List<List<String>> list : lists) {
+ // 临时保存告警记录用
+ List<List<String>> templateList = getAlarmList(list);
+ // 批量发送短信
+ Map<String, Object> map = batchSendAlertsSms(smsTemplate, list);
+ int count = Integer.parseInt(map.get("errCount").toString());
+ ComResult<DynSMSSendDataResult> resultComResult = (ComResult<DynSMSSendDataResult>) map.get("resultComResult");
+ // 保存短信结果记录
+ SmsResult smsResult = saveSendResult(alarmRule.getId(), resultComResult.getCode().toString(), resultComResult.getMsg(), request, list.size() - count);
+ // 保存详情记录（短信详情，告警详情）
+ List<SmsRecord> smsRecordList = saveAlertsAndSmsDetail(smsResult, resultComResult, smsTemplate,
+ templateList, request, alarmRule, isSendStation);
+ // number 累加
+ number += smsRecordList.size();
+ }
+ // 设置返回数据
+ Map<String, Object> params = new HashMap<>(1);
+ params.put("sendNumber", number);
+ }
+ return null;
}
/**
@@ -291,6 +319,8 @@
messageRecord.setSender(AuthUtil.getUserId().toString());
messageRecord.setSource("智能告警");
messageRecord.setStatus(0);
+ messageRecord.setTemplateId(smsTemplate.getTemplateId());
+ messageRecord.setAlarmRuleId(alarmRule.getId());
// 设置告警记录信息
AlarmRecordDetail alarmRecordDetail = new AlarmRecordDetail();
alarmRecordDetail.setReservoirNumber(list.get(0));
@@ -318,7 +348,7 @@
messageRecord.setContent(format);
messageRecordList.add(messageRecord);
// 保存短信发送记录
- smsRecord = saveSendRecord(request, resultComResult.getCode().toString(), resultComResult.getMsg(), smsResult.getId());
+ smsRecord = saveSendRecord(request, resultComResult.getCode().toString(), resultComResult.getMsg(), smsResult.getId(),alarmRule.getId(),alarmRecordDetail.getReservoirNumber());
if (null != smsRecord) {
alarmRecordDetail.setAlarmContent(format);
alarmRecordDetail.setSendRecordId(smsRecord.getId());
@@ -449,10 +479,18 @@
* @param request
* @param code 响应code
* @param sendMsg 响应消息
- * @param resultId
+ * @param resultId 短信发送结果id
+ * @param alarmRuleId 告警规则id
+ * @param resGuid 水库guid
*/
@Override
- public SmsRecord saveSendRecord(SMSSendRequest request, String code, String sendMsg, Long resultId) {
+ public SmsRecord saveSendRecord(SMSSendRequest request,
+ String code,
+ String sendMsg,
+ Long resultId,
+ Long alarmRuleId,
+ String resGuid
+ ) {
// 在保存明细
SmsRecord smsRecord = new SmsRecord();
smsRecord.setTel(request.getUserNumber());
@@ -461,6 +499,8 @@
smsRecord.setResultId(resultId);
smsRecord.setResponseStatus(code);
smsRecord.setResponseMsg(sendMsg);
+ smsRecord.setResGuid(resGuid);
+ smsRecord.setAlarmRuleId(alarmRuleId);
//插入记录
smsRecordService.save(smsRecord);
// 返回
@@ -800,8 +840,10 @@
List<List<Temp>> lists = Lists.partition(new ArrayList<>(temps), 30);
for (List<Temp> list : lists) {
List<AlarmRecordDetailVO> alarmRecordDetailList = new ArrayList<>();
+ List<String> resGuidList = new ArrayList<>();
// 遍历
for (Temp temp : list) {
+ resGuidList.add(temp.getReservoirCode());
builder.append(temp.getReservoirName()).append("，");
smsRecordBuilder.append(temp.getReservoirName()).append("，");
AlarmRecordDetailVO alarmRecordDetail = new AlarmRecordDetailVO();
@@ -835,7 +877,8 @@
// 设置内容
request.setMessageContent(format);
// 保存短信发送记录
- SmsRecord smsRecord = saveSendRecord(request, resultComResult.getCode().toString(), resultComResult.getMsg(), smsResult.getId());
+ String resGuid = resGuidList.size()>0?Strings.join(resGuidList,','):"";
+ SmsRecord smsRecord = saveSendRecord(request, resultComResult.getCode().toString(), resultComResult.getMsg(), smsResult.getId(),smsResult.getAlarmRuleId(),resGuid);
//保存告警记录详情信息
if (null != smsRecord) {
List<AlarmRecordDetail> alarmRecordDetailArrayList = new ArrayList<>();
@@ -914,8 +957,10 @@
List<List<Temp>> lists = Lists.partition(new ArrayList<>(infoList), 30);
for (List<Temp> list : lists) {
List<AlarmRecordDetailVO> alarmRecordDetailList = new ArrayList<>();
+ List<String> resGuidList = new ArrayList<>();
// 遍历
for (Temp temp : list) {
+ resGuidList.add(temp.getReservoirCode());
builder.append(temp.getReservoirName()+"("+temp.getCdNm() +")").append("，");
smsRecordBuilder.append(temp.getReservoirName()+"("+temp.getCdNm() +")").append("，");
AlarmRecordDetailVO alarmRecordDetail = new AlarmRecordDetailVO();
@@ -948,8 +993,9 @@
String format = String.format(str, substring.split(","));
// 设置内容
request.setMessageContent(format);
+ String resGuid = resGuidList.size()>0? Strings.join(resGuidList,','):"";
// 保存短信发送记录
- SmsRecord smsRecord = saveSendRecord(request, resultComResult.getCode().toString(), resultComResult.getMsg(), smsResult.getId());
+ SmsRecord smsRecord = saveSendRecord(request, resultComResult.getCode().toString(), resultComResult.getMsg(), smsResult.getId(),smsResult.getAlarmRuleId(),resGuid);
//保存告警记录详情信息
if (null != smsRecord) {
List<AlarmRecordDetail> alarmRecordDetailArrayList = new ArrayList<>();
@@ -1034,12 +1080,14 @@
});
- // 如果一人对应水库数量超过30个，则分批发送
+ // 如果一人对应水库数量超过15个，则分批发送
List<List<Temp>> lists = Lists.partition(new ArrayList<>(infoList), 15);
for (List<Temp> list : lists) {
+ List<String> resGuidList = new ArrayList<>();
List<AlarmRecordDetailVO> alarmRecordDetailList = new ArrayList<>();
// 遍历
for (Temp temp : list) {
+ resGuidList.add(temp.getReservoirCode());
builder.append(temp.getReservoirName()+"("+temp.getCdNm() +")").append("，");
smsRecordBuilder.append(temp.getReservoirName()+"("+temp.getCdNm() +")").append("，");
AlarmRecordDetailVO alarmRecordDetail = new AlarmRecordDetailVO();
@@ -1072,8 +1120,10 @@
String format = String.format(str, substring.split(","));
// 设置内容
request.setMessageContent(format);
+ // 转resGuid
+ String resGuid = resGuidList.size()>0? Strings.join(resGuidList,','):"";
// 保存短信发送记录
- SmsRecord smsRecord = saveSendRecord(request, resultComResult.getCode().toString(), resultComResult.getMsg(), smsResult.getId());
+ SmsRecord smsRecord = saveSendRecord(request, resultComResult.getCode().toString(), resultComResult.getMsg(), smsResult.getId(),smsResult.getAlarmRuleId(),resGuid);
//保存告警记录详情信息
if (null != smsRecord) {
List<AlarmRecordDetail> alarmRecordDetailArrayList = new ArrayList<>();
@@ -1191,7 +1241,7 @@
// 设置内容
request.setMessageContent(formatContent);
// 保存短信发送记录
- SmsRecord smsRecord = saveSendRecord(request, resultComResult.getCode().toString(), resultComResult.getMsg(), smsResult.getId());
+ SmsRecord smsRecord = saveSendRecord(request, resultComResult.getCode().toString(), resultComResult.getMsg(), smsResult.getId(),smsResult.getAlarmRuleId(),null);
AlarmRecordDetail alarmRecordDetail1 = new AlarmRecordDetail();
// 短信内容拼接（完成发送的结果信息）
alarmRecordDetail1.setAlarmContent(formatContent);
--
Gitblit v1.9.3