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 | 88 +++++++++++++++++++++++++++++++-------------
1 files changed, 62 insertions(+), 26 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 7dfd45e..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;
@@ -87,6 +82,11 @@
@Autowired
private NoticeHandle noticeHandle;
+ @Override
+ public ComResult<DynSMSSendDataResult> testSend(String tempId, String[][] strss) {
+ return sendDynSMSSendDataResultComResult(tempId,strss);
+ }
+
/**
* 发送 xx 变量模板短信
* @param phoneNumbers 手机号集合
@@ -98,7 +98,7 @@
List<ComResult<SMSSendDataResult>> list = new ArrayList<>();
if (phoneNumbers.size()>0){
// 先保存结果记录
- SmsResult smsResult = saveSendResult(null,null,request, phoneNumbers.size());
+ SmsResult smsResult = saveSendResult(null,null,null,request, phoneNumbers.size());
// 遍历发送
for (String phone : phoneNumbers) {
request.setUserNumber(phone);
@@ -106,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);
}
@@ -208,6 +208,7 @@
SmsTemplate smsTemplate = smsRequestTemplate.getSmsTemplate();
request.setTemplateId(smsTemplate.getTemplateId());
List<List<String>> templateContent = smsRequestTemplate.getTemplateContent();
+ AlarmRule alarmRule = smsRequestTemplate.getAlarmRule();
// 是否同时发送站内信
Boolean isSendStation = false;
if (null!=smsRequestTemplate.getIsSendStation()){
@@ -224,7 +225,7 @@
int count = Integer.parseInt(map.get("errCount").toString());
ComResult<DynSMSSendDataResult> resultComResult =(ComResult<DynSMSSendDataResult>) map.get("resultComResult");
// 保存短信结果记录
- SmsResult smsResult = saveSendResult(resultComResult.getCode().toString(),resultComResult.getMsg(),request, list.size() - count);
+ 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);
@@ -285,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));
@@ -312,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());
@@ -420,13 +423,14 @@
* @param number 号码个数
*/
@Override
- public SmsResult saveSendResult(String code,String msg, SMSSendRequest request, Integer number) {
+ public SmsResult saveSendResult(Long alarmRuleId,String code,String msg, SMSSendRequest request, Integer number) {
// 先保存结果表
SmsResult smsResult = new SmsResult();
smsResult.setTemplateId(request.getTemplateId());
smsResult.setNumber(number);
smsResult.setResCode(code);
smsResult.setResMsg(msg);
+ smsResult.setAlarmRuleId(alarmRuleId);
//插入记录
boolean save = smsResultService.save(smsResult);
if (save){
@@ -442,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());
@@ -454,6 +466,8 @@
smsRecord.setResultId(resultId);
smsRecord.setResponseStatus(code);
smsRecord.setResponseMsg(sendMsg);
+ smsRecord.setResGuid(resGuid);
+ smsRecord.setAlarmRuleId(alarmRuleId);
//插入记录
smsRecordService.save(smsRecord);
// 返回
@@ -552,7 +566,7 @@
SMSSendRequest request = new SMSSendRequest();
request.setTemplateId(templateId);
// 先保存结果记录
- return saveSendResult(code,msg,request, rows.length);
+ return saveSendResult(null,code,msg,request, rows.length);
}
/**
@@ -770,6 +784,7 @@
SmsTemplate smsTemplate = smsRequestTemplate.getSmsTemplate();
request.setTemplateId(smsTemplate.getTemplateId());
List<List<String>> templateContent = smsRequestTemplate.getTemplateContent();
+ AlarmRule alarmRule = smsRequestTemplate.getAlarmRule();
List<Temp> tempList = new ArrayList<>();
// 合并数据
for (List<String> list : templateContent) {
@@ -792,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();
@@ -815,7 +832,7 @@
//请求参数
ComResult<DynSMSSendDataResult> resultComResult = sendDynSMSSendDataResultComResult(smsTemplate.getTemplateId(), dyns);
// 先保存结果记录
- SmsResult smsResult = saveSendResult(resultComResult.getCode().toString(),resultComResult.getMsg(),request, 1);
+ SmsResult smsResult = saveSendResult(alarmRule.getId(),resultComResult.getCode().toString(),resultComResult.getMsg(),request, 1);
// 设置手机号
request.setUserNumber(s);
// 内容处理
@@ -827,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<>();
@@ -861,6 +879,7 @@
SmsTemplate smsTemplate = smsRequestTemplate.getSmsTemplate();
request.setTemplateId(smsTemplate.getTemplateId());
List<List<String>> templateContent = smsRequestTemplate.getTemplateContent();
+ AlarmRule alarmRule = smsRequestTemplate.getAlarmRule();
List<Temp> tempList = new ArrayList<>();
// 合并数据
for (List<String> list : templateContent) {
@@ -905,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();
@@ -928,7 +949,7 @@
//请求参数
ComResult<DynSMSSendDataResult> resultComResult = sendDynSMSSendDataResultComResult(smsTemplate.getTemplateId(), dyns);
// 先保存结果记录
- SmsResult smsResult = saveSendResult(resultComResult.getCode().toString(),resultComResult.getMsg(),request, 1);
+ SmsResult smsResult = saveSendResult(alarmRule.getId(),resultComResult.getCode().toString(),resultComResult.getMsg(),request, 1);
// 设置手机号
request.setUserNumber(s);
// 内容处理
@@ -939,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<>();
@@ -959,7 +981,11 @@
alarmRecordDetailArrayList.add(alarmRecordDetail1);
}
// 保存告警记录详情信息
- boolean save = alarmRecordDetailService.saveBatch(alarmRecordDetailArrayList);
+ try {
+ boolean save = alarmRecordDetailService.saveBatch(alarmRecordDetailArrayList);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
}
}
});
@@ -967,7 +993,11 @@
return null;
}
-
+ /**
+ * 视频数据接收不到
+ * @param smsRequestTemplate
+ * @return
+ */
@Override
public Map<String, Object> sendSignMsgMergeCdVideo(SmsRequestTemplate smsRequestTemplate) {
@@ -976,6 +1006,7 @@
SmsTemplate smsTemplate = smsRequestTemplate.getSmsTemplate();
request.setTemplateId(smsTemplate.getTemplateId());
List<List<String>> templateContent = smsRequestTemplate.getTemplateContent();
+ AlarmRule alarmRule = smsRequestTemplate.getAlarmRule();
List<Temp> tempList = new ArrayList<>();
// 合并数据
for (List<String> list : templateContent) {
@@ -1016,12 +1047,14 @@
});
- // 如果一人对应水库数量超过30个，则分批发送
- List<List<Temp>> lists = Lists.partition(new ArrayList<>(infoList), 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();
@@ -1043,7 +1076,7 @@
//请求参数
ComResult<DynSMSSendDataResult> resultComResult = sendDynSMSSendDataResultComResult(smsTemplate.getTemplateId(), dyns);
// 先保存结果记录
- SmsResult smsResult = saveSendResult(resultComResult.getCode().toString(),resultComResult.getMsg(),request, 1);
+ SmsResult smsResult = saveSendResult(alarmRule.getId(),resultComResult.getCode().toString(),resultComResult.getMsg(),request, 1);
// 设置手机号
request.setUserNumber(s);
// 内容处理
@@ -1054,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<>();
@@ -1147,6 +1182,7 @@
SmsTemplate smsTemplate,
List<String> rowList,
List<AlarmRecordDetailVO> alarmRecordDetailList) {
+ AlarmRule alarmRule = smsRequestTemplate.getAlarmRule();
// 组装数据
String[] titleArr = smsRequestTemplate.getTitle().split(",");
String[][] dyns = new String[rowList.size() + 1][titleArr.length];
@@ -1159,7 +1195,7 @@
//请求参数
ComResult<DynSMSSendDataResult> resultComResult = sendDynSMSSendDataResultComResult(smsTemplate.getTemplateId(), dyns);
// 先保存结果记录
- SmsResult smsResult = saveSendResult(resultComResult.getCode().toString(),resultComResult.getMsg(),request, rowList.size());
+ SmsResult smsResult = saveSendResult(alarmRule.getId(),resultComResult.getCode().toString(),resultComResult.getMsg(),request, rowList.size());
List<AlarmRecordDetail> alarmRecordDetailArrayList = new ArrayList<>();
// 遍历
for (AlarmRecordDetailVO alarmRecordDetailVO : alarmRecordDetailList) {
@@ -1172,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