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 | 70 +++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 27 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 538c07a..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
@@ -10,6 +10,7 @@
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;
@@ -19,6 +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.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;
@@ -35,6 +37,8 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
+
+import static cn.gistack.alerts.sms.util.SmsUtils.validator;
/**
* 短信发送服务实现层
@@ -79,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);
@@ -108,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) {
@@ -172,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) {
@@ -231,7 +235,6 @@
String templateId = params.get("templateId").toString();
// 查询短信模板
SmsTemplate smsTemplate = smsTemplateService.getOne(new QueryWrapper<SmsTemplate>().eq("template_id", templateId));
- String content = params.get("content").toString();
List<String> phones = (List<String>)params.get("phones");
List<String> errPhones = new ArrayList<>();
// 手机号去重
@@ -260,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){
@@ -353,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]");
@@ -385,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);
}
/**
@@ -446,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;
- }
/**
* 通过手机号获取外呼未接通已发短信通知的人员水库信息
@@ -579,7 +574,10 @@
}
//请求参数
ComResult<DynSMSSendDataResult> resultComResult = sendDynSMSSendDataResultComResult(smsTemplate.getTemplateId(), dyns);
- SmsResult smsResult = getSaveSmsResult(smsTemplate.getTemplateId(), rows, "");
+ 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);
// 返回
@@ -588,5 +586,23 @@
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