From a8cdd1843f64f2630efa273efbddd438e058ebb1 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Thu, 27 Jun 2024 14:19:42 +0800
Subject: [PATCH] 降雨告警新增雨量站信息写入，接口查询变更，短信记录新增告警规则绑定
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/SmsService.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 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 a21a3e2..aa1c17d 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;
@@ -19,6 +20,8 @@
* @date 2023-05-30
*/
public interface SmsService {
+
+ public ComResult<DynSMSSendDataResult> testSend(String tempId,String [][] strss);
/**
* 发送 xx 变量模板短信
@@ -44,7 +47,7 @@
* @param number
* @return
*/
- SmsResult saveSendResult(String code,String msg, SMSSendRequest request, Integer number);
+ SmsResult saveSendResult(Long alarmRuleId,String code,String msg, SMSSendRequest request, Integer number);
/**
* 短信发送记录保存
@@ -105,4 +108,23 @@
* @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);
+
+ /**
+ * 水库测点合并发送
+ * @param smsRequestTemplate
+ * @return
+ */
+ Map<String, Object> sendSignMsgMergeCd(SmsRequestTemplate smsRequestTemplate);
+
+ Map<String, Object> sendSignMsgMergeCdVideo(SmsRequestTemplate smsRequestTemplate);
}
--
Gitblit v1.9.3