From 6cd2da8eb7d7aefecd96a19ebbfe9caba59ea88c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 May 2023 14:25:58 +0800
Subject: [PATCH] 巡查任务巡查责任人完成任务逻辑修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java | 162 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 153 insertions(+), 9 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 7d03d7c..d329fef 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
@@ -1,14 +1,18 @@
package cn.gistack.sm.intelligentCall.service.impl;
import cn.gistack.sm.intelligentCall.constant.CallConstant;
+import cn.gistack.sm.intelligentCall.mapper.CallTaskMapper;
import cn.gistack.sm.intelligentCall.service.CallService;
-import cn.gistack.sm.intelligentCall.vo.CallBackDetailVO;
+import cn.gistack.sm.intelligentCall.vo.CallTaskResultVO;
+import cn.gistack.sm.intelligentCall.vo.CallTaskStatistic;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.RandomUtils;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
@@ -16,16 +20,21 @@
import org.springframework.stereotype.Service;
import org.springframework.util.DigestUtils;
import org.springframework.web.client.RestTemplate;
-import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
-@Service
@Slf4j
+@Service
public class CallServiceImpl implements CallService {
- @Resource
+
+ @Autowired
+ private CallTaskMapper callTaskMapper;
+
+ @Autowired
private RestTemplate restTemplate;
// @Value("${dial.task.url}")
@@ -53,15 +62,31 @@
private final static String CREATE_TASK_URL = "/api/task/createTask.json";
private final static String CALL_DETAIL_URL = "/api/task/callDetail.json";
+ /**
+ * 创建任务
+ * @param map
+ * @return
+ */
@Override
- public void createTask(List<Map<String, String>> params) {
+ public Object createTask(Map<String,Object> map) {
+ List<Map<String, String>> params = (List<Map<String, String>>) map.get("list");
String requestUrl = url + CREATE_TASK_URL;
LocalDateTime now = LocalDateTime.now();
String timestamp = now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss SSS"));
String transId = generateTransId(now);
- String taskName = now.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH:mm")) + "智能外呼";
+ String taskName = now.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH:mm")) + "智能外呼";;
+ if(null!= map.get("taskName") && !map.get("taskName").equals("")){
+ taskName = map.get("taskName").toString();
+ }
String[] numbers = StringUtils.split(callingNumbers,",");
String taskScheduleTime = LocalDateTime.now().plusHours(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ if (null!=map.get("taskScheduleTime") && !map.get("taskScheduleTime").equals("")){
+ taskScheduleTime = map.get("taskScheduleTime").toString();
+ }
+ String scenesIds = scenesId;
+ if (null!=map.get("scenesId") && !map.get("scenesId").equals("")){
+ scenesIds = map.get("scenesId").toString();
+ }
JSONArray arr = getCalleeInfo(params);
HttpHeaders httpHeaders = new HttpHeaders();
httpHeaders.add("Content-Type", CONTENT_TYPE);
@@ -69,7 +94,7 @@
httpHeaders.add("Accept-Encoding", ACCEPT_ENCODING);
JSONObject paramJson = new JSONObject();
paramJson.put("taskName", taskName);
- paramJson.put("scenesId", scenesId);
+ paramJson.put("scenesId", scenesIds);
paramJson.put("callingNumbers", numbers);
paramJson.put("taskScheduleTime", taskScheduleTime);
paramJson.put("calleeData", arr);
@@ -90,8 +115,15 @@
if (response.getStatusCode() != HttpStatus.OK) {
log.error("创建智能外呼任务失败：{}", response.getStatusCode());
}
+ return response;
}
+ /**
+ * 获取通话详情
+ * @param taskId
+ * @param calleeNumber
+ * @return
+ */
@Override
public Object getCallDetail(String taskId, String calleeNumber) {
String requestUrl = url + CALL_DETAIL_URL;
@@ -115,7 +147,7 @@
JSONObject responseJson = (JSONObject) JSONObject.parse(response.getBody());
assert responseJson != null;
// return JSONObject.parseObject(responseJson.getString("data"), CallBackDetailVO.class);
- return responseJson.getString("data");
+ return response.getBody();
}
return null;
}
@@ -168,4 +200,116 @@
});
return arr;
}
+
+ /**
+ * 查詢任务列表数据
+ * @param page
+ * @param callTask
+ * @return
+ */
+ @Override
+ public IPage<CallTaskStatistic> getCallListPage(IPage<CallTaskStatistic> page, CallTaskStatistic callTask) {
+ return page.setRecords(callTaskMapper.getCallListPage(page,callTask));
+ }
+
+ /**
+ * 查询呼叫详情列表信息
+ * @param callTaskResult
+ * @param page
+ * @return
+ */
+ @Override
+ public IPage<CallTaskResultVO> getCallTaskResultListPage(IPage<CallTaskResultVO> page, CallTaskResultVO callTaskResult) {
+ List<String> list = new ArrayList<>();
+ if (null!= callTaskResult.getAreaName() && !callTaskResult.getAreaName().equals("")){
+ // 查询所有下级区域code
+ list = getAllChildrenAreaByAreaCode(callTaskResult.getAreaName());
+ }
+ List<CallTaskResultVO> resultListPage = callTaskMapper.getCallTaskResultListPage(page, callTaskResult,list,null);
+ return page.setRecords(resultListPage);
+ }
+
+ /**
+ * 导出呼叫详情列表信息
+ * @param callTaskResult
+ * @return
+ */
+ @Override
+ public Object getCallTaskResultList(CallTaskResultVO callTaskResult) {
+ List<String> list = new ArrayList<>();
+ List<String> idsList = new ArrayList<>();
+ if (null!= callTaskResult.getAreaName() && !callTaskResult.getAreaName().equals("")){
+ // 查询所有下级区域code
+ list = getAllChildrenAreaByAreaCode(callTaskResult.getAreaName());
+ }
+ if (null!= callTaskResult.getIds() && !callTaskResult.getIds().equals("")){
+ // 查询所有下级区域code
+ idsList = Arrays.asList(callTaskResult.getIds().split(","));
+ }
+ List<CallTaskResultVO> resultListPage = callTaskMapper.getCallTaskResultListPage(null, callTaskResult,list,idsList);
+ // 返回
+ return resultListPage;
+ }
+
+ /**
+ * 查询智能外呼统计数据-按日期-行政区统计
+ * @param callTaskStatistic
+ * @return
+ */
+ @Override
+ public Object getOutgoingStatisticList(IPage<CallTaskStatistic> page,CallTaskStatistic callTaskStatistic) {
+ List<String> list = new ArrayList<>();
+ if (null!= callTaskStatistic.getAdName() && !callTaskStatistic.getAdName().equals("")){
+ // 查询所有下级区域code
+ list = getAllChildrenAreaByAreaCode(callTaskStatistic.getAdName());
+ }
+ // 勾选导出行政区 id 组装
+ if (null!= callTaskStatistic.getIds() && !callTaskStatistic.getIds().equals("")){
+ list = Arrays.asList(callTaskStatistic.getIds().split(","));
+ }
+ // 判断是否分页
+ if (null!= callTaskStatistic.getIsPage()){
+ return callTaskMapper.getOutgoingStatisticList(null,callTaskStatistic,list);
+ }
+ return page.setRecords(callTaskMapper.getOutgoingStatisticList(page,callTaskStatistic,list));
+ }
+
+ /**
+ * 查询智能外呼统计数据-行政区统计
+ * @param callTaskStatistic
+ * @return
+ */
+ @Override
+ public Object getOutgoingStatisticByArea(CallTaskStatistic callTaskStatistic) {
+ return callTaskMapper.getOutgoingStatisticByArea(callTaskStatistic);
+ }
+
+ /**
+ * 查询所有下级区域
+ * @param areaCode
+ * @return
+ */
+ private List<String> getAllChildrenAreaByAreaCode(String areaCode) {
+ return callTaskMapper.getAllChildrenAreaByAreaCode(areaCode);
+ }
+
+ /**
+ * 通过水库编码获取行政区名称
+ * @param adCode
+ * @return
+ */
+ private String getAreaNameByAdCode(String adCode) {
+ // 通过adCode查询区域名称
+ return callTaskMapper.getAreaNameByAdCode(adCode);
+ }
+
+ /**
+ * 通过行政区编号获取水库名称
+ * @param areaCode
+ * @return
+ */
+ private List<String> getWaterNameByAreaCode(String areaCode) {
+ // 通过行政区编号获取水库名称
+ return callTaskMapper.getWaterNameByAreaCode(areaCode);
+ }
}
--
Gitblit v1.9.3