From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +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 | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 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..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 变量模板短信
@@ -38,12 +41,13 @@
/**
* 保存短信发送结果
- * @param smsResponse
+ * @param code
+ * @param msg
* @param request
* @param number
* @return
*/
- SmsResult saveSendResult(SmsResponseVO smsResponse, SMSSendRequest request, Integer number);
+ SmsResult saveSendResult(Long alarmRuleId,String code,String msg, SMSSendRequest request, Integer number);
/**
* 短信发送记录保存
@@ -54,13 +58,6 @@
* @return
*/
SmsRecord saveSendRecord(SMSSendRequest request,String code, String sendMsg, Long resultId);
-
- /**
- * 保存站内信记录信息
- * @param smsRequestTemplate
- * @return
- */
- Map<String, Object> saveInStationInfo(SmsRequestTemplate smsRequestTemplate);
/**
* 发送降雨短信
@@ -98,4 +95,36 @@
* @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);
+
+ /**
+ * 水库测点合并发送
+ * @param smsRequestTemplate
+ * @return
+ */
+ Map<String, Object> sendSignMsgMergeCd(SmsRequestTemplate smsRequestTemplate);
+
+ Map<String, Object> sendSignMsgMergeCdVideo(SmsRequestTemplate smsRequestTemplate);
}
--
Gitblit v1.9.3