From a0cead06018799c013305ccfcc2f4b95a564af45 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 10 Jul 2023 10:07:26 +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 | 177 ++++++++++++++++++++++++++--------------------------------
1 files changed, 80 insertions(+), 97 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..cd7549f 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
@@ -9,6 +9,7 @@
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.dto.DynSMSSendRequestDTO;
import cn.gistack.alerts.sms.entity.SmsRecord;
import cn.gistack.alerts.sms.entity.SmsRequest;
import cn.gistack.alerts.sms.entity.SmsResult;
@@ -26,12 +27,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;
@@ -100,7 +103,7 @@
}
/**
- * 发送 具名 变量模板短信（告警定制）
+ * 发送 具名 变量模板短信（告警定制）-- 动态发送-一个一个发
* @param smsRequestTemplate
* @return
*/
@@ -124,10 +127,12 @@
list.remove(list.size() - 1);
// 删除 0 水库编码
list.remove(0);
- // 转换字符串
- String row = String.join(",", list);
// 组装数据
- String[][] dyns = new String[][]{{smsRequestTemplate.getTitle()}, {row}};
+ String row = String.join(",", list);
+ String[] titleArr = smsRequestTemplate.getTitle().split(",");
+ String[][] dyns = new String[2][titleArr.length];
+ dyns[0] = titleArr;
+ dyns[1] = row.split(",");
//请求参数
ComResult<DynSMSSendDataResult> resultComResult = sendDynSMSSendDataResultComResult(smsTemplate.getTemplateId(), dyns);
@@ -163,31 +168,58 @@
return map;
}
- /**
- * 发送 具名 变量模板短信（告警定制）
- * @param smsRequestTemplate
- * @return
- */
+// /**
+// * 发送 具名 变量模板短信（告警定制）--动态批量发送
+// * @param smsRequestTemplate
+// * @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);
+// List<List<String>> templateContent = smsRequestTemplate.getTemplateContent();
+// // 判断 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> params = new HashMap<>(2);
-//// params.put("smsRecord",smsRecordList.size());
+// Map<String, Object> params = new HashMap<>(1);
+// params.put("sendNumber",number);
// // 返回
// return params;
// }
+
+ /**
+ * 获取用户告警的集合
+ * @param list
+ * @return
+ */
+ 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;
+ }
/**
* 保存详情记录（短信详情，告警详情）
@@ -287,66 +319,6 @@
}
/**
- * 保存站内信记录信息
- * @param smsRequestTemplate
- * @return
- */
- @Override
- public Map<String, Object> saveInStationInfo(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("站内信");
- // 未读
- alarmRecordDetail.setStatus(1);
- // 删除 最后一个 告警记录id
- list.remove(list.size() - 1);
- // 删除 0 水库编码
- list.remove(0);
-
- 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, "", "", 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);
- map.put("smsResult",smsResult);
- // 返回
- return map;
- }
-
- /**
* 发送降雨短信--批量一次发送
* @param params 具名变量头
* @return
@@ -365,22 +337,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);
}
@@ -535,7 +507,10 @@
*/
private ComResult<DynSMSSendDataResult> sendDynSMSSendDataResultComResult(String templateId, String[][] dyns) {
//请求参数
+// DynSMSSendRequestDTO sendRequest = new DynSMSSendRequestDTO();
DynSMSSendRequest sendRequest = new DynSMSSendRequest();
+ // 相同号码，不同内容，不需要去重处理--暂时不用，等短信厂家通知，未上线 2023.07.07
+// sendRequest.setDuplicateRemoval("1");
sendRequest.setTemplateId(templateId);
sendRequest.setDynData(dyns);
// 发送
@@ -630,12 +605,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