From c8b03d3da4e29fc3fb9a42ca157738256c331a00 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 13 Mar 2024 13:55:08 +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 |   36 +++++++++++++++++++++++++++---------
 1 files changed, 27 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..9e02166 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
@@ -7,6 +7,7 @@
 import cn.gistack.alerts.sms.entity.SmsRequest;
 import cn.gistack.alerts.sms.entity.SmsResult;
 import cn.gistack.alerts.sms.excel.SendRainSmsExcel;
+import cn.gistack.alerts.sms.excel.SendSmsExcel;
 import cn.gistack.alerts.sms.vo.SmsRequestTemplate;
 import cn.gistack.alerts.sms.vo.SmsResponseVO;
 
@@ -38,12 +39,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 +56,6 @@
 	 * @return
 	 */
 	SmsRecord saveSendRecord(SMSSendRequest request,String code, String sendMsg, Long resultId);
-
-	/**
-	 * 保存站内信记录信息
-	 * @param smsRequestTemplate
-	 * @return
-	 */
-	Map<String, Object> saveInStationInfo(SmsRequestTemplate smsRequestTemplate);
 
 	/**
 	 * 发送降雨短信
@@ -98,4 +93,27 @@
 	 * @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);
+
+	/**
+	 * 导入表格发送预警短信
+	 * @param list 集合数据
+	 * @param templateId 模板id
+	 * @param param 通用参数
+	 * @param content 发送内容
+	 * @return
+	 */
+	Object importSendSms(List<SendSmsExcel> list,String templateId,String param, String content);
 }

--
Gitblit v1.9.3