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/controller/SmsController.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 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 75aac73..1c5e7c7 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
@@ -19,6 +19,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.List;
+import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static cn.gistack.common.cache.CacheNames.PHONE_KEY;
@@ -60,7 +61,7 @@
// 记录发送记录操作
SmsResult smsResult = smsService.saveSendResult(request, 1);
if (null != smsResult){
- smsService.saveSendRecord(request, resultComResult.getCode(),resultComResult.getMsg(),smsResult.getId());
+ smsService.saveSendRecord(request, resultComResult.getCode().toString(),resultComResult.getMsg(),smsResult.getId());
}
// 返回发送信息
return R.data(resultComResult);
@@ -72,7 +73,7 @@
/**
* 短信动态内容发送通用方法（仅支持 具名变量 {手机号码:11} 模式的模板）
- * request 必须包含手机号,模板id,拼接好的内容
+ * request
* @param smsRequest
* @return
*/
@@ -102,7 +103,7 @@
smsSendRequest.setMessageContent(smsRequest.getContent());
smsSendRequest.setTemplateId(dynSMSSendRequest.getTemplateId());
// 记录发送记录操作
- smsService.saveSendRecord(smsSendRequest, resultComResult.getCode(),resultComResult.getMsg(),smsResult.getId());
+ smsService.saveSendRecord(smsSendRequest, resultComResult.getCode().toString(),resultComResult.getMsg(),smsResult.getId());
}
}else {
// 手机号有误记录
@@ -112,7 +113,7 @@
smsSendRequest.setMessageContent(smsRequest.getContent());
smsSendRequest.setTemplateId(dynSMSSendRequest.getTemplateId());
// 记录发送记录操作
- smsService.saveSendRecord(smsSendRequest, 400,"手机号错误未发送...",null);
+ smsService.saveSendRecord(smsSendRequest, "400","手机号错误未发送...",null);
}
}
return R.status(true);
@@ -139,7 +140,7 @@
// 记录发送记录操作
SmsResult smsResult = smsService.saveSendResult(request, 1);
if (null != smsResult){
- smsService.saveSendRecord(request, resultComResult.getCode(),resultComResult.getMsg(),smsResult.getId());
+ smsService.saveSendRecord(request, resultComResult.getCode().toString(),resultComResult.getMsg(),smsResult.getId());
}
// 保存验证码到 redis
saveCodeForRedis(request.getUserNumber(), randNumber);
@@ -226,7 +227,7 @@
smsSendRequest.setMessageContent(smsRequest.getContent());
smsSendRequest.setTemplateId(dynSMSSendRequest.getTemplateId());
// 记录发送记录操作
- smsService.saveSendRecord(smsSendRequest, resultComResult.getCode(),resultComResult.getMsg(),smsResult.getId());
+ smsService.saveSendRecord(smsSendRequest, resultComResult.getCode().toString(),resultComResult.getMsg(),smsResult.getId());
}
}else {
// 手机号有误记录
@@ -236,7 +237,7 @@
smsSendRequest.setMessageContent(smsRequest.getContent());
smsSendRequest.setTemplateId(dynSMSSendRequest.getTemplateId());
// 记录发送记录操作
- smsService.saveSendRecord(smsSendRequest, 400,"手机号错误未发送...",null);
+ smsService.saveSendRecord(smsSendRequest, "400","手机号错误未发送...",null);
}
}
return R.status(true);
@@ -254,7 +255,7 @@
/**
- * 发送 具名 变量模板短信
+ * 发送 具名 变量模板短信（告警定制）
* @param smsRequest 发送对象
* @return
*/
@@ -262,4 +263,15 @@
public R sendSignMsg(@RequestBody SmsRequestTemplate smsRequest){
return R.data(smsService.sendSignMsg(smsRequest));
}
+
+
+ /**
+ * 发送降雨短信
+ * @param params 发送对象
+ * @return
+ */
+ @PostMapping("/sendSignRainMsg")
+ public R sendSignRainMsg(@RequestBody Map<String,Object> params){
+ return R.data(smsService.sendSignRainMsg(params));
+ }
}
--
Gitblit v1.9.3