From f73dbcd6c21d28ab1e98840eee73c6d09bd0f929 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Tue, 27 Aug 2024 17:31:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java | 47 ++++++++++++++++++++++++++++++++---------------
1 files changed, 32 insertions(+), 15 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..7cb010a 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);
}
@@ -291,6 +286,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 +315,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 +446,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 +466,8 @@
smsRecord.setResultId(resultId);
smsRecord.setResponseStatus(code);
smsRecord.setResponseMsg(sendMsg);
+ smsRecord.setResGuid(resGuid);
+ smsRecord.setAlarmRuleId(alarmRuleId);
//插入记录
smsRecordService.save(smsRecord);
// 返回
@@ -800,8 +807,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 +844,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 +924,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 +960,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 +1047,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 +1087,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 +1208,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