From 1581ef5a1b4e24ecf21fd95ee6e4b9bd4085b2da Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 30 Jun 2023 17:48:26 +0800
Subject: [PATCH] 短信发送记录保存修改

---
 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/SmsService.java |   49 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 46 insertions(+), 3 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 fd52a3b..7590e20 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
@@ -1,9 +1,14 @@
 package cn.gistack.alerts.sms.service;
 
+import cn.com.flaginfo.sdk.cmc.api.result.ComResult;
+import cn.com.flaginfo.sdk.cmc.api.sms.dynsend.DynSMSSendDataResult;
 import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendRequest;
 import cn.gistack.alerts.sms.entity.SmsRecord;
+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.vo.SmsRequestTemplate;
+import cn.gistack.alerts.sms.vo.SmsResponseVO;
 
 import java.util.List;
 import java.util.Map;
@@ -25,19 +30,20 @@
 					 List<String> phoneNumbers);
 
 	/**
-	 * 发送 具名 变量模板短信
+	 * 发送 具名 变量模板短信 （告警定制）
 	 * @param smsRequestTemplate
 	 * @return
 	 */
-	Object sendSignMsg(SmsRequestTemplate smsRequestTemplate);
+	Map<String, Object> sendSignMsg(SmsRequestTemplate smsRequestTemplate);
 
 	/**
 	 * 保存短信发送结果
+	 * @param smsResponse
 	 * @param request
 	 * @param number
 	 * @return
 	 */
-	SmsResult saveSendResult(SMSSendRequest request, Integer number);
+	SmsResult saveSendResult(SmsResponseVO smsResponse, SMSSendRequest request, Integer number);
 
 	/**
 	 * 短信发送记录保存
@@ -55,4 +61,41 @@
 	 * @return
 	 */
 	Map<String, Object> saveInStationInfo(SmsRequestTemplate smsRequestTemplate);
+
+	/**
+	 * 发送降雨短信
+	 * @param params 发送对象
+	 * @return
+	 */
+	Object sendSignRainMsg(Map<String, Object> params);
+
+	/**
+	 * 外呼未接通-发送短信
+	 * @param taskId
+	 * @param time
+	 * @return
+	 */
+	String sendSmsByOutCallNotConnect(String taskId,String time);
+
+	/**
+	 * 通过手机号获取外呼未接通已发短信通知的人员水库信息
+	 * @param callId 呼叫id
+	 * @return
+	 */
+	Object getCallNotConnectSmsNoticeInfo(String callId);
+
+	/**
+	 * 导入表格发送降雨短信
+	 * @param list 导入的excel 集合数据
+	 * @param startTime 短信内容填报起始时间
+	 * @param endTime 短信内容填报截止时间
+	 * @return
+	 */
+    Object importSendRainSms(List<SendRainSmsExcel> list,String startTime,String endTime);
+
+	/**
+	 * 发送邮件提醒短信
+	 * @param list
+	 */
+	void sendEmailMsg(List<String> list, SmsRequest smsRequest);
 }

--
Gitblit v1.9.3