From 800efd2012f9b86f0aad57ccd40eb3811b370c1b Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 29 Jun 2023 19:32:08 +0800
Subject: [PATCH] 外呼调整
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java | 154 +++++++++++++++++++++++++++++++--------------------
1 files changed, 93 insertions(+), 61 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 8fa81b3..4d0527e 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
@@ -11,6 +11,7 @@
import cn.gistack.alerts.sms.entity.SmsRecord;
import cn.gistack.alerts.sms.entity.SmsResult;
import cn.gistack.alerts.sms.entity.SmsTemplate;
+import cn.gistack.alerts.sms.excel.SendRainSmsExcel;
import cn.gistack.alerts.sms.service.ISmsRecordService;
import cn.gistack.alerts.sms.service.ISmsResultService;
import cn.gistack.alerts.sms.service.ISmsTemplateService;
@@ -20,6 +21,7 @@
import cn.gistack.common.cache.CacheNames;
import cn.gistack.sm.intelligentCall.entity.CallNotFillRecord;
import cn.gistack.sm.intelligentCall.feign.OutCallClient;
+import cn.gistack.sm.sjztmd.feign.IAttResManagePersonClient;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import org.jetbrains.annotations.NotNull;
@@ -31,6 +33,7 @@
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;
@@ -60,6 +63,9 @@
@Autowired
private OutCallClient outCallClient;
+
+ @Autowired
+ private IAttResManagePersonClient attResManagePersonClient;
/**
* 发送 xx 变量模板短信
@@ -338,66 +344,71 @@
@Override
public String sendSmsByOutCallNotConnect(String taskId,String time) {
String templateId = "2431012249882";
- // 查询当前任务未接通的人员信息（包含水库编号）
- List<Map<String, Object>> list = smsTemplateService.getNotConnectPatrolPersonList(taskId,null);
- SmsTemplate smsTemplate = smsTemplateService.getOne(new QueryWrapper<SmsTemplate>().eq("template_id", templateId));
- if (list.size()>0) {
- List<Map<String, Object>> newList = new ArrayList<>();
- // 比对
- for (Map<String, Object> map : list) {
- // 获取任务id
- String redisByTaskId = bladeRedis.get(MinConstant.is_send_prefix + map.get("callId").toString());
- // 如果为null,并且不能匹配，加入发送短信集合
- if (redisByTaskId == null || !StringUtil.equalsIgnoreCase(redisByTaskId, taskId)) {
- newList.add(map);
- }
- }
- if (newList.size() > 0) {
- // 组装短信数据
- StringBuilder builder = new StringBuilder();
- // 遍历
- for (Map<String, Object> map : newList) {
- builder.append(map.get("userPhone") + ",")
- .append(time + ",")
- .append(map.get("waterName") + ",")
- .append(MinConstant.fillWaterInfoUrl +"?" + "callId=" + map.get("callId"))
- .append(";");
- }
- String datas = builder.toString();
- String title = "手机号码,时间范围,水库名称,访问链接";
- String[] titleArr = title.split(",");
- 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, "");
- if (null != smsResult) {
- List<SmsRecord> smsRecordList = new ArrayList<>();
- Pattern compile = Pattern.compile("[^0-9]");
- Integer result = Integer.parseInt(compile.matcher(time).replaceAll("").trim());
- // 分钟或小时
- Long validTime = time.contains("分钟") ? 60L * result : 60L * 60 * result;
- // 遍历保存
- 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.fill_info_prefix + map.get("callId").toString(), taskId, validTime);
- // 封装短息记录数据
- SmsRecord smsRecord = getSmsRecord(time, templateId, smsTemplate, resultComResult, smsResult, map);
- // 加入集合
- smsRecordList.add(smsRecord);
+ // 查询符合当前时间外呼任务id集合
+ String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+ List<String> taskIdList = smsTemplateService.getTaskIdListByTime(format);
+ if (taskIdList.size()>0) {
+ // 查询当前任务未接通的人员信息（包含水库编号）
+ List<Map<String, Object>> list = smsTemplateService.getNotConnectPatrolPersonList(taskIdList, null);
+ SmsTemplate smsTemplate = smsTemplateService.getOne(new QueryWrapper<SmsTemplate>().eq("template_id", templateId));
+ if (list.size() > 0) {
+ List<Map<String, Object>> newList = new ArrayList<>();
+ // 比对
+ for (Map<String, Object> map : list) {
+ // 获取任务id
+ String redisByTaskId = bladeRedis.get(MinConstant.is_send_prefix + map.get("callId").toString());
+ // 如果为null,并且不能匹配，加入发送短信集合
+ if (redisByTaskId == null) {
+ newList.add(map);
}
- // 批量保存记录
- Integer count = smsRecordService.batchSaveSendRecord(smsRecordList);
- // 返回
- return count.toString();
+ }
+ if (newList.size() > 0) {
+ // 组装短信数据
+ StringBuilder builder = new StringBuilder();
+ // 遍历
+ for (Map<String, Object> map : newList) {
+ builder.append(map.get("userPhone") + ",")
+ .append(time + ",")
+ .append(map.get("waterName") + ",")
+ .append(MinConstant.fillWaterInfoUrl + "?" + "callId=" + map.get("callId"))
+ .append(";");
+ }
+ String datas = builder.toString();
+ String title = "手机号码,时间范围,水库名称,访问链接";
+ String[] titleArr = title.split(",");
+ 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, "");
+ if (null != smsResult) {
+ List<SmsRecord> smsRecordList = new ArrayList<>();
+ Pattern compile = Pattern.compile("[^0-9]");
+ Integer result = Integer.parseInt(compile.matcher(time).replaceAll("").trim());
+ // 分钟或小时
+ Long validTime = time.contains("分钟") ? 60L * result : 60L * 60 * result;
+ // 遍历保存
+ 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.fill_info_prefix + map.get("callId").toString(), taskId, validTime);
+ // 封装短息记录数据
+ SmsRecord smsRecord = getSmsRecord(time, templateId, smsTemplate, resultComResult, smsResult, map);
+ // 加入集合
+ smsRecordList.add(smsRecord);
+ }
+ // 批量保存记录
+ Integer count = smsRecordService.batchSaveSendRecord(smsRecordList);
+ // 返回
+ return count.toString();
+ }
}
}
}
@@ -496,11 +507,13 @@
boolean flag = false;
List<Map<String, Object>> list = new ArrayList<>();
// 通过手机号查询外呼任务id
- String taskId = bladeRedis.get(MinConstant.fill_info_prefix + callId);
+ String taskId = bladeRedis.get(MinConstant.is_send_prefix + callId);
// 判断
if (null!=taskId && !taskId.equals("")){
+ List<String> taskIdList = new ArrayList<>();
+ taskIdList.add(taskId);
// 通过手机号和外呼任务id 查询水库人员信息
- list = smsTemplateService.getNotConnectPatrolPersonList(taskId,callId);
+ list = smsTemplateService.getNotConnectPatrolPersonList(taskIdList,callId);
// 查询是否填报
CallNotFillRecord callNotFillRecordInfo = outCallClient.getCallNotFillRecordInfo(callId);
if (callNotFillRecordInfo != null){
@@ -515,4 +528,23 @@
// 没有，已过期
return map;
}
+
+ /**
+ * 导入表格发送降雨短信
+ * @param list 导入的excel 集合数据
+ * @param startTime 短信内容填报起始时间
+ * @param endTime 短信内容填报截止时间
+ * @return
+ */
+ @Override
+ public Object importSendRainSms(List<SendRainSmsExcel> list,String startTime,String endTime) {
+ // 获取水库个数
+ Integer size = list.size();
+ // 通过水库代码获取巡查责任人及技术责任人手机号
+// Set<String> personList = attResManagePersonClient.getPersonListByWaterCodeList(list);
+
+
+ // 返回
+ return null;
+ }
}
--
Gitblit v1.9.3