From f6f8070ad5b5d370f202d74688c42fe2f7b38682 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 03 May 2023 22:40:26 +0800
Subject: [PATCH] 智能外呼创建，查询导出修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java | 75 ++++++++++++++++++++++++++++---------
1 files changed, 57 insertions(+), 18 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 2765ae4..3fce98d 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
@@ -22,6 +22,7 @@
import org.springframework.web.client.RestTemplate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -62,18 +63,29 @@
/**
* 创建任务
- * @param params
+ * @param map
* @return
*/
@Override
- public Object 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);
@@ -81,7 +93,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);
@@ -207,22 +219,39 @@
*/
@Override
public IPage<CallTaskResultVO> getCallTaskResultListPage(IPage<CallTaskResultVO> page, CallTaskResultVO callTaskResult) {
- List<CallTaskResultVO> resultListPage = callTaskMapper.getCallTaskResultListPage(page, callTaskResult);
- //遍历
- if (resultListPage.size()>0) {
- for (CallTaskResultVO resultVO : resultListPage) {
- // 取出 jsonData 数据
- System.out.println("resultVO = " + resultVO);
- String callTaskCalleeContent = resultVO.getCallTaskCalleeContent();
- JSONObject jsonObject = JSONObject.parseObject(callTaskCalleeContent);
- String userName = jsonObject.getString("$用户名$");
- String adName = jsonObject.getString("$水库名称$");
- resultVO.setAdName(adName);
- resultVO.setAreaName(getAreaNameByAdCode(jsonObject.getString("$水库编码$")));
- resultVO.setUserName(userName);
- }
+ 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);
return page.setRecords(resultListPage);
+ }
+
+ /**
+ * 导出呼叫详情列表信息
+ * @param callTaskResult
+ * @return
+ */
+ @Override
+ public Object getCallTaskResultList(CallTaskResultVO callTaskResult) {
+ List<String> list = new ArrayList<>();
+ if (null!= callTaskResult.getAreaName() && !callTaskResult.getAreaName().equals("")){
+ // 查询所有下级区域code
+ list = getAllChildrenAreaByAreaCode(callTaskResult.getAreaName());
+ }
+ List<CallTaskResultVO> resultListPage = callTaskMapper.getCallTaskResultListPage(null, callTaskResult,list);
+ // 返回
+ return resultListPage;
+ }
+
+ /**
+ * 查询所有下级区域
+ * @param areaCode
+ * @return
+ */
+ private List<String> getAllChildrenAreaByAreaCode(String areaCode) {
+ return callTaskMapper.getAllChildrenAreaByAreaCode(areaCode);
}
/**
@@ -234,4 +263,14 @@
// 通过adCode查询区域名称
return callTaskMapper.getAreaNameByAdCode(adCode);
}
+
+ /**
+ * 通过行政区编号获取水库名称
+ * @param areaCode
+ * @return
+ */
+ private List<String> getWaterNameByAreaCode(String areaCode) {
+ // 通过行政区编号获取水库名称
+ return callTaskMapper.getWaterNameByAreaCode(areaCode);
+ }
}
--
Gitblit v1.9.3