From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001 From: xieb <vip_xiaobin810@163.com> Date: Thu, 19 Oct 2023 15:01:43 +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 | 77 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 73 insertions(+), 4 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 15f6000..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 @@ -1,11 +1,18 @@ 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.excel.SendSmsExcel; import cn.gistack.alerts.sms.vo.SmsRequestTemplate; +import cn.gistack.alerts.sms.vo.SmsResponseVO; import java.util.List; +import java.util.Map; /** * 短信发送服务接口 @@ -24,19 +31,21 @@ List<String> phoneNumbers); /** - * 发送 具名 变量模板短信 + * 发送 具名 变量模板短信 （告警定制） * @param smsRequestTemplate * @return */ - Object sendSignMsg(SmsRequestTemplate smsRequestTemplate); + Map<String, Object> sendSignMsg(SmsRequestTemplate smsRequestTemplate); /** * 保存短信发送结果 + * @param code + * @param msg * @param request * @param number * @return */ - SmsResult saveSendResult(SMSSendRequest request, Integer number); + SmsResult saveSendResult(String code,String msg, SMSSendRequest request, Integer number); /** * 短信发送记录保存 @@ -46,5 +55,65 @@ * @param resultId * @return */ - SmsRecord saveSendRecord(SMSSendRequest request,Integer code, String sendMsg, Long resultId); + SmsRecord saveSendRecord(SMSSendRequest request,String code, String sendMsg, Long resultId); + + /** + * 发送降雨短信 + * @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); + + /** + * 发送合并水库名短信 + * @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