From f2bfb4490106abcb41e3c7e09159e89a0f7219c0 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 13 Jul 2023 16:07:26 +0800
Subject: [PATCH] 水位缺失预警调整，重复水库进行去重，合并水库最多30个发送

---
 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/SmsService.java |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 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 7590e20..a21a3e2 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
@@ -38,12 +38,13 @@
 
 	/**
 	 * 保存短信发送结果
-	 * @param smsResponse
+	 * @param code
+	 * @param msg
 	 * @param request
 	 * @param number
 	 * @return
 	 */
-	SmsResult saveSendResult(SmsResponseVO smsResponse, SMSSendRequest request, Integer number);
+	SmsResult saveSendResult(String code,String msg, SMSSendRequest request, Integer number);
 
 	/**
 	 * 短信发送记录保存
@@ -54,13 +55,6 @@
 	 * @return
 	 */
 	SmsRecord saveSendRecord(SMSSendRequest request,String code, String sendMsg, Long resultId);
-
-	/**
-	 * 保存站内信记录信息
-	 * @param smsRequestTemplate
-	 * @return
-	 */
-	Map<String, Object> saveInStationInfo(SmsRequestTemplate smsRequestTemplate);
 
 	/**
 	 * 发送降雨短信
@@ -98,4 +92,17 @@
 	 * @param list
 	 */
 	void sendEmailMsg(List<String> list, SmsRequest smsRequest);
+
+	/**
+	 * 发送合并水库名短信
+	 * @param smsRequestTemplate
+	 */
+	void sendMergeSignMsg(SmsRequestTemplate smsRequestTemplate);
+
+	/**
+	 * 批量发送短信（集合数据）
+	 * @param map (保护参数 1：短信模板id  2:数据集合 list<Map<String,Object>>)
+	 * @return
+	 */
+    Object batchSendSms(Map<String, Object> map);
 }

--
Gitblit v1.9.3