From 3e27630f0102a9fa590ce029df0994535eb86bd6 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 17 Jun 2023 16:37:27 +0800
Subject: [PATCH] 外呼短信通知逻辑修改
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsController.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 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 4d0dffe..e8e7385 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;
@@ -72,7 +73,7 @@
/**
* 短信动态内容发送通用方法（仅支持 具名变量 {手机号码:11} 模式的模板）
- * request 必须包含手机号,模板id,拼接好的内容
+ * request
* @param smsRequest
* @return
*/
@@ -254,7 +255,7 @@
/**
- * 发送 具名 变量模板短信
+ * 发送 具名 变量模板短信（告警定制）
* @param smsRequest 发送对象
* @return
*/
@@ -262,4 +263,25 @@
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));
+ }
+
+ /**
+ * 通过手机号获取外呼未接通已发短信通知的人员水库信息
+ * @param callId 呼叫id
+ * @return
+ */
+ @GetMapping("/getCallNotConnectSmsNoticeInfo")
+ public R getCallNotConnectSmsNoticeInfo(String callId){
+ return R.data(smsService.getCallNotConnectSmsNoticeInfo(callId));
+ }
}
--
Gitblit v1.9.3