From c7f24dde247a95facd2f8d3659ed9309139d1088 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 06 Jun 2023 20:00:33 +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 | 93 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 80 insertions(+), 13 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 e1b173e..fb52c50 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
@@ -15,10 +15,14 @@
import cn.gistack.alerts.sms.service.SmsService;
import cn.gistack.alerts.sms.util.SmsUtils;
import cn.gistack.alerts.sms.vo.SmsRequestTemplate;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* 短信发送服务实现层
@@ -65,7 +69,7 @@
}
/**
- * 发送 具名 变量模板短信
+ * 发送 具名 变量模板短信（告警定制）
* @param smsRequestTemplate
* @return
*/
@@ -194,12 +198,34 @@
}
/**
- * 发送 具名 变量模板短信--批量一次发送
- * @param title 具名变量头
+ * 发送降雨短信--批量一次发送
+ * @param params 具名变量头
* @return
*/
- public Object sendSignMsg(String title, String datas, SMSSendRequest request, Integer type, SmsTemplate smsTemplate) {
- String[] titleArr = title.split(",");
+ @Override
+ public Object sendSignRainMsg(Map<String, Object> params) {
+ String[] titleArr = params.get("title").toString().split(",");
+ String data = params.get("data").toString();
+ String templateId = params.get("templateId").toString();
+ String content = params.get("content").toString();
+ List<String> phones = (List<String>)params.get("phones");
+ List<String> errPhones = new ArrayList<>();
+ // 手机号去重
+ Set<String> hashSet = new HashSet<>();
+ for (String phone : phones) {
+ hashSet.add(phone);
+ }
+ StringBuilder builder = new StringBuilder();
+ // 变量
+ for (String phone : hashSet) {
+ if (validator(phone)){
+ builder.append(phone+","+data).append(";");
+ }else {
+ // 异常手机号
+ errPhones.add(phone);
+ }
+ }
+ String datas = builder.toString();
String[] rows = datas.split(";");
String[][] dyns = new String[rows.length + 1][titleArr.length];
dyns[0] = titleArr;
@@ -210,22 +236,45 @@
}
//请求参数
DynSMSSendRequest sendRequest = new DynSMSSendRequest();
- sendRequest.setTemplateId(request.getTemplateId());
+ 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);
- SmsRecord smsRecord = new SmsRecord();
if (null != smsResult){
- // 保存记录
- smsRecord = saveSendRecord(request, resultComResult.getCode().toString(), resultComResult.getMsg(), smsResult.getId());
+ List<SmsRecord> list = new ArrayList<>();
+ // 遍历保存
+ for (String phone : hashSet) {
+ SmsRecord smsRecord = new SmsRecord();
+ smsRecord.setId(IdWorker.getId());
+ smsRecord.setTel(phone);
+ smsRecord.setContent(content);
+ smsRecord.setTemplateId(templateId);
+ smsRecord.setResultId(smsResult.getId());
+ smsRecord.setResponseStatus(resultComResult.getCode().toString());
+ smsRecord.setResponseMsg(resultComResult.getMsg());
+ // 加入集合
+ list.add(smsRecord);
+ }
+ // 批量保存记录
+ smsRecordService.batchSaveSendRecord(list);
}
- Map<String, Object> map = new HashMap<>(2);
- map.put("smsRecord",smsRecord);
- map.put("smsResult",smsResult);
+ 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() + "。";
// 返回
- return map;
+ return R.data(400,errorMsg,null);
}
@@ -274,5 +323,23 @@
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;
+ }
+
}
--
Gitblit v1.9.3