From 288ded5874ea9327d0b8fdfd6a7960425600727f Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 18 Jul 2023 14:26:08 +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 | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 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 ce43b70..a97086b 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
@@ -54,6 +54,9 @@
@Autowired
private BladeRedis bladeRedis;
+ @Autowired
+ private AsyncCallService asyncCallService;
+
// @Value("${dial.task.url}")
private String url = CallConstant.HOST;
@@ -537,6 +540,7 @@
Integer connectCount = Integer.parseInt(taskStatistic.getConnectionCount()) + Integer.parseInt(statistic.getConnectionCount());
taskStatistic.setCalleeNumberCount(count.toString());
taskStatistic.setConnectionCount(connectCount.toString());
+ taskStatistic.setThreeNoConnectCount(taskStatistic.getThreeNoConnectCount() + statistic.getThreeNoConnectCount());
taskStatistic.setRefuseConnectCount(taskStatistic.getRefuseConnectCount() + statistic.getRefuseConnectCount());
// 计算比例
if (connectCount==0){
@@ -623,6 +627,8 @@
List<String> stringList = everydayCall(params);
// 取出数据进行设置 taskId
bladeRedis.setEx(CallConstant.call_task_key,stringList.get(1)+","+1,6*60*60L);
+ // 异步保存日常关联呼叫任务信息
+ asyncCallService.saveDailyCallTask(stringList.get(1),1);
// 响应
return stringList;
}else {
@@ -657,11 +663,15 @@
if (type.equals("1")){
// 取出数据进行设置 taskId
bladeRedis.setEx(CallConstant.call_task_key,stringList.get(1)+","+2,6*60*60L);
+ // 异步保存日常关联呼叫任务信息
+ asyncCallService.saveDailyCallTask(stringList.get(1),2);
}
// 判断是否发送短信
if (type.equals("2")){
// 新增一个参数代表需要发短信
stringList.add("3");
+ // 异步保存日常关联呼叫任务信息
+ asyncCallService.saveDailyCallTask(stringList.get(1),3);
}
}
// 返回
@@ -971,4 +981,20 @@
// 返回
return page.setRecords(callNotConnectResultList);
}
+
+ /**
+ * 详情导出临时接口
+ * @param callTaskResult
+ * @param page
+ * @return
+ */
+ @Override
+ public Object getCallResultListTemp(IPage<CallTaskResultVO> page, CallTaskResultVO callTaskResult) {
+ List<String> list = new ArrayList<>();
+ if (null!=callTaskResult.getIds() && !callTaskResult.getIds().equals("")){
+ list = Arrays.asList(callTaskResult.getIds().split(","));
+ }
+ // 不分页
+ return callTaskMapper.getCallResultListTemp(null,callTaskResult,list);
+ }
}
--
Gitblit v1.9.3