From 877e64ea7a23472297ba93027210bb1d4c4a8c4f Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 01 Jul 2023 17:23:12 +0800
Subject: [PATCH] 短信导入发送数据返回提示修改，告警短信发送修改（新增市县水利部人员查询并放入短信中）
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsController.java | 92 +++-------------------------------------------
1 files changed, 6 insertions(+), 86 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsController.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsController.java
index a1032b1..917994c 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsController.java
@@ -12,6 +12,7 @@
import cn.gistack.alerts.sms.service.SmsService;
import cn.gistack.alerts.sms.util.SmsUtils;
import cn.gistack.alerts.sms.vo.SmsRequestTemplate;
+import cn.gistack.alerts.sms.vo.SmsResponseVO;
import cn.gistack.system.user.entity.User;
import cn.gistack.system.user.feign.IUserClient;
import com.alibaba.excel.EasyExcel;
@@ -63,7 +64,7 @@
// 发送操作
ComResult<SMSSendDataResult> resultComResult = SmsUtils.sendMsg(request);
// 记录发送记录操作
- SmsResult smsResult = smsService.saveSendResult(request, 1);
+ SmsResult smsResult = smsService.saveSendResult(resultComResult.getCode().toString(),resultComResult.getMsg(),request, 1);
if (null != smsResult){
smsService.saveSendRecord(request, resultComResult.getCode().toString(),resultComResult.getMsg(),smsResult.getId());
}
@@ -72,55 +73,6 @@
}
// 返回发送信息
return R.fail(400,"该手机号不存在!");
- }
-
-
- /**
- * 短信动态内容发送通用方法（仅支持 具名变量 {手机号码:11} 模式的模板）
- * request
- * @param smsRequest
- * @return
- */
- @PostMapping("/sendFixedContentByNamedVariableModel")
- public R sendFixedContentByNamedVariableModel(@RequestBody SmsRequest smsRequest){
- // 处理数据(可能是多个手机号情况)
- List<String> list = Arrays.asList(smsRequest.getPhone().split(","));
- // 保存发送结果
- // 记录保存
- SMSSendRequest request = new SMSSendRequest();
- request.setMessageContent(smsRequest.getContent());
- request.setTemplateId(smsRequest.getTemplateId());
- SmsResult smsResult = smsService.saveSendResult(request, list.size());
- // 遍历
- for (String phone : list) {
- DynSMSSendRequest dynSMSSendRequest = new DynSMSSendRequest();
- dynSMSSendRequest.setTemplateId(smsRequest.getTemplateId());
- dynSMSSendRequest.setDynData(smsRequest.getParams());
- // 手机号校验
- if(validator(phone)) {
- // 发送邮件短信
- ComResult<DynSMSSendDataResult> resultComResult = SmsUtils.dynSendMethod(dynSMSSendRequest);
- // 记录保存
- if (null != smsResult) {
- SMSSendRequest smsSendRequest = new SMSSendRequest();
- smsSendRequest.setUserNumber(phone);
- smsSendRequest.setMessageContent(smsRequest.getContent());
- smsSendRequest.setTemplateId(dynSMSSendRequest.getTemplateId());
- // 记录发送记录操作
- smsService.saveSendRecord(smsSendRequest, resultComResult.getCode().toString(),resultComResult.getMsg(),smsResult.getId());
- }
- }else {
- // 手机号有误记录
- // 记录保存
- SMSSendRequest smsSendRequest = new SMSSendRequest();
- smsSendRequest.setUserNumber(phone);
- smsSendRequest.setMessageContent(smsRequest.getContent());
- smsSendRequest.setTemplateId(dynSMSSendRequest.getTemplateId());
- // 记录发送记录操作
- smsService.saveSendRecord(smsSendRequest, "400","手机号错误未发送...",null);
- }
- }
- return R.status(true);
}
/**
@@ -142,7 +94,7 @@
// 发送操作
ComResult<SMSSendDataResult> resultComResult = SmsUtils.sendMsg(request);
// 记录发送记录操作
- SmsResult smsResult = smsService.saveSendResult(request, 1);
+ SmsResult smsResult = smsService.saveSendResult(resultComResult.getCode().toString(),resultComResult.getMsg(),request, 1);
if (null != smsResult){
smsService.saveSendRecord(request, resultComResult.getCode().toString(),resultComResult.getMsg(),smsResult.getId());
}
@@ -183,7 +135,7 @@
}
/**
- * 发送邮件提醒
+ * 发送待办提醒
* @param smsRequest
* @return
*/
@@ -192,40 +144,8 @@
// 处理数据(可能是多个手机号情况)
List<String> list = Arrays.asList(smsRequest.getPhone().split(","));
// 保存发送结果
- // 记录保存
- SMSSendRequest request = new SMSSendRequest();
- request.setMessageContent(smsRequest.getContent());
- request.setTemplateId("2431012165299");
- SmsResult smsResult = smsService.saveSendResult(request, list.size());
- // 遍历
- for (String phone : list) {
- DynSMSSendRequest dynSMSSendRequest = new DynSMSSendRequest();
- dynSMSSendRequest.setTemplateId("2431012165299");
- dynSMSSendRequest.setDynData(new String[][]{{"手机号码", "标题"}, {phone, smsRequest.getContent()}});
- // 手机号校验
- if(validator(phone)) {
- // 发送邮件短信
- ComResult<DynSMSSendDataResult> resultComResult = SmsUtils.dynSendMethod(dynSMSSendRequest);
- // 记录保存
- if (null != smsResult) {
- SMSSendRequest smsSendRequest = new SMSSendRequest();
- smsSendRequest.setUserNumber(phone);
- smsSendRequest.setMessageContent(smsRequest.getContent());
- smsSendRequest.setTemplateId(dynSMSSendRequest.getTemplateId());
- // 记录发送记录操作
- smsService.saveSendRecord(smsSendRequest, resultComResult.getCode().toString(),resultComResult.getMsg(),smsResult.getId());
- }
- }else {
- // 手机号有误记录
- // 记录保存
- SMSSendRequest smsSendRequest = new SMSSendRequest();
- smsSendRequest.setUserNumber(phone);
- smsSendRequest.setMessageContent(smsRequest.getContent());
- smsSendRequest.setTemplateId(dynSMSSendRequest.getTemplateId());
- // 记录发送记录操作
- smsService.saveSendRecord(smsSendRequest, "400","手机号错误未发送...",null);
- }
- }
+ smsService.sendEmailMsg(list,smsRequest);
+ // 返回
return R.status(true);
}
--
Gitblit v1.9.3