From 1581ef5a1b4e24ecf21fd95ee6e4b9bd4085b2da Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 30 Jun 2023 17:48:26 +0800
Subject: [PATCH] 短信发送记录保存修改
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java | 208 +++++++++++++++++++++++++++++++++------------------
1 files changed, 133 insertions(+), 75 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 4d0527e..ba2fd5b 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
@@ -7,8 +7,10 @@
import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendRequest;
import cn.gistack.alerts.alarmRule.entity.AlarmRecordDetail;
import cn.gistack.alerts.alarmRule.service.AlarmRecordDetailService;
+import cn.gistack.alerts.notice.util.FormatUtil;
import cn.gistack.alerts.sms.constant.MinConstant;
import cn.gistack.alerts.sms.entity.SmsRecord;
+import cn.gistack.alerts.sms.entity.SmsRequest;
import cn.gistack.alerts.sms.entity.SmsResult;
import cn.gistack.alerts.sms.entity.SmsTemplate;
import cn.gistack.alerts.sms.excel.SendRainSmsExcel;
@@ -18,7 +20,7 @@
import cn.gistack.alerts.sms.service.SmsService;
import cn.gistack.alerts.sms.util.SmsUtils;
import cn.gistack.alerts.sms.vo.SmsRequestTemplate;
-import cn.gistack.common.cache.CacheNames;
+import cn.gistack.alerts.sms.vo.SmsResponseVO;
import cn.gistack.sm.intelligentCall.entity.CallNotFillRecord;
import cn.gistack.sm.intelligentCall.feign.OutCallClient;
import cn.gistack.sm.sjztmd.feign.IAttResManagePersonClient;
@@ -27,16 +29,16 @@
import org.jetbrains.annotations.NotNull;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import static cn.gistack.alerts.sms.util.SmsUtils.validator;
/**
* 短信发送服务实现层
@@ -67,6 +69,9 @@
@Autowired
private IAttResManagePersonClient attResManagePersonClient;
+ @Autowired
+ private SmsAsyncService asyncService;
+
/**
* 发送 xx 变量模板短信
* @param phoneNumbers 手机号集合
@@ -78,7 +83,7 @@
List<ComResult<SMSSendDataResult>> list = new ArrayList<>();
if (phoneNumbers.size()>0){
// 先保存结果记录
- SmsResult smsResult = saveSendResult(request, phoneNumbers.size());
+ SmsResult smsResult = saveSendResult(null,request, phoneNumbers.size());
// 遍历发送
for (String phone : phoneNumbers) {
request.setUserNumber(phone);
@@ -107,7 +112,7 @@
request.setTemplateId(smsTemplate.getTemplateId());
List<List<String>> templateContent = smsRequestTemplate.getTemplateContent();
// 先保存结果记录
- SmsResult smsResult = saveSendResult(request, templateContent.size());
+ SmsResult smsResult = saveSendResult(null,request, templateContent.size());
List<SmsRecord> smsRecordList = new ArrayList<>();
// 遍历处理
for (List<String> list : templateContent) {
@@ -171,7 +176,7 @@
request.setTemplateId(smsTemplate.getTemplateId());
List<List<String>> templateContent = smsRequestTemplate.getTemplateContent();
// 先保存结果记录
- SmsResult smsResult = saveSendResult(request, templateContent.size());
+ SmsResult smsResult = saveSendResult(null,request, templateContent.size());
List<SmsRecord> smsRecordList = new ArrayList<>();
// 遍历处理
for (List<String> list : templateContent) {
@@ -228,7 +233,8 @@
String[] titleArr = params.get("title").toString().split(",");
String data = params.get("data").toString();
String templateId = params.get("templateId").toString();
- String content = params.get("content").toString();
+ // 查询短信模板
+ SmsTemplate smsTemplate = smsTemplateService.getOne(new QueryWrapper<SmsTemplate>().eq("template_id", templateId));
List<String> phones = (List<String>)params.get("phones");
List<String> errPhones = new ArrayList<>();
// 手机号去重
@@ -236,46 +242,11 @@
for (String phone : phones) {
hashSet.add(phone);
}
- StringBuilder builder = new StringBuilder();
- // 变量
- for (String phone : hashSet) {
- if (validator(phone)){
- builder.append(phone+","+data).append(";");
- }else {
- // 异常手机号
- errPhones.add(phone);
- }
- }
- String datas = builder.toString();
- String[] rows = datas.split(";");
- String[][] dyns = new String[rows.length + 1][titleArr.length];
- dyns[0] = titleArr;
- int rowNum = 1;
- for (String row : rows) {
- String[] cols = row.split(",");
- dyns[rowNum++] = cols;
- }
- //请求参数
- ComResult<DynSMSSendDataResult> resultComResult = sendDynSMSSendDataResultComResult(templateId, dyns);
- SmsResult smsResult = getSaveSmsResult(templateId, rows, content);
- if (null != smsResult){
- List<SmsRecord> list = new ArrayList<>();
- // 遍历保存
- for (String phone : hashSet) {
- SmsRecord smsRecord = new SmsRecord();
- smsRecord.setId(IdWorker.getId());
- smsRecord.setTel(phone);
- smsRecord.setContent(content);
- smsRecord.setTemplateId(templateId);
- smsRecord.setResultId(smsResult.getId());
- smsRecord.setResponseStatus(resultComResult.getCode().toString());
- smsRecord.setResponseMsg(resultComResult.getMsg());
- // 加入集合
- list.add(smsRecord);
- }
- // 批量保存记录
- smsRecordService.batchSaveSendRecord(list);
- }
+ // 批量发送短信
+ Map<String, Object> batchSendSmsMap = batchSendSms(hashSet, titleArr, data, smsTemplate,errPhones);
+ ComResult<DynSMSSendDataResult> resultComResult = (ComResult<DynSMSSendDataResult>)batchSendSmsMap.get("resultComResult");
+ errPhones = (List<String>) batchSendSmsMap.get("errPhones");
+ // 计算差值
Integer diff = phones.size() - hashSet.size();
if (resultComResult.getCode()==0){
String successMsg = "发送成功!共提交号码 "+phones.size()+" 个，其中重复号码 "+diff+" 个，错误号码 "
@@ -292,16 +263,21 @@
/**
* 发送记录保存
+ * @param smsResponse 响应消息
* @param request 发送信息
* @param number 号码个数
*/
@Override
- public SmsResult saveSendResult(SMSSendRequest request,Integer number) {
+ public SmsResult saveSendResult(SmsResponseVO smsResponse, SMSSendRequest request, Integer number) {
// 先保存结果表
SmsResult smsResult = new SmsResult();
smsResult.setTemplateId(request.getTemplateId());
smsResult.setContent(request.getMessageContent());
smsResult.setNumber(number);
+ if (null!= smsResponse) {
+ smsResult.setResCode(smsResponse.getCode());
+ smsResult.setResMsg(smsResponse.getMsg());
+ }
//插入记录
boolean save = smsResultService.save(smsResult);
if (save){
@@ -385,7 +361,10 @@
dyns[rowNum++] = cols;
}
ComResult<DynSMSSendDataResult> resultComResult = sendDynSMSSendDataResultComResult(templateId, dyns);
- SmsResult smsResult = getSaveSmsResult(templateId, rows, "");
+ SmsResponseVO smsResponse = new SmsResponseVO();
+ smsResponse.setCode(resultComResult.getCode().toString());
+ smsResponse.setMsg(resultComResult.getMsg());
+ SmsResult smsResult = getSaveSmsResult(smsResponse,templateId, rows, "");
if (null != smsResult) {
List<SmsRecord> smsRecordList = new ArrayList<>();
Pattern compile = Pattern.compile("[^0-9]");
@@ -396,9 +375,9 @@
for (Map<String, Object> map : newList) {
// 保存redis
// 已发送短信的人员对应呼叫id的过期时间
- bladeRedis.setEx(MinConstant.is_send_prefix + map.get("callId").toString(), taskId, MinConstant.is_send_time);
+ bladeRedis.setEx(MinConstant.is_send_prefix + map.get("callId").toString(), map.get("taskId").toString(), MinConstant.is_send_time);
// 填报过期时间
- bladeRedis.setEx(MinConstant.fill_info_prefix + map.get("callId").toString(), taskId, validTime);
+ bladeRedis.setEx(MinConstant.fill_info_prefix + map.get("callId").toString(), map.get("taskId").toString(), validTime);
// 封装短息记录数据
SmsRecord smsRecord = getSmsRecord(time, templateId, smsTemplate, resultComResult, smsResult, map);
// 加入集合
@@ -417,18 +396,19 @@
/**
* 保存短信发送结果
+ * @param smsResponse
* @param templateId
* @param rows
* @param content
* @return
*/
- private SmsResult getSaveSmsResult(String templateId, String[] rows, String content) {
+ private SmsResult getSaveSmsResult(SmsResponseVO smsResponse,String templateId, String[] rows, String content) {
SMSSendRequest request = new SMSSendRequest();
request.setTemplateId(templateId);
request.setMessageContent(content);
request.setUserNumber("");
// 先保存结果记录
- return saveSendResult(request, rows.length);
+ return saveSendResult(smsResponse,request, rows.length);
}
/**
@@ -478,23 +458,6 @@
return smsRecord;
}
- /**
- * 校验手机号码
- */
- public static boolean validator(String phone) {
- if (null!=phone && !phone.equals("")) {
- String regex = "^((13[0-9])|(14[5,7,9])|(15([0-3]|[5-9]))|(166)|(17[0,1,3,5,6,7,8])|(18[0-9])|(19[8|9]))\\d{8}$";
- if (phone.length() != 11) {
- return false;
- } else {
- Pattern p = Pattern.compile(regex);
- Matcher m = p.matcher(phone);
- boolean isMatch = m.matches();
- return isMatch;
- }
- }
- return false;
- }
/**
* 通过手机号获取外呼未接通已发短信通知的人员水库信息
@@ -538,13 +501,108 @@
*/
@Override
public Object importSendRainSms(List<SendRainSmsExcel> list,String startTime,String endTime) {
+ String templateId = "2431012251309";
// 获取水库个数
Integer size = list.size();
+ List<String> errPhones = new ArrayList<>();
+ // 转换
+ List<String> stringList = list.stream().map(SendRainSmsExcel::getWaterCode).collect(Collectors.toList());
// 通过水库代码获取巡查责任人及技术责任人手机号
-// Set<String> personList = attResManagePersonClient.getPersonListByWaterCodeList(list);
-
-
+ Set<String> personList = attResManagePersonClient.getPersonListByWaterCodeList(stringList);
+ // 查询短信模板
+ SmsTemplate smsTemplate = smsTemplateService.getOne(new QueryWrapper<SmsTemplate>().eq("template_id", templateId));
+ String param = startTime + "-" + endTime;
+ // 拼接短信标题数组
+ String [] titleArr = getSmsTitleArr(smsTemplate);
+ // 批量发送短信
+ Map<String, Object> batchSendSmsMap = batchSendSms(personList, titleArr, param, smsTemplate,errPhones);
+ ComResult<DynSMSSendDataResult> resultComResult = (ComResult<DynSMSSendDataResult>)batchSendSmsMap.get("resultComResult");
+ errPhones = (List<String>) batchSendSmsMap.get("errPhones");
+ // 计算差值
+ Integer diff = size - errPhones.size();
+ if (resultComResult.getCode()==0){
+ String successMsg = "发送成功!共导入水库个数 "+ size +" 个，其中发送号码 "+ diff + " 个。";
+ // 返回
+ return R.data(200,successMsg,null);
+ }
+ String errorMsg = "发送失败!共导入水库个数 "+ size +" 个，发送异常号码 "+ diff + " 个，异常原因" + resultComResult.getMsg() + "。";
// 返回
- return null;
+ return R.data(400,errorMsg,null);
+ }
+
+ /**
+ * 拼接短信标题数组
+ * @param smsTemplate
+ * @return
+ */
+ private String[] getSmsTitleArr(SmsTemplate smsTemplate) {
+ String title = FormatUtil.composeMessage(smsTemplate.getContent());
+ // 返回
+ return title.split(",");
+ }
+
+ /**
+ * 批量发送动态短信
+ * @param phoneList
+ * @param titleArr 示例： [手机号码,水库名称，水位值]
+ * @param param 示例： ***水库，15.12
+ * @param smsTemplate
+ * @return
+ */
+ private Map<String, Object> batchSendSms(Set<String> phoneList,String[] titleArr,String param,SmsTemplate smsTemplate,List<String> errPhones){
+ Map<String, Object> map = new HashMap<>();
+ StringBuilder builder = new StringBuilder();
+ // 遍历，拼接短信
+ if (phoneList.size()>0){
+ for (String phone : phoneList) {
+ if (validator(phone)){
+ builder.append(phone+","+ param).append(";");
+ }else {
+ // 异常手机号
+ errPhones.add(phone);
+ }
+ }
+ }
+ String datas = builder.toString();
+ String[] rows = datas.split(";");
+ String[][] dyns = new String[rows.length + 1][titleArr.length];
+ dyns[0] = titleArr;
+ int rowNum = 1;
+ for (String row : rows) {
+ String[] cols = row.split(",");
+ dyns[rowNum++] = cols;
+ }
+ //请求参数
+ ComResult<DynSMSSendDataResult> resultComResult = sendDynSMSSendDataResultComResult(smsTemplate.getTemplateId(), dyns);
+ SmsResponseVO smsResponse = new SmsResponseVO();
+ smsResponse.setCode(resultComResult.getCode().toString());
+ smsResponse.setMsg(resultComResult.getMsg());
+ SmsResult smsResult = getSaveSmsResult(smsResponse,smsTemplate.getTemplateId(), rows, "");
+ // 异步记录发送记录
+ asyncService.batchSaveSendRecord(smsResult,rows,smsTemplate,resultComResult);
+ // 返回
+ map.put("errPhones",errPhones);
+ map.put("resultComResult",resultComResult);
+ return map;
+ }
+
+ /**
+ * 发送邮件提醒短信
+ * @param list
+ */
+ @Override
+ public void sendEmailMsg(List<String> list, SmsRequest smsRequest) {
+ String templateId = "2431012165299";
+ // 获取水库个数
+ List<String> errPhones = new ArrayList<>();
+ // 去重
+ Set<String> hashSet = new HashSet<>(list);
+ // 查询短信模板
+ SmsTemplate smsTemplate = smsTemplateService.getOne(new QueryWrapper<SmsTemplate>().eq("template_id", templateId));
+ String param = smsRequest.getContent();
+ // 拼接短信标题数组
+ String [] titleArr = getSmsTitleArr(smsTemplate);
+ // 批量发送短信
+ Map<String, Object> batchSendSmsMap = batchSendSms(hashSet, titleArr, param, smsTemplate,errPhones);
}
}
--
Gitblit v1.9.3