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 |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 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 26871d2..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;
 
@@ -98,4 +99,21 @@
 	 * @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