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/SmsService.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/SmsService.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/SmsService.java
index 15f6000..1bfef26 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/SmsService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/SmsService.java
@@ -6,6 +6,7 @@
 import cn.gistack.alerts.sms.vo.SmsRequestTemplate;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 短信发送服务接口
@@ -24,7 +25,7 @@
 					 List<String> phoneNumbers);
 
 	/**
-	 * 发送 具名 变量模板短信
+	 * 发送 具名 变量模板短信 (告警定制)
 	 * @param smsRequestTemplate
 	 * @return
 	 */
@@ -46,5 +47,19 @@
 	 * @param resultId
 	 * @return
 	 */
-	SmsRecord saveSendRecord(SMSSendRequest request,Integer code, String sendMsg, Long resultId);
+	SmsRecord saveSendRecord(SMSSendRequest request,String code, String sendMsg, Long resultId);
+
+	/**
+	 * 保存站内信记录信息
+	 * @param smsRequestTemplate
+	 * @return
+	 */
+	Map<String, Object> saveInStationInfo(SmsRequestTemplate smsRequestTemplate);
+
+	/**
+	 * 发送降雨短信
+	 * @param params 发送对象
+	 * @return
+	 */
+	Object sendSignRainMsg(Map<String, Object> params);
 }

--
Gitblit v1.9.3