From a3d7168699fbd0dd439a8540f40152796c2a6d87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 9 Mar 2026 09:30:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/task/controller/TaskController.java | 58 ++++++++----------- .../task/controller/TaskPlanController.java | 25 ++++---- .../convert/TaskControllerConvert.java | 48 +++++++++++++++ 3 files changed, 84 insertions(+), 47 deletions(-) create mode 100644 src/main/java/com/ruoyi/task/controller/convert/TaskControllerConvert.java diff --git a/src/main/java/com/ruoyi/task/controller/TaskController.java b/src/main/java/com/ruoyi/task/controller/TaskController.java index 83ec1ac..d4274a3 100644 --- a/src/main/java/com/ruoyi/task/controller/TaskController.java +++ b/src/main/java/com/ruoyi/task/controller/TaskController.java @@ -2,13 +2,12 @@ package com.ruoyi.task.controller; import com.ruoyi.common.core.domain.R; 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.TaskDTO; +import com.ruoyi.task.api.domain.TaskDTO; import com.ruoyi.task.service.dto.TaskQueryDTO; import com.ruoyi.task.api.enums.StatusEnum; import com.ruoyi.task.service.api.ITaskService; +import com.ruoyi.task.controller.convert.TaskControllerConvert; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -31,81 +30,76 @@ public class TaskController extends BaseController * 创建无关联计划的任务 */ @PostMapping - public AjaxResult createTaskWithoutPlan(@RequestBody TaskDTO taskDTO) + public R createTaskWithoutPlan(@RequestBody com.ruoyi.task.api.domain.TaskDTO taskDTO) { - Long taskId = taskService.createTaskWithoutPlan(taskDTO); - return success(taskId); + Long taskId = taskService.createTaskWithoutPlan(TaskControllerConvert.to(taskDTO)); + return R.ok(taskId); } /** * 获取任务详细信息 */ @GetMapping(value = "/{taskId}") - public AjaxResult getTaskById(@PathVariable("taskId") Long taskId) + public R getTaskById(@PathVariable("taskId") Long taskId) { - TaskDTO taskDTO = taskService.getTaskById(taskId); - return success(taskDTO); + return R.ok(TaskControllerConvert.from(taskService.getTaskById(taskId))); } /** * 复杂条件查询任务列表 */ @PostMapping("/list") - public TableDataInfo list(@RequestBody TaskQueryDTO queryDTO) + public R> list(@RequestBody TaskQueryDTO queryDTO) { - startPage(); - List list = taskService.getTaskList(queryDTO); - return getDataTable(list); + return R.ok(TaskControllerConvert.fromList(taskService.getTaskList(queryDTO))); } /** * 更新任务 */ @PutMapping - public AjaxResult updateTask(@RequestBody TaskDTO taskDTO) + public R updateTask(@RequestBody com.ruoyi.task.api.domain.TaskDTO taskDTO) { - boolean result = taskService.updateTask(taskDTO); - return success(result); + boolean result = taskService.updateTask(TaskControllerConvert.to(taskDTO)); + return R.ok(result); } /** * 删除任务 */ @DeleteMapping("/{taskId}") - public AjaxResult deleteTask(@PathVariable("taskId") Long taskId) + public R deleteTask(@PathVariable("taskId") Long taskId) { boolean result = taskService.deleteTask(taskId); - return success(result); + return R.ok(result); } /** * 根据无人机ID查询任务列表 */ @GetMapping("/uav/{uavId}") - public AjaxResult getTaskByUavId(@PathVariable("uavId") Long uavId) + public R> getTaskByUavId(@PathVariable("uavId") Long uavId) { - List taskList = taskService.getTaskByUavId(uavId); - return success(taskList); + return R.ok(TaskControllerConvert.fromList(taskService.getTaskByUavId(uavId))); } /** * 根据无人机ID获取最新的一条任务 */ @GetMapping("/uav/current/{uavId}") - public AjaxResult getCurrentTaskByUavId(@PathVariable("uavId") Long uavId) + public R getCurrentTaskByUavId(@PathVariable("uavId") Long uavId) { - TaskDTO taskDTO = taskService.getCurrentTaskByUavId(uavId); - return success(taskDTO); + return R.ok(TaskControllerConvert.from(taskService.getCurrentTaskByUavId(uavId))); } /** * 修改执行状态 */ @PutMapping("/status/{taskId}") - public AjaxResult updateTaskStatus(@PathVariable("taskId") Long taskId, @RequestParam("status") StatusEnum status) + public R updateTaskStatus(@PathVariable("taskId") Long taskId, @RequestParam("status") StatusEnum status) { boolean result = taskService.updateTaskStatus(taskId, status); - return success(result); + return R.ok(result); } /** @@ -115,8 +109,7 @@ public class TaskController extends BaseController @GetMapping(value = "/inner/{taskId}") public R getTaskByIdInner(@PathVariable("taskId") Long taskId) { - TaskDTO taskDTO = taskService.getTaskById(taskId); - return R.ok(taskDTO); + return R.ok(TaskControllerConvert.from(taskService.getTaskById(taskId))); } /** @@ -126,8 +119,7 @@ public class TaskController extends BaseController @PostMapping("/inner/list") public R> listInner(@RequestBody TaskQueryDTO queryDTO) { - List list = taskService.getTaskList(queryDTO); - return R.ok(list); + return R.ok(TaskControllerConvert.fromList(taskService.getTaskList(queryDTO))); } /** @@ -137,8 +129,7 @@ public class TaskController extends BaseController @GetMapping("/inner/uav/{uavId}") public R> getTaskByUavIdInner(@PathVariable("uavId") Long uavId) { - List taskList = taskService.getTaskByUavId(uavId); - return R.ok(taskList); + return R.ok(TaskControllerConvert.fromList(taskService.getTaskByUavId(uavId))); } /** @@ -148,7 +139,6 @@ public class TaskController extends BaseController @GetMapping("/inner/uav/current/{uavId}") public R getCurrentTaskByUavIdInner(@PathVariable("uavId") Long uavId) { - TaskDTO taskDTO = taskService.getCurrentTaskByUavId(uavId); - return R.ok(taskDTO); + return R.ok(TaskControllerConvert.from(taskService.getCurrentTaskByUavId(uavId))); } } \ No newline at end of file diff --git a/src/main/java/com/ruoyi/task/controller/TaskPlanController.java b/src/main/java/com/ruoyi/task/controller/TaskPlanController.java index 691a559..9e3fd04 100644 --- a/src/main/java/com/ruoyi/task/controller/TaskPlanController.java +++ b/src/main/java/com/ruoyi/task/controller/TaskPlanController.java @@ -32,59 +32,58 @@ public class TaskPlanController extends BaseController * 创建定时任务计划 */ @PostMapping("/timed") - public AjaxResult createTimedTaskPlan(@RequestBody TaskPlanDTO taskPlanDTO) + public R createTimedTaskPlan(@RequestBody TaskPlanDTO taskPlanDTO) { Long planId = taskPlanService.createTimedTaskPlan(TaskPlanControllerConvert.to(taskPlanDTO)); - return success(planId); + return R.ok(planId); } /** * 创建周期任务计划 */ @PostMapping("/cycle") - public AjaxResult createCycleTaskPlan(@RequestBody TaskPlanDTO taskPlanDTO) + public R createCycleTaskPlan(@RequestBody TaskPlanDTO taskPlanDTO) { Long planId = taskPlanService.createCycleTaskPlan(TaskPlanControllerConvert.to(taskPlanDTO)); - return success(planId); + return R.ok(planId); } /** * 获取任务计划详细信息 */ @GetMapping(value = "/{planId}") - public AjaxResult getTaskPlanById(@PathVariable("planId") Long planId) + public R getTaskPlanById(@PathVariable("planId") Long planId) { - return success(TaskPlanControllerConvert.from(taskPlanService.getTaskPlanById(planId))); + return R.ok(TaskPlanControllerConvert.from(taskPlanService.getTaskPlanById(planId))); } /** * 复杂条件查询任务计划列表 */ @PostMapping("/list") - public TableDataInfo list(@RequestBody TaskPlanQueryDTO queryDTO) + public R> list(@RequestBody TaskPlanQueryDTO queryDTO) { - startPage(); - return getDataTable(TaskPlanControllerConvert.fromList(taskPlanService.getTaskPlanList(TaskPlanQueryControllerConvert.to(queryDTO)))); + return R.ok(TaskPlanControllerConvert.fromList(taskPlanService.getTaskPlanList(TaskPlanQueryControllerConvert.to(queryDTO)))); } /** * 更新任务计划 */ @PutMapping - public AjaxResult updateTaskPlan(@RequestBody TaskPlanDTO taskPlanDTO) + public R updateTaskPlan(@RequestBody TaskPlanDTO taskPlanDTO) { boolean result = taskPlanService.updateTaskPlan(TaskPlanControllerConvert.to(taskPlanDTO)); - return success(result); + return R.ok(result); } /** * 删除任务计划 */ @DeleteMapping("/{planId}") - public AjaxResult deleteTaskPlan(@PathVariable("planId") Long planId) + public R deleteTaskPlan(@PathVariable("planId") Long planId) { boolean result = taskPlanService.deleteTaskPlan(planId); - return success(result); + return R.ok(result); } /** diff --git a/src/main/java/com/ruoyi/task/controller/convert/TaskControllerConvert.java b/src/main/java/com/ruoyi/task/controller/convert/TaskControllerConvert.java new file mode 100644 index 0000000..862c573 --- /dev/null +++ b/src/main/java/com/ruoyi/task/controller/convert/TaskControllerConvert.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 TaskControllerConvert extends BaseConvert { + + private static final TaskControllerConvert INSTANCE = new TaskControllerConvert(); + + private TaskControllerConvert() { + super(com.ruoyi.task.service.dto.TaskDTO.class, com.ruoyi.task.api.domain.TaskDTO.class); + } + + /** + * 服务DTO 转 API DTO + */ + public static com.ruoyi.task.api.domain.TaskDTO from(com.ruoyi.task.service.dto.TaskDTO dto) { + return INSTANCE.innerFrom(dto); + } + + /** + * API DTO 转 服务DTO + */ + public static com.ruoyi.task.service.dto.TaskDTO to(com.ruoyi.task.api.domain.TaskDTO 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); + } +}