From d2f2faf246d45c7bbb0daccbbe005fab4597eb86 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 28 Apr 2023 00:30:29 +0800
Subject: [PATCH] 智能通话查修改，导出修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/controller/CallController.java | 186 +++++++++++++--------------------------------
1 files changed, 55 insertions(+), 131 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/controller/CallController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/controller/CallController.java
index 4896522..5c83f22 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/controller/CallController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/controller/CallController.java
@@ -1,19 +1,17 @@
package cn.gistack.sm.intelligentCall.controller;
-import cn.gistack.sm.intelligentCall.constant.CallConstant;
-import cn.gistack.sm.intelligentCall.entity.User;
-import cn.gistack.sm.intelligentCall.util.HttpClientUtils;
-import com.alibaba.fastjson.JSON;
+import cn.gistack.sm.intelligentCall.entity.CallTaskResult;
+import cn.gistack.sm.intelligentCall.service.CallService;
+import cn.gistack.sm.intelligentCall.vo.CallTaskResultVO;
+import cn.gistack.sm.intelligentCall.vo.CallTaskStatistic;
import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.text.SimpleDateFormat;
+import org.springframework.web.bind.annotation.*;
+
import java.util.*;
/**
@@ -28,137 +26,63 @@
@AllArgsConstructor
public class CallController {
- /**
- * 创建任务
- * @return
- */
- @GetMapping("/createCall2")
- public R createCall2(){
- String url2 = CallConstant.HOST + CallConstant.createTaskUrl1;
- // 请求2
- Map<String, Object> map = new HashMap<>();
- map.put("p2",createCall(url2));
- // 返回
- return R.data(map);
- }
+ private final CallService callService;
/**
* 创建任务
- * @param url
* @return
*/
- public String createCall(String url){
- // 计算token
- Date date = new Date();
- String dateFormat0 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date);
- String dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss SSS").format(date);
- String dateFormats = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(date);
- Random random = new Random();
- //把随机生成的数字转成字符串
- String str = String.valueOf(random.nextInt(9));
- for (int i = 0; i < 5; i++) {
- str += random.nextInt(9);
- }
- String formatString ="appId" + CallConstant.AppKey
- + "timestamp" + dateFormat
- + "transId" + dateFormats
- + str;
- // 请求参数拼接
- Map<String, Object> map = new HashMap<>();
- map.put("taskName","测试");
- map.put("sceneId",1);
- map.put("callingNumbers", Arrays.asList(101,102));
- map.put("taskScheduleTime",dateFormat0);
- List<User> list = new ArrayList<>();
- User user = new User();
- user.setName("张三");
- user.setPhone("15170720695");
- user.setName("先生");
- list.add(user);
- map.put("calleeData",list);
- String jsonString = JSON.toJSONString(map);
- String lastString = formatString + jsonString + CallConstant.AppSecret;
- // md5 小写,md5 生成token
- String encryption = encryption(lastString);
-
- String httpPost = HttpClientUtils.httpPost(url, CallConstant.AppKey, dateFormat, dateFormats + str, encryption, map);
+ @PostMapping("/createCall")
+ public R createCall(@RequestBody Map<String,Object> map){
// 返回
- return httpPost;
+ return R.data(callService.createTask(map));
}
-
-
-
-// /**
-// * 测试
-// * @param args
-// */
-// public static void main(String[] args) {
-// // 计算token
-// Date date = new Date();
-// String dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss SSS").format(date);
-// String dateFormats = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(date);
-// Random random = new Random();
-// //把随机生成的数字转成字符串
-// String str = String.valueOf(random.nextInt(9));
-// for (int i = 0; i < 5; i++) {
-// str += random.nextInt(9);
-// }
-// String formatString ="appId" + CallConstant.AppKey
-// + "timestamp" + dateFormat
-// + "transId" + dateFormats
-// + str;
-// // 请求参数拼接
-// Map<String, Object> map = new HashMap<>();
-// map.put("taskName","测试");
-// map.put("sceneId",1);
-// map.put("callingNumbers", Arrays.asList(101,102));
-// map.put("taskScheduleTime","2020-02-29 14:00:00");
-// List<User> list = new ArrayList<>();
-// User user = new User();
-// user.setName("张三");
-// user.setPhone("15170720695");
-// user.setName("先生");
-// list.add(user);
-// map.put("calleeData",list);
-// String jsonString = JSON.toJSONString(map);
-// String lastString = formatString + jsonString + CallConstant.AppSecret;
-// // md5 小写,md5 生成token
-// String encryption = encryption(lastString);
-// String url = CallConstant.HOST + CallConstant.createTaskUrl;
-// String httpPost = HttpClientUtils.httpPost(url, CallConstant.AppKey, dateFormat, dateFormats + str, encryption, map);
-//
-//
-// System.out.println("encryption = " + encryption);
-//
-// }
/**
- * md5加密 32位 小写
- * @param plainText
+ * 获取通话详情
* @return
*/
- public static String encryption(String plainText) {
- String re_md5 = new String();
- try {
- MessageDigest md = MessageDigest.getInstance("MD5");
- md.update(plainText.getBytes());
- byte b[] = md.digest();
- int i;
- StringBuffer buf = new StringBuffer("");
- for (int offset = 0; offset < b.length; offset++) {
- i = b[offset];
- if (i < 0) {
- i += 256;
- }
- if (i < 16) {
- buf.append("0");
- }
- buf.append(Integer.toHexString(i));
- }
- re_md5 = buf.toString();
- } catch (NoSuchAlgorithmException e) {
- e.printStackTrace();
- }
- return re_md5;
+ @GetMapping("/getCallDetail")
+ public R getCallDetail(String taskId,String calleeNumber){
+ // 返回
+ return R.data(callService.getCallDetail(taskId,calleeNumber));
}
+
+
+ /**
+ * 查询呼叫列表信息
+ * @param callTask
+ * @param query
+ * @return
+ */
+ @GetMapping("/getCallListPage")
+ public R getCallListPage(CallTaskStatistic callTask, Query query){
+ // 返回
+ return R.data(callService.getCallListPage(Condition.getPage(query),callTask));
+ }
+
+
+ /**
+ * 查询呼叫详情列表信息
+ * @param callTaskResult
+ * @param query
+ * @return
+ */
+ @GetMapping("/getCallTaskResultListPage")
+ public R getCallTaskResultListPage(CallTaskResultVO callTaskResult, Query query){
+ // 返回
+ return R.data(callService.getCallTaskResultListPage(Condition.getPage(query),callTaskResult));
+ }
+
+ /**
+ * 导出呼叫详情列表信息
+ * @param callTaskResult
+ * @return
+ */
+ @GetMapping("/getCallTaskResultList")
+ public R getCallTaskResultList(CallTaskResultVO callTaskResult){
+ // 返回
+ return R.data(callService.getCallTaskResultList(callTaskResult));
+ }
+
}
--
Gitblit v1.9.3