From a2989e934129341e30d13a649ea01e008a95348f Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 27 May 2023 16:16:14 +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 | 14 ++++++--------
1 files changed, 6 insertions(+), 8 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 2c16f77..d76c61b 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
@@ -75,7 +75,7 @@
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:ss")) + "智能外呼";;
if(null!= map.get("taskName") && !map.get("taskName").equals("")){
taskName = map.get("taskName").toString();
}
@@ -112,11 +112,11 @@
HttpEntity<String> stringHttpEntity = new HttpEntity<>(bodyJson.toJSONString(), httpHeaders);
log.info("创建超汛限智能外呼任务请求参数：{}", bodyJson.toJSONString());
ResponseEntity<String> response = restTemplate.postForEntity(requestUrl, stringHttpEntity, String.class);
- log.info("创建外呼任务请求结果：{}", response);
+ log.info("创建外呼任务请求结果：{}", response.getBody());
if (response.getStatusCode() != HttpStatus.OK) {
log.error("创建智能外呼任务失败：{}", response.getStatusCode());
}
- return response;
+ return response.getBody();
}
/**
@@ -320,7 +320,7 @@
* @return
*/
@Override
- public boolean createCallTaskByParam(Map<String, Object> params) {
+ public Object createCallTaskByParam(Map<String, Object> params) {
// 自动创建任务的 4个条件 1：呼叫人数 2：调度时间 3：是否超汛限 4：多少天内呼叫过的不呼叫（天数）
//1. 调用中台接口查询出所有需要发任务的水库巡查责任人相关信息（该处需要将是否超汛限条件传入）
JSONArray jsonArray = getZtWaterMangerData(params);
@@ -337,10 +337,8 @@
params.put("list",setForListMap(taskRandomList));
// 调度时间处理
params.put("taskScheduleTime",new SimpleDateFormat("yyyy-MM-dd").format(new Date())+ " " +params.get("taskScheduleTime") + ":00");
- // 创建任务
- createTask(params);
- //5. 返回
- return true;
+ // 创建任务并返回结果
+ return createTask(params);
}
/**
--
Gitblit v1.9.3