From abaf72a337248943e037b02d069c094e2ee5d60b Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 05 Jul 2023 14:46:52 +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 | 213 +++++++++++++++++++++++++++++++----------------------
1 files changed, 125 insertions(+), 88 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 ecfa27c..4f6874f 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
@@ -26,12 +26,14 @@
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 org.jetbrains.annotations.NotNull;
import org.springblade.core.redis.cache.BladeRedis;
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;
@@ -99,6 +101,70 @@
return list;
}
+// /**
+// * 发送 具名 变量模板短信（告警定制）
+// * @param smsRequestTemplate
+// * @return
+// */
+// @Override
+// public Map<String, Object> sendSignMsg(SmsRequestTemplate smsRequestTemplate) {
+// // 取出数据
+// SMSSendRequest request = new SMSSendRequest();
+// SmsTemplate smsTemplate = smsRequestTemplate.getSmsTemplate();
+// request.setTemplateId(smsTemplate.getTemplateId());
+// List<List<String>> templateContent = smsRequestTemplate.getTemplateContent();
+// // 先保存结果记录
+// SmsResult smsResult = saveSendResult(null,null,request, templateContent.size());
+// List<SmsRecord> smsRecordList = new ArrayList<>();
+// // 遍历处理
+// for (List<String> list : templateContent) {
+// AlarmRecordDetail alarmRecordDetail = new AlarmRecordDetail();
+// alarmRecordDetail.setReservoirNumber(list.get(0));
+// alarmRecordDetail.setAlarmRecordId(Long.parseLong(list.get(list.size() - 1)));
+// alarmRecordDetail.setAlarmMode("短信");
+// // 删除 最后一个 告警记录id
+// list.remove(list.size() - 1);
+// // 删除 0 水库编码
+// list.remove(0);
+// // 转换字符串
+// String row = String.join(",", list);
+// // 组装数据
+// String[][] dyns = new String[][]{{smsRequestTemplate.getTitle()}, {row}};
+// //请求参数
+// ComResult<DynSMSSendDataResult> resultComResult = sendDynSMSSendDataResultComResult(smsTemplate.getTemplateId(), dyns);
+//
+// SmsRecord smsRecord = new SmsRecord();
+// if (null != smsResult){
+// alarmRecordDetail.setPhone(list.get(0));
+// // 设置手机号
+// request.setUserNumber(list.get(0));
+// // 内容处理
+// String s = smsTemplate.getContent().replaceAll("\\{.+?\\}", "%s");
+// // 短信内容拼接（完成发送的结果信息）
+// // 需要删除最前面的手机号
+// list.remove(0);
+// // 格式转换
+// String format = String.format(s, list.toArray());
+// // 设置内容
+// request.setMessageContent(format);
+// // 保存短信发送记录
+// smsRecord = saveSendRecord(request, resultComResult.getCode().toString(), resultComResult.getMsg(), smsResult.getId());
+// if (null != smsRecord){
+// alarmRecordDetail.setAlarmContent(format);
+// alarmRecordDetail.setSendRecordId(smsRecord.getId());
+// alarmRecordDetail.setCreateTime(new Date());
+// // 保存告警记录详情信息
+// boolean save = alarmRecordDetailService.save(alarmRecordDetail);
+// }
+// }
+// smsRecordList.add(smsRecord);
+// }
+// Map<String, Object> map = new HashMap<>(2);
+// map.put("smsRecord",smsRecordList.size());
+// // 返回
+// return map;
+// }
+
/**
* 发送 具名 变量模板短信（告警定制）
* @param smsRequestTemplate
@@ -111,83 +177,46 @@
SmsTemplate smsTemplate = smsRequestTemplate.getSmsTemplate();
request.setTemplateId(smsTemplate.getTemplateId());
List<List<String>> templateContent = smsRequestTemplate.getTemplateContent();
- // 先保存结果记录
- SmsResult smsResult = saveSendResult(null,null,request, templateContent.size());
- List<SmsRecord> smsRecordList = new ArrayList<>();
- // 遍历处理
- for (List<String> list : templateContent) {
- AlarmRecordDetail alarmRecordDetail = new AlarmRecordDetail();
- alarmRecordDetail.setReservoirNumber(list.get(0));
- alarmRecordDetail.setAlarmRecordId(Long.parseLong(list.get(list.size() - 1)));
- alarmRecordDetail.setAlarmMode("短信");
- // 删除 最后一个 告警记录id
- list.remove(list.size() - 1);
- // 删除 0 水库编码
- list.remove(0);
- // 转换字符串
- String row = String.join(",", list);
- // 组装数据
- String[][] dyns = new String[][]{{smsRequestTemplate.getTitle()}, {row}};
- //请求参数
- ComResult<DynSMSSendDataResult> resultComResult = sendDynSMSSendDataResultComResult(smsTemplate.getTemplateId(), dyns);
-
- SmsRecord smsRecord = new SmsRecord();
- if (null != smsResult){
- alarmRecordDetail.setPhone(list.get(0));
- // 设置手机号
- request.setUserNumber(list.get(0));
- // 内容处理
- String s = smsTemplate.getContent().replaceAll("\\{.+?\\}", "%s");
- // 短信内容拼接（完成发送的结果信息）
- // 需要删除最前面的手机号
- list.remove(0);
- // 格式转换
- String format = String.format(s, list.toArray());
- // 设置内容
- request.setMessageContent(format);
- // 保存短信发送记录
- smsRecord = saveSendRecord(request, resultComResult.getCode().toString(), resultComResult.getMsg(), smsResult.getId());
- if (null != smsRecord){
- alarmRecordDetail.setAlarmContent(format);
- alarmRecordDetail.setSendRecordId(smsRecord.getId());
- alarmRecordDetail.setCreateTime(new Date());
- // 保存告警记录详情信息
- boolean save = alarmRecordDetailService.save(alarmRecordDetail);
- }
- }
- smsRecordList.add(smsRecord);
+ // 判断 templateContent 个数，个数超过1000 需要分段发送短信
+ List<List<List<String>>> lists = Lists.partition(templateContent, 1000);
+ int number = 0;
+ for (List<List<String>> list : lists) {
+ // 临时保存告警记录用
+ List<List<String>> templateList = getAlarmList(list);
+ // 批量发送短信
+ Map<String, Object> map = batchSendAlertsSms(smsRequestTemplate.getSmsTemplate(), list);
+ 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);
+ // 保存详情记录（短信详情，告警详情）
+ List<SmsRecord> smsRecordList = saveAlertsAndSmsDetail(smsResult,resultComResult,smsRequestTemplate.getSmsTemplate(), templateList,request);
+ // number 累加
+ number += smsRecordList.size();
}
- Map<String, Object> map = new HashMap<>(2);
- map.put("smsRecord",smsRecordList.size());
+ // 设置返回数据
+ Map<String, Object> params = new HashMap<>(1);
+ params.put("sendNumber",number);
// 返回
- return map;
+ return params;
}
/**
- * 发送 具名 变量模板短信（告警定制）
- * @param smsRequestTemplate
+ * 获取用户告警的集合
+ * @param list
* @return
*/
-// @Override
-// public Map<String, Object> sendSignMsg(SmsRequestTemplate smsRequestTemplate) {
-// // 取出数据
-// SMSSendRequest request = new SMSSendRequest();
-// SmsTemplate smsTemplate = smsRequestTemplate.getSmsTemplate();
-// request.setTemplateId(smsTemplate.getTemplateId());
-// // 批量发送短信
-// Map<String, Object> map = batchSendAlertsSms(smsRequestTemplate.getSmsTemplate(), smsRequestTemplate.getTemplateContent());
-// 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, smsRequestTemplate.getTemplateContent().size()-count);
-// // 保存详情记录（短信详情，告警详情）
-//// List<SmsRecord> smsRecordList = saveAlertsAndSmsDetail(smsResult,resultComResult,smsRequestTemplate.getSmsTemplate(), smsRequestTemplate.getTemplateContent(),request);
-// // 设置返回数据
-// Map<String, Object> params = new HashMap<>(2);
-//// params.put("smsRecord",smsRecordList.size());
-// // 返回
-// return params;
-// }
+ private List<List<String>> getAlarmList(List<List<String>> list) {
+ List<List<String>> arrayList = new ArrayList<>();
+ // 值引用
+ for (List<String> stringList : list) {
+ List<String> child = new ArrayList<>();
+ child.addAll(stringList);
+ arrayList.add(child);
+ }
+ // 返回
+ return arrayList;
+ }
/**
* 保存详情记录（短信详情，告警详情）
@@ -365,22 +394,22 @@
for (String phone : phones) {
hashSet.add(phone);
}
- // 批量发送短信
- Map<String, Object> batchSendSmsMap = batchSendSms(hashSet, titleArr, data, smsTemplate,errPhones);
- ComResult<DynSMSSendDataResult> resultComResult = (ComResult<DynSMSSendDataResult>)batchSendSmsMap.get("resultComResult");
- errPhones = (List<String>) batchSendSmsMap.get("errPhones");
+ // 分割
+ List<List<String>> partition = Lists.partition(new ArrayList<>(hashSet), 1000);
+ int errNumber = 0;
+ // 遍历
+ for (List<String> list : partition) {
+ // 批量发送短信
+ Map<String, Object> batchSendSmsMap = batchSendSms(new HashSet<>(list), titleArr, data, smsTemplate,errPhones);
+ errPhones = (List<String>) batchSendSmsMap.get("errPhones");
+ errNumber += errPhones.size();
+ }
// 计算差值
Integer diff = phones.size() - hashSet.size();
- if (resultComResult.getCode()==0){
- String successMsg = "发送成功!共提交号码 "+phones.size()+" 个，其中重复号码 "+diff+" 个，错误号码 "
- +errPhones.size()+" 个，发送成功号码 "+ hashSet.size() + " 个。";
- // 返回
- return R.data(200,successMsg,null);
- }
- String errorMsg = "发送失败!共提交号码 "+phones.size()+" 个，其中重复号码 "+diff+" 个，错误号码 "+errPhones.size()+
- " 个，发送异常号码 "+ hashSet.size()+" 个，异常原因" + resultComResult.getMsg() + "。";
+ String successMsg = "发送成功!共提交号码 "+phones.size()+" 个，其中重复号码 "+diff+" 个，错误号码 "
+ + errNumber +" 个，发送成功号码 "+ (hashSet.size()-errNumber) + " 个。";
// 返回
- return R.data(400,errorMsg,null);
+ return R.data(200,successMsg,null);
}
@@ -630,12 +659,20 @@
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");
+ // 分割
+ List<List<String>> partition = Lists.partition(new ArrayList<>(personList), 1000);
+ int errNumber = 0;
+ ComResult<DynSMSSendDataResult> resultComResult = new ComResult();
+ // 遍历
+ for (List<String> list1 : partition) {
+ // 批量发送短信
+ Map<String, Object> batchSendSmsMap = batchSendSms(new HashSet<>(list1), titleArr, param, smsTemplate,errPhones);
+ resultComResult = (ComResult<DynSMSSendDataResult>)batchSendSmsMap.get("resultComResult");
+ errPhones = (List<String>) batchSendSmsMap.get("errPhones");
+ errNumber += errPhones.size();
+ }
// 计算差值
- Integer diff = personList.size() - errPhones.size();
+ Integer diff = personList.size() - errNumber;
if (resultComResult.getCode()==0){
String successMsg = "发送成功!共导入水库个数 "+ size +" 个，其中发送号码 "+ diff + " 个。";
// 返回
--
Gitblit v1.9.3