From 877e64ea7a23472297ba93027210bb1d4c4a8c4f Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 01 Jul 2023 17:23:12 +0800
Subject: [PATCH] 短信导入发送数据返回提示修改，告警短信发送修改（新增市县水利部人员查询并放入短信中）
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/feign/SmsRecordClient.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/feign/SmsRecordClient.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/feign/SmsRecordClient.java
index 34952a7..d32e83c 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/feign/SmsRecordClient.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/feign/SmsRecordClient.java
@@ -3,6 +3,7 @@
import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendRequest;
import cn.gistack.alerts.sms.entity.SmsResult;
import cn.gistack.alerts.sms.service.SmsService;
+import cn.gistack.alerts.sms.vo.SmsResponseVO;
import lombok.AllArgsConstructor;
import org.springblade.core.tenant.annotation.NonDS;
import org.springframework.web.bind.annotation.GetMapping;
@@ -36,7 +37,7 @@
public void saveSmsRecord(String userNumber,
String messageContent,
String templateId,
- Integer code,
+ String code,
String msg,
Integer number) {
SMSSendRequest request = new SMSSendRequest();
@@ -44,9 +45,21 @@
request.setTemplateId(templateId);
request.setMessageContent(messageContent);
// 记录发送记录操作
- SmsResult smsResult = smsService.saveSendResult(request, number);
+ SmsResult smsResult = smsService.saveSendResult(code,msg,request, number);
if (null != smsResult){
smsService.saveSendRecord(request, code,msg,smsResult.getId());
}
}
+
+ /**
+ * 外呼未接通-发送短信
+ * @param taskId
+ * @param time
+ * @return
+ */
+ @Override
+ @GetMapping(SEND_SMS_BY_OUT_CALL_NOT_CONNECT)
+ public String sendSmsByOutCallNotConnect(String taskId,String time) {
+ return smsService.sendSmsByOutCallNotConnect(taskId,time);
+ }
}
--
Gitblit v1.9.3