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-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/feign/ISmsRecordClient.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/feign/ISmsRecordClient.java b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/feign/ISmsRecordClient.java
index c3616e2..34a90f8 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/feign/ISmsRecordClient.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/feign/ISmsRecordClient.java
@@ -1,8 +1,14 @@
package cn.gistack.alerts.sms.feign;
+import cn.gistack.alerts.sms.vo.SmsResultVO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
/**
* 短信发送记录
@@ -16,6 +22,13 @@
String API_PREFIX = "/client";
String SAVE_SMS_RECORD = API_PREFIX + "/saveSmsRecord";
+ String SEND_SMS_BY_OUT_CALL_NOT_CONNECT = API_PREFIX + "/sendSmsByOutCallNotConnect";
+ String CREATE_OUT_CALL_ERROR_SEND_SMS = API_PREFIX + "/createOutCallErrorSendSms";
+
+ String SELECT_SMS_RESULT_PAGE = API_PREFIX + "/selectSmsResultPage";
+
+ @PostMapping(SELECT_SMS_RESULT_PAGE)
+ List<SmsResultVO> smsSuccessList(@RequestBody SmsResultVO smsResult);
/**
* 保存短信发送记录
@@ -30,7 +43,24 @@
void saveSmsRecord(@RequestParam("userNumber")String userNumber,
@RequestParam("messageContent")String messageContent,
@RequestParam("templateId")String templateId,
- @RequestParam("code")Integer code,
+ @RequestParam("code")String code,
@RequestParam("msg")String msg,
@RequestParam("number")Integer number);
+
+ /**
+ * 外呼未接通-发送短信
+ * @param taskId
+ * @param time
+ * @return
+ */
+ @GetMapping(SEND_SMS_BY_OUT_CALL_NOT_CONNECT)
+ String sendSmsByOutCallNotConnect(@RequestParam("taskId")String taskId,
+ @RequestParam("time")String time);
+
+ /**
+ * 外呼任务创建失败发送短信提醒
+ * @param msg 失败原因
+ */
+ @GetMapping(CREATE_OUT_CALL_ERROR_SEND_SMS)
+ void createOutCallErrorSendSms(@RequestParam("msg") String msg);
}
--
Gitblit v1.9.3