From 63e17909e1eee7ff54c38827a4096cbad82e5dad Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期二, 16 四月 2024 11:56:55 +0800 Subject: [PATCH] 代码提交 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskcallController.java | 40 +++++++++++++++++++--------------------- 1 files changed, 19 insertions(+), 21 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/IvrTaskcallController.java index e4a0f9f..addc3e8 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/IvrTaskcallController.java @@ -2,19 +2,17 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.gson.Gson; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.DateUtils; 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.IIvrTaskcallService; +import com.smartor.service.IIvrTaskSingleService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -34,21 +32,21 @@ */ @Api(description = "鍗曚竴浠诲姟锛堥殢璁垮鏁欙級") @RestController -@RequestMapping("/smartor/taskcall") +@RequestMapping("/smartor/tasksingle") public class IvrTaskcallController extends BaseController { @Autowired - private IIvrTaskcallService ivrTaskcallService; + private IIvrTaskSingleService ivrTaskcallService; + /** - * 鏌ヨ鍗曚竴浠诲姟锛堥殢璁匡級鍒楄〃 + * 鏌ヨ鎮h�呴殢璁夸俊鎭� */ - @ApiOperation("鏌ヨ鍗曚竴浠诲姟锛堥殢璁垮鏁欙級鍒楄〃") + @ApiOperation("鏌ヨ鎮h�呴殢璁夸俊鎭�") @PreAuthorize("@ss.hasPermi('system:taskcall:list')") - @PostMapping("/list") - public TableDataInfo list(@RequestBody IvrTaskcall ivrTaskcall) { + @PostMapping("/patItem") + public TableDataInfo patItem(@RequestBody IvrTaskSingle ivrTaskcall) { PageUtils.startPageByPost(ivrTaskcall.getPageNum(), ivrTaskcall.getPageSize()); - List<IvrTaskcall> list = ivrTaskcallService.selectIvrTaskcallList(ivrTaskcall); - return getDataTable(list); + return getDataTable(ivrTaskcallService.patItem(ivrTaskcall)); } /** @@ -57,9 +55,9 @@ @PreAuthorize("@ss.hasPermi('system:taskcall:export')") @Log(title = "鍗曚竴浠诲姟锛堥殢璁垮鏁欙級", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, IvrTaskcall ivrTaskcall) { - List<IvrTaskcall> list = ivrTaskcallService.selectIvrTaskcallList(ivrTaskcall); - ExcelUtil<IvrTaskcall> util = new ExcelUtil<IvrTaskcall>(IvrTaskcall.class); + public void export(HttpServletResponse response, IvrTaskSingle ivrTaskcall) { + List<IvrTaskSingle> list = ivrTaskcallService.selectIvrTaskcallList(ivrTaskcall); + ExcelUtil<IvrTaskSingle> util = new ExcelUtil<IvrTaskSingle>(IvrTaskSingle.class); util.exportExcel(response, list, "鍗曚竴浠诲姟锛堥殢璁匡級鏁版嵁"); } @@ -79,7 +77,7 @@ @PreAuthorize("@ss.hasPermi('system:task:add')") @Log(title = "鍗曚竴浠诲姟锛堥殢璁匡級", businessType = BusinessType.INSERT) @PostMapping("/insertOrUpdateTask") - public AjaxResult insertOrUpdateHeTask(@RequestBody IvrTaskcallVO ivrTaskcallVO) { + public AjaxResult insertOrUpdateHeTask(@RequestBody IvrTaskSingleVO ivrTaskcallVO) { return toAjax(ivrTaskcallService.insertOrUpdateTask(ivrTaskcallVO)); } @@ -89,16 +87,16 @@ */ @ApiOperation("鏍规嵁鏉′欢鏌ヨ浠诲姟淇℃伅") @PostMapping("/queryTaskByCondition") - public AjaxResult queryTaskByCondition(@RequestBody IvrTaskcallVO ivrTaskcallVO) { + public AjaxResult queryTaskByCondition(@RequestBody IvrTaskSingleVO ivrTaskcallVO) { //鏍规嵁鍏ュ弬鏌ヨ淇℃伅 - IvrTaskcall ivrTaskcall = DtoConversionUtils.sourceToTarget(ivrTaskcallVO, IvrTaskcall.class); - List<IvrTaskcall> list = ivrTaskcallService.selectIvrTaskcallList(ivrTaskcall); + IvrTaskSingle ivrTaskcall = DtoConversionUtils.sourceToTarget(ivrTaskcallVO, IvrTaskSingle.class); + List<IvrTaskSingle> list = ivrTaskcallService.selectIvrTaskcallList(ivrTaskcall); //瀹氫箟鎮h�呬笌鍗曚竴浠诲姟鍏宠仈琛ㄩ泦鍚� List<PatTaskRelevance> patTaskRelevances = new ArrayList<>(); //灏嗘煡鍑烘潵鐨勬暟鎹�掑叆IvrTaskcallVO涓� - IvrTaskcallVO ivrTaskcallVO2 = DtoConversionUtils.sourceToTarget(list.get(0), IvrTaskcallVO.class); + IvrTaskSingleVO ivrTaskcallVO2 = DtoConversionUtils.sourceToTarget(list.get(0), IvrTaskSingleVO.class); String sendTimeSlot = list.get(0).getSendTimeSlot(); ObjectMapper objectMapper = new ObjectMapper(); try { @@ -116,7 +114,7 @@ e.printStackTrace(); } - for (IvrTaskcall ivrTaskcall1 : list) { + for (IvrTaskSingle ivrTaskcall1 : list) { PatTaskRelevance patTaskRelevance = new PatTaskRelevance(); //鑾峰彇鍒版偅鑰呬俊鎭紝骞舵斁鍏ュ埌闆嗗悎涓� patTaskRelevance.setName(ivrTaskcall1.getSendname()); @@ -137,7 +135,7 @@ */ @ApiOperation("浠诲姟鍙戦�佹墽琛�") @PostMapping("/heTaskSend") - public AjaxResult heTaskSend(@RequestBody IvrTaskcallVO ivrTaskcallVO) { + public AjaxResult heTaskSend(@RequestBody IvrTaskSingleVO ivrTaskcallVO) { return toAjax(ivrTaskcallService.heTaskSend(ivrTaskcallVO)); } -- Gitblit v1.9.3