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 | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 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 568f5d5..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
@@ -73,11 +73,19 @@
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 = map.get("taskName").toString();
+ 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"));
- String taskScheduleTime = map.get("taskScheduleTime").toString();
+ 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);
@@ -85,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);
@@ -214,7 +222,7 @@
List<String> list = new ArrayList<>();
if (null!= callTaskResult.getAreaName() && !callTaskResult.getAreaName().equals("")){
// 查询所有下级区域code
- list = getWaterNameByAreaCode(callTaskResult.getAreaName());
+ list = getAllChildrenAreaByAreaCode(callTaskResult.getAreaName());
}
List<CallTaskResultVO> resultListPage = callTaskMapper.getCallTaskResultListPage(page, callTaskResult,list);
return page.setRecords(resultListPage);
@@ -230,7 +238,7 @@
List<String> list = new ArrayList<>();
if (null!= callTaskResult.getAreaName() && !callTaskResult.getAreaName().equals("")){
// 查询所有下级区域code
- list = getWaterNameByAreaCode(callTaskResult.getAreaName());
+ list = getAllChildrenAreaByAreaCode(callTaskResult.getAreaName());
}
List<CallTaskResultVO> resultListPage = callTaskMapper.getCallTaskResultListPage(null, callTaskResult,list);
// 返回
@@ -238,6 +246,15 @@
}
/**
+ * 查询所有下级区域
+ * @param areaCode
+ * @return
+ */
+ private List<String> getAllChildrenAreaByAreaCode(String areaCode) {
+ return callTaskMapper.getAllChildrenAreaByAreaCode(areaCode);
+ }
+
+ /**
* 通过水库编码获取行政区名称
* @param adCode
* @return
--
Gitblit v1.9.3