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-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java
index 253fd0b..990baf7 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java
@@ -222,6 +222,9 @@
 		if (success){
 			//通过任务名称查询taskId
 			taskId = callTaskMapper.getTaskIdByTaskName(taskName);
+		}else {
+			// 任务创建失败,发送短信告知
+			asyncCallService.createOutCallErrorSendSms(jsonObject.getString("code"),jsonObject.getString("message"));
 		}
 		List<String> list = new ArrayList<>();
 		list.add(response.getBody());
@@ -1230,7 +1233,7 @@
 	 * @return
 	 */
 	@Override
-	public Object getCallResultListTemp(IPage<CallTaskResultVO> page, CallTaskResultVO callTaskResult) {
+	public List<CallTaskResultVO> getCallResultListTemp(IPage<CallTaskResultVO> page, CallTaskResultVO callTaskResult) {
 		List<String> list = new ArrayList<>();
 		if (null!=callTaskResult.getIds() && !callTaskResult.getIds().equals("")){
 			list = Arrays.asList(callTaskResult.getIds().split(","));
@@ -1271,4 +1274,12 @@
 		// 返回
 		return R.data(400,errorMsg,null);
 	}
+
+	/**
+	 * 测试接口-调用外呼库查询任务详情信息
+	 */
+	@Override
+	public Object getTaskDetail(Integer taskId) {
+		return callTaskMapper.getTaskDetail(taskId);
+	}
 }

--
Gitblit v1.9.3