diff --git a/src/main/java/com/ruoyi/task/controller/TaskPlanController.java b/src/main/java/com/ruoyi/task/controller/TaskPlanController.java index c748f3b..691a559 100644 --- a/src/main/java/com/ruoyi/task/controller/TaskPlanController.java +++ b/src/main/java/com/ruoyi/task/controller/TaskPlanController.java @@ -5,9 +5,11 @@ import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.page.TableDataInfo; import com.ruoyi.common.security.annotation.InnerAuth; -import com.ruoyi.task.service.dto.TaskPlanDTO; -import com.ruoyi.task.service.dto.TaskPlanQueryDTO; +import com.ruoyi.task.api.domain.TaskPlanDTO; +import com.ruoyi.task.api.domain.TaskPlanQueryDTO; import com.ruoyi.task.service.api.ITaskPlanService; +import com.ruoyi.task.controller.convert.TaskPlanControllerConvert; +import com.ruoyi.task.controller.convert.TaskPlanQueryControllerConvert; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -32,7 +34,7 @@ public class TaskPlanController extends BaseController @PostMapping("/timed") public AjaxResult createTimedTaskPlan(@RequestBody TaskPlanDTO taskPlanDTO) { - Long planId = taskPlanService.createTimedTaskPlan(taskPlanDTO); + Long planId = taskPlanService.createTimedTaskPlan(TaskPlanControllerConvert.to(taskPlanDTO)); return success(planId); } @@ -42,7 +44,7 @@ public class TaskPlanController extends BaseController @PostMapping("/cycle") public AjaxResult createCycleTaskPlan(@RequestBody TaskPlanDTO taskPlanDTO) { - Long planId = taskPlanService.createCycleTaskPlan(taskPlanDTO); + Long planId = taskPlanService.createCycleTaskPlan(TaskPlanControllerConvert.to(taskPlanDTO)); return success(planId); } @@ -52,8 +54,7 @@ public class TaskPlanController extends BaseController @GetMapping(value = "/{planId}") public AjaxResult getTaskPlanById(@PathVariable("planId") Long planId) { - TaskPlanDTO taskPlanDTO = taskPlanService.getTaskPlanById(planId); - return success(taskPlanDTO); + return success(TaskPlanControllerConvert.from(taskPlanService.getTaskPlanById(planId))); } /** @@ -63,8 +64,7 @@ public class TaskPlanController extends BaseController public TableDataInfo list(@RequestBody TaskPlanQueryDTO queryDTO) { startPage(); - List list = taskPlanService.getTaskPlanList(queryDTO); - return getDataTable(list); + return getDataTable(TaskPlanControllerConvert.fromList(taskPlanService.getTaskPlanList(TaskPlanQueryControllerConvert.to(queryDTO)))); } /** @@ -73,7 +73,7 @@ public class TaskPlanController extends BaseController @PutMapping public AjaxResult updateTaskPlan(@RequestBody TaskPlanDTO taskPlanDTO) { - boolean result = taskPlanService.updateTaskPlan(taskPlanDTO); + boolean result = taskPlanService.updateTaskPlan(TaskPlanControllerConvert.to(taskPlanDTO)); return success(result); } @@ -94,8 +94,7 @@ public class TaskPlanController extends BaseController @GetMapping(value = "/inner/{planId}") public R getTaskPlanByIdInner(@PathVariable("planId") Long planId) { - TaskPlanDTO taskPlanDTO = taskPlanService.getTaskPlanById(planId); - return R.ok(taskPlanDTO); + return R.ok(TaskPlanControllerConvert.from(taskPlanService.getTaskPlanById(planId))); } /** @@ -105,7 +104,6 @@ public class TaskPlanController extends BaseController @PostMapping("/inner/list") public R> listInner(@RequestBody TaskPlanQueryDTO queryDTO) { - List list = taskPlanService.getTaskPlanList(queryDTO); - return R.ok(list); + return R.ok(TaskPlanControllerConvert.fromList(taskPlanService.getTaskPlanList(TaskPlanQueryControllerConvert.to(queryDTO)))); } } \ No newline at end of file diff --git a/src/main/java/com/ruoyi/task/controller/convert/TaskPlanControllerConvert.java b/src/main/java/com/ruoyi/task/controller/convert/TaskPlanControllerConvert.java new file mode 100644 index 0000000..cab49e6 --- /dev/null +++ b/src/main/java/com/ruoyi/task/controller/convert/TaskPlanControllerConvert.java @@ -0,0 +1,48 @@ +package com.ruoyi.task.controller.convert; + +import com.ruoyi.common.core.utils.BaseConvert; + +import java.util.List; + +/** + * 任务计划Controller转换器 + * + * @author ruoyi + * @date 2026-03-09 + */ +public class TaskPlanControllerConvert extends BaseConvert { + + private static final TaskPlanControllerConvert INSTANCE = new TaskPlanControllerConvert(); + + private TaskPlanControllerConvert() { + super(com.ruoyi.task.service.dto.TaskPlanDTO.class, com.ruoyi.task.api.domain.TaskPlanDTO.class); + } + + /** + * 服务DTO 转 API DTO + */ + public static com.ruoyi.task.api.domain.TaskPlanDTO from(com.ruoyi.task.service.dto.TaskPlanDTO dto) { + return INSTANCE.innerFrom(dto); + } + + /** + * API DTO 转 服务DTO + */ + public static com.ruoyi.task.service.dto.TaskPlanDTO to(com.ruoyi.task.api.domain.TaskPlanDTO apiDTO) { + return INSTANCE.innerTo(apiDTO); + } + + /** + * 服务DTO List 转 API DTO List + */ + public static List fromList(List dtoList) { + return INSTANCE.innerFromList(dtoList); + } + + /** + * API DTO List 转 服务DTO List + */ + public static List toList(List apiDTOList) { + return INSTANCE.innerToList(apiDTOList); + } +} diff --git a/src/main/java/com/ruoyi/task/controller/convert/TaskPlanQueryControllerConvert.java b/src/main/java/com/ruoyi/task/controller/convert/TaskPlanQueryControllerConvert.java new file mode 100644 index 0000000..e714f3a --- /dev/null +++ b/src/main/java/com/ruoyi/task/controller/convert/TaskPlanQueryControllerConvert.java @@ -0,0 +1,32 @@ +package com.ruoyi.task.controller.convert; + +import com.ruoyi.common.core.utils.BaseConvert; + +/** + * 任务计划查询Controller转换器 + * + * @author ruoyi + * @date 2026-03-09 + */ +public class TaskPlanQueryControllerConvert extends BaseConvert { + + private static final TaskPlanQueryControllerConvert INSTANCE = new TaskPlanQueryControllerConvert(); + + private TaskPlanQueryControllerConvert() { + super(com.ruoyi.task.service.dto.TaskPlanQueryDTO.class, com.ruoyi.task.api.domain.TaskPlanQueryDTO.class); + } + + /** + * 服务DTO 转 API DTO + */ + public static com.ruoyi.task.api.domain.TaskPlanQueryDTO from(com.ruoyi.task.service.dto.TaskPlanQueryDTO dto) { + return INSTANCE.innerFrom(dto); + } + + /** + * API DTO 转 服务DTO + */ + public static com.ruoyi.task.service.dto.TaskPlanQueryDTO to(com.ruoyi.task.api.domain.TaskPlanQueryDTO apiDTO) { + return INSTANCE.innerTo(apiDTO); + } +}