From 07d02c7766ee86922c190c8ea170b352df485050 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 19 Jun 2023 19:01:02 +0800
Subject: [PATCH] 外呼短信发送修改
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java | 158 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 103 insertions(+), 55 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 8d153bc..8fa81b3 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
@@ -18,14 +18,19 @@
import cn.gistack.alerts.sms.util.SmsUtils;
import cn.gistack.alerts.sms.vo.SmsRequestTemplate;
import cn.gistack.common.cache.CacheNames;
+import cn.gistack.sm.intelligentCall.entity.CallNotFillRecord;
+import cn.gistack.sm.intelligentCall.feign.OutCallClient;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+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.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -52,6 +57,9 @@
@Autowired
private BladeRedis bladeRedis;
+
+ @Autowired
+ private OutCallClient outCallClient;
/**
* 发送 xx 变量模板短信
@@ -110,11 +118,7 @@
// 组装数据
String[][] dyns = new String[][]{{smsRequestTemplate.getTitle()}, {row}};
//请求参数
- DynSMSSendRequest sendRequest = new DynSMSSendRequest();
- sendRequest.setTemplateId(smsTemplate.getTemplateId());
- sendRequest.setDynData(dyns);
- // 发送
- ComResult<DynSMSSendDataResult> resultComResult = SmsUtils.dynSendMethod(sendRequest);
+ ComResult<DynSMSSendDataResult> resultComResult = sendDynSMSSendDataResultComResult(smsTemplate.getTemplateId(), dyns);
SmsRecord smsRecord = new SmsRecord();
if (null != smsResult){
@@ -246,17 +250,8 @@
dyns[rowNum++] = cols;
}
//请求参数
- DynSMSSendRequest sendRequest = new DynSMSSendRequest();
- sendRequest.setTemplateId(templateId);
- sendRequest.setDynData(dyns);
- // 发送
- ComResult<DynSMSSendDataResult> resultComResult = SmsUtils.dynSendMethod(sendRequest);
- SMSSendRequest request = new SMSSendRequest();
- request.setTemplateId(templateId);
- request.setMessageContent(content);
- request.setUserNumber("");
- // 先保存结果记录
- SmsResult smsResult = saveSendResult(request, rows.length);
+ ComResult<DynSMSSendDataResult> resultComResult = sendDynSMSSendDataResultComResult(templateId, dyns);
+ SmsResult smsResult = getSaveSmsResult(templateId, rows, content);
if (null != smsResult){
List<SmsRecord> list = new ArrayList<>();
// 遍历保存
@@ -350,8 +345,8 @@
List<Map<String, Object>> newList = new ArrayList<>();
// 比对
for (Map<String, Object> map : list) {
- // 获取验证码
- String redisByTaskId = bladeRedis.get(MinConstant.is_send_prefix + map.get("userPhone").toString() + ":" + map.get("waterCode").toString());
+ // 获取任务id
+ String redisByTaskId = bladeRedis.get(MinConstant.is_send_prefix + map.get("callId").toString());
// 如果为null,并且不能匹配，加入发送短信集合
if (redisByTaskId == null || !StringUtil.equalsIgnoreCase(redisByTaskId, taskId)) {
newList.add(map);
@@ -364,12 +359,12 @@
for (Map<String, Object> map : newList) {
builder.append(map.get("userPhone") + ",")
.append(time + ",")
- .append(MinConstant.fillWaterInfoUrl + ",")
- .append(map.get("waterName"))
+ .append(map.get("waterName") + ",")
+ .append(MinConstant.fillWaterInfoUrl +"?" + "callId=" + map.get("callId"))
.append(";");
}
String datas = builder.toString();
- String title = "手机号码,时间范围,链接地址,水库名称";
+ String title = "手机号码,时间范围,水库名称,访问链接";
String[] titleArr = title.split(",");
String[] rows = datas.split(";");
String[][] dyns = new String[rows.length + 1][titleArr.length];
@@ -379,18 +374,8 @@
String[] cols = row.split(",");
dyns[rowNum++] = cols;
}
- //请求参数
- DynSMSSendRequest sendRequest = new DynSMSSendRequest();
- sendRequest.setTemplateId(templateId);
- sendRequest.setDynData(dyns);
- // 发送
- ComResult<DynSMSSendDataResult> resultComResult = SmsUtils.dynSendMethod(sendRequest);
- SMSSendRequest request = new SMSSendRequest();
- request.setTemplateId(templateId);
- request.setMessageContent("");
- request.setUserNumber("");
- // 先保存结果记录
- SmsResult smsResult = saveSendResult(request, rows.length);
+ ComResult<DynSMSSendDataResult> resultComResult = sendDynSMSSendDataResultComResult(templateId, dyns);
+ SmsResult smsResult = getSaveSmsResult(templateId, rows, "");
if (null != smsResult) {
List<SmsRecord> smsRecordList = new ArrayList<>();
Pattern compile = Pattern.compile("[^0-9]");
@@ -399,23 +384,13 @@
Long validTime = time.contains("分钟") ? 60L * result : 60L * 60 * result;
// 遍历保存
for (Map<String, Object> map : newList) {
- SmsRecord smsRecord = new SmsRecord();
- smsRecord.setId(IdWorker.getId());
- smsRecord.setTel(map.get("userPhone").toString());
- // 内容处理
- String s = smsTemplate.getContent().replaceAll("\\{.+?\\}", "%s");
- // 拼接内容
- String arrString = time + "," + MinConstant.fillWaterInfoUrl + "," + map.get("waterName").toString();
- // 格式转换
- String format = String.format(s, arrString.split(","));
- smsRecord.setContent(format);
- smsRecord.setTemplateId(templateId);
- smsRecord.setResultId(smsResult.getId());
- smsRecord.setResponseStatus(resultComResult.getCode().toString());
- smsRecord.setResponseMsg(resultComResult.getMsg());
// 保存redis
- bladeRedis.setEx(MinConstant.is_send_prefix + map.get("userPhone").toString() + ":" + map.get("waterCode").toString(), taskId, 2 * 60 * 60L);
- bladeRedis.setEx(MinConstant.fill_info_prefix + map.get("userPhone").toString(), taskId, validTime);
+ // 已发送短信的人员对应呼叫id的过期时间
+ bladeRedis.setEx(MinConstant.is_send_prefix + map.get("callId").toString(), taskId, MinConstant.is_send_time);
+ // 填报过期时间
+ bladeRedis.setEx(MinConstant.fill_info_prefix + map.get("callId").toString(), taskId, validTime);
+ // 封装短息记录数据
+ SmsRecord smsRecord = getSmsRecord(time, templateId, smsTemplate, resultComResult, smsResult, map);
// 加入集合
smsRecordList.add(smsRecord);
}
@@ -427,6 +402,69 @@
}
}
return null;
+ }
+
+ /**
+ * 保存短信发送结果
+ * @param templateId
+ * @param rows
+ * @param content
+ * @return
+ */
+ private SmsResult getSaveSmsResult(String templateId, String[] rows, String content) {
+ SMSSendRequest request = new SMSSendRequest();
+ request.setTemplateId(templateId);
+ request.setMessageContent(content);
+ request.setUserNumber("");
+ // 先保存结果记录
+ return saveSendResult(request, rows.length);
+ }
+
+ /**
+ * 动态批量发送短信
+ * @param templateId
+ * @param dyns
+ * @return
+ */
+ private ComResult<DynSMSSendDataResult> sendDynSMSSendDataResultComResult(String templateId, String[][] dyns) {
+ //请求参数
+ DynSMSSendRequest sendRequest = new DynSMSSendRequest();
+ sendRequest.setTemplateId(templateId);
+ sendRequest.setDynData(dyns);
+ // 发送
+ return SmsUtils.dynSendMethod(sendRequest);
+ }
+
+ /**
+ * 短信记录数据处理
+ * @param time
+ * @param templateId
+ * @param smsTemplate
+ * @param resultComResult
+ * @param smsResult
+ * @param map
+ * @return
+ */
+ @NotNull
+ private SmsRecord getSmsRecord(String time, String templateId, SmsTemplate smsTemplate, ComResult<DynSMSSendDataResult> resultComResult, SmsResult smsResult, Map<String, Object> map) {
+ SmsRecord smsRecord = new SmsRecord();
+ smsRecord.setId(IdWorker.getId());
+ smsRecord.setTel(map.get("userPhone").toString());
+ // 内容处理
+ String s = smsTemplate.getContent().replaceAll("\\{.+?\\}", "%s");
+ // 拼接内容
+ String arrString = time + "," +
+ map.get("waterName").toString() + "," +
+ MinConstant.fillWaterInfoUrl + "?" + "callId=" + map.get("callId") ;
+ // 格式转换
+ String format = String.format(s, arrString.split(","));
+ smsRecord.setContent(format);
+ smsRecord.setTemplateId(templateId);
+ smsRecord.setResultId(smsResult.getId());
+ smsRecord.setResponseStatus(resultComResult.getCode().toString());
+ smsRecord.setResponseMsg(resultComResult.getMsg());
+ // 返回
+ return smsRecord;
}
/**
@@ -449,22 +487,32 @@
/**
* 通过手机号获取外呼未接通已发短信通知的人员水库信息
- * @param phone 手机号码
+ * @param callId 呼叫id
* @return
*/
@Override
- public Object getCallNotConnectSmsNoticeInfo(String phone) {
+ public Object getCallNotConnectSmsNoticeInfo(String callId) {
+ Map<String, Object> map = new HashMap<>(2);
+ boolean flag = false;
List<Map<String, Object>> list = new ArrayList<>();
// 通过手机号查询外呼任务id
- String taskId = bladeRedis.get(MinConstant.fill_info_prefix + phone);
+ String taskId = bladeRedis.get(MinConstant.fill_info_prefix + callId);
// 判断
if (null!=taskId && !taskId.equals("")){
// 通过手机号和外呼任务id 查询水库人员信息
- list = smsTemplateService.getNotConnectPatrolPersonList(taskId,phone);
+ list = smsTemplateService.getNotConnectPatrolPersonList(taskId,callId);
+ // 查询是否填报
+ CallNotFillRecord callNotFillRecordInfo = outCallClient.getCallNotFillRecordInfo(callId);
+ if (callNotFillRecordInfo != null){
+ flag = true;
+ }
+ // 封装数据
+ map.put("list",list);
+ map.put("isFill",flag);
// 返回
- return list;
+ return map;
}
// 没有，已过期
- return list;
+ return map;
}
}
--
Gitblit v1.9.3