From dc5a0d769ba6c352d89c04c67b66ed1869ec1049 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 01 Jun 2023 17:59:52 +0800
Subject: [PATCH] 短信发送修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/impl/SmsServiceImpl.java | 149 +++++++++++++++++++++++++++++++------------------
1 files changed, 95 insertions(+), 54 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/impl/SmsServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/impl/SmsServiceImpl.java
index a664a43..8af6ee2 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/impl/SmsServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/impl/SmsServiceImpl.java
@@ -5,18 +5,20 @@
import cn.com.flaginfo.sdk.cmc.api.sms.dynsend.DynSMSSendRequest;
import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendDataResult;
import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendRequest;
+import cn.gistack.sm.alarmRule.entity.AlarmRecordDetail;
+import cn.gistack.sm.alarmRule.service.AlarmRecordDetailService;
import cn.gistack.sm.sms.entity.SmsRecord;
import cn.gistack.sm.sms.entity.SmsResult;
+import cn.gistack.sm.sms.entity.SmsTemplate;
import cn.gistack.sm.sms.service.ISmsRecordService;
import cn.gistack.sm.sms.service.ISmsResultService;
import cn.gistack.sm.sms.service.SmsService;
import cn.gistack.sm.sms.util.SmsUtils;
+import cn.gistack.sm.sms.vo.SmsRequestTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
/**
* 短信发送服务实现层
@@ -28,6 +30,9 @@
@Autowired
private ISmsRecordService smsRecordService;
+
+ @Autowired
+ private AlarmRecordDetailService alarmRecordDetailService;
@Autowired
private ISmsResultService smsResultService;
@@ -61,70 +66,106 @@
/**
* 发送 具名 变量模板短信
- * @param title 具名变量头
- * @param content 内容对象
+ * @param smsRequestTemplate
* @return
*/
@Override
- public Object sendSignMsg(String title, String content, SMSSendRequest request,Integer type) {
- if (type==1){
- String[] rows = content.split(";");
- // 先保存结果记录
- SmsResult smsResult = saveSendResult(request, rows.length);
- List<SmsRecord> list = new ArrayList<>();
- // 遍历发送短信
- for (String row : rows) {
- String[][] dyns = new String[][]{{title}, {row}};
- //请求参数
- DynSMSSendRequest sendRequest = new DynSMSSendRequest();
- sendRequest.setTemplateId(request.getTemplateId());
- sendRequest.setDynData(dyns);
- // 发送
- ComResult<DynSMSSendDataResult> resultComResult = SmsUtils.dynSendMethod(sendRequest);
-
- SmsRecord smsRecord = new SmsRecord();
- if (null != smsResult){
- // 保存记录
- smsRecord = saveSmsRecord(request, resultComResult.getCode(), resultComResult.getMsg(), smsResult.getId());
- }
- list.add(smsRecord);
- }
- Map<String, Object> map = new HashMap<>(2);
- map.put("smsRecord",list);
- map.put("smsResult",smsResult);
- // 返回
- return map;
- }
- if (type==2){
- String[] titleArr = title.split(",");
- String[] rows = content.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;
- }
+ public 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(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}};
//请求参数
DynSMSSendRequest sendRequest = new DynSMSSendRequest();
- sendRequest.setTemplateId(request.getTemplateId());
+ sendRequest.setTemplateId(smsTemplate.getTemplateId());
sendRequest.setDynData(dyns);
// 发送
ComResult<DynSMSSendDataResult> resultComResult = SmsUtils.dynSendMethod(sendRequest);
- // 先保存结果记录
- SmsResult smsResult = saveSendResult(request, rows.length);
+
SmsRecord smsRecord = new SmsRecord();
if (null != smsResult){
+ // 设置手机号
+ 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 = saveSmsRecord(request, resultComResult.getCode(), resultComResult.getMsg(), smsResult.getId());
+ if (null != smsRecord){
+ alarmRecordDetail.setAlarmContent(format);
+ alarmRecordDetail.setSendRecordId(smsRecord.getId());
+ alarmRecordDetail.setCreateTime(new Date());
+ // 保存告警记录详情信息
+ boolean save = alarmRecordDetailService.save(alarmRecordDetail);
+ }
}
- Map<String, Object> map = new HashMap<>(2);
- map.put("smsRecord",smsRecord);
- map.put("smsResult",smsResult);
- // 返回
- return map;
+ smsRecordList.add(smsRecord);
}
- return null;
+ Map<String, Object> map = new HashMap<>(2);
+ map.put("smsRecord",smsRecordList);
+ map.put("smsResult",smsResult);
+ // 返回
+ return map;
+ }
+
+
+ /**
+ * 发送 具名 变量模板短信--批量一次发送
+ * @param title 具名变量头
+ * @return
+ */
+ public Object sendSignMsg(String title, String datas, SMSSendRequest request, Integer type, SmsTemplate smsTemplate) {
+ 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;
+ }
+ //请求参数
+ DynSMSSendRequest sendRequest = new DynSMSSendRequest();
+ sendRequest.setTemplateId(request.getTemplateId());
+ sendRequest.setDynData(dyns);
+ // 发送
+ ComResult<DynSMSSendDataResult> resultComResult = SmsUtils.dynSendMethod(sendRequest);
+ // 先保存结果记录
+ SmsResult smsResult = saveSendResult(request, rows.length);
+ SmsRecord smsRecord = new SmsRecord();
+ if (null != smsResult){
+ // 保存记录
+ smsRecord = saveSmsRecord(request, resultComResult.getCode(), resultComResult.getMsg(), smsResult.getId());
+ }
+ Map<String, Object> map = new HashMap<>(2);
+ map.put("smsRecord",smsRecord);
+ map.put("smsResult",smsResult);
+ // 返回
+ return map;
}
/**
--
Gitblit v1.9.3