From 69123c8bf13ccb27539b0475e626c6c95c0ea6bb Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 17 四月 2024 12:29:01 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskSingleController.java | 47 +++--------------------------------------------
1 files changed, 3 insertions(+), 44 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskcallController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskSingleController.java
similarity index 64%
rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskcallController.java
rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskSingleController.java
index addc3e8..eefd066 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskcallController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskSingleController.java
@@ -1,7 +1,5 @@
package com.ruoyi.web.controller.smartor;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -9,7 +7,6 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.*;
import com.smartor.service.IIvrTaskSingleService;
@@ -20,9 +17,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
/**
* 鍗曚竴浠诲姟锛堥殢璁匡級Controller
@@ -33,7 +28,7 @@
@Api(description = "鍗曚竴浠诲姟锛堥殢璁垮鏁欙級")
@RestController
@RequestMapping("/smartor/tasksingle")
-public class IvrTaskcallController extends BaseController {
+public class IvrTaskSingleController extends BaseController {
@Autowired
private IIvrTaskSingleService ivrTaskcallService;
@@ -81,7 +76,6 @@
return toAjax(ivrTaskcallService.insertOrUpdateTask(ivrTaskcallVO));
}
-
/**
* 鏍规嵁鏉′欢鏌ヨ浠诲姟淇℃伅
*/
@@ -90,43 +84,8 @@
public AjaxResult queryTaskByCondition(@RequestBody IvrTaskSingleVO ivrTaskcallVO) {
//鏍规嵁鍏ュ弬鏌ヨ淇℃伅
IvrTaskSingle ivrTaskcall = DtoConversionUtils.sourceToTarget(ivrTaskcallVO, IvrTaskSingle.class);
- List<IvrTaskSingle> list = ivrTaskcallService.selectIvrTaskcallList(ivrTaskcall);
-
- //瀹氫箟鎮ｈ�呬笌鍗曚竴浠诲姟鍏宠仈琛ㄩ泦鍚�
- List<PatTaskRelevance> patTaskRelevances = new ArrayList<>();
-
- //灏嗘煡鍑烘潵鐨勬暟鎹�掑叆IvrTaskcallVO涓�
- IvrTaskSingleVO ivrTaskcallVO2 = DtoConversionUtils.sourceToTarget(list.get(0), IvrTaskSingleVO.class);
- String sendTimeSlot = list.get(0).getSendTimeSlot();
- ObjectMapper objectMapper = new ObjectMapper();
- try {
- //鑾峰彇鍒板彂閫佹椂闂寸殑闆嗗悎
- if (StringUtils.isNotEmpty(sendTimeSlot)) {
- List<TaskSendTimeVO> taskSendTimeVOList = objectMapper.readValue(sendTimeSlot, List.class);
- ivrTaskcallVO2.setSendTimeslot(taskSendTimeVOList);
- }
- //鏂囨湰鍙橀噺鍙傛暟
- if (StringUtils.isNotEmpty(list.get(0).getTextParam())) {
- Map<String, Map<String, String>> textParam = objectMapper.readValue(list.get(0).getTextParam(), Map.class);
- ivrTaskcallVO2.setTextParam(textParam);
- }
- } catch (JsonProcessingException e) {
- e.printStackTrace();
- }
-
- for (IvrTaskSingle ivrTaskcall1 : list) {
- PatTaskRelevance patTaskRelevance = new PatTaskRelevance();
- //鑾峰彇鍒版偅鑰呬俊鎭紝骞舵斁鍏ュ埌闆嗗悎涓�
- patTaskRelevance.setName(ivrTaskcall1.getSendname());
- patTaskRelevance.setAge(ivrTaskcall1.getAge());
- patTaskRelevance.setSfzh(ivrTaskcall1.getSfzh());
- patTaskRelevance.setPhone(ivrTaskcall1.getPhone());
- patTaskRelevance.setAddr(ivrTaskcall1.getAddr());
- patTaskRelevances.add(patTaskRelevance);
- }
-
- ivrTaskcallVO2.setPatTaskRelevances(patTaskRelevances);
- return success(ivrTaskcallVO2);
+ IvrTaskSingleVO ivrTaskSingleVO = ivrTaskcallService.queryTaskByCondition(ivrTaskcall);
+ return success(ivrTaskSingleVO);
}
--
Gitblit v1.9.3