修改

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<Long> createTaskWithoutPlan(@RequestBody com.ruoyi.task.api.domain.TaskDTO taskDTO)
     {
-        Long taskId = taskService.createTaskWithoutPlan(taskDTO);
+        Long taskId = taskService.createTaskWithoutPlan(TaskControllerConvert.to(taskDTO));
-        return success(taskId);
+        return R.ok(taskId);
     }
 
     /**
      * 获取任务详细信息
      */
     @GetMapping(value = "/{taskId}")
-    public AjaxResult getTaskById(@PathVariable("taskId") Long taskId)
+    public R<com.ruoyi.task.api.domain.TaskDTO> getTaskById(@PathVariable("taskId") Long taskId)
     {
-        TaskDTO taskDTO = taskService.getTaskById(taskId);
+        return R.ok(TaskControllerConvert.from(taskService.getTaskById(taskId)));
-        return success(taskDTO);
     }
 
     /**
      * 复杂条件查询任务列表
      */
     @PostMapping("/list")
-    public TableDataInfo list(@RequestBody TaskQueryDTO queryDTO)
+    public R<List<com.ruoyi.task.api.domain.TaskDTO>> list(@RequestBody TaskQueryDTO queryDTO)
     {
-        startPage();
+        return R.ok(TaskControllerConvert.fromList(taskService.getTaskList(queryDTO)));
-        List<TaskDTO> list = taskService.getTaskList(queryDTO);
-        return getDataTable(list);
     }
 
     /**
      * 更新任务
      */
     @PutMapping
-    public AjaxResult updateTask(@RequestBody TaskDTO taskDTO)
+    public R<Boolean> updateTask(@RequestBody com.ruoyi.task.api.domain.TaskDTO taskDTO)
     {
-        boolean result = taskService.updateTask(taskDTO);
+        boolean result = taskService.updateTask(TaskControllerConvert.to(taskDTO));
-        return success(result);
+        return R.ok(result);
     }
 
     /**
      * 删除任务
      */
     @DeleteMapping("/{taskId}")
-    public AjaxResult deleteTask(@PathVariable("taskId") Long taskId)
+    public R<Boolean> 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<List<com.ruoyi.task.api.domain.TaskDTO>> getTaskByUavId(@PathVariable("uavId") Long uavId)
     {
-        List<TaskDTO> taskList = taskService.getTaskByUavId(uavId);
+        return R.ok(TaskControllerConvert.fromList(taskService.getTaskByUavId(uavId)));
-        return success(taskList);
     }
 
     /**
      * 根据无人机ID获取最新的一条任务
      */
     @GetMapping("/uav/current/{uavId}")
-    public AjaxResult getCurrentTaskByUavId(@PathVariable("uavId") Long uavId)
+    public R<com.ruoyi.task.api.domain.TaskDTO> getCurrentTaskByUavId(@PathVariable("uavId") Long uavId)
     {
-        TaskDTO taskDTO = taskService.getCurrentTaskByUavId(uavId);
+        return R.ok(TaskControllerConvert.from(taskService.getCurrentTaskByUavId(uavId)));
-        return success(taskDTO);
     }
 
     /**
      * 修改执行状态
      */
     @PutMapping("/status/{taskId}")
-    public AjaxResult updateTaskStatus(@PathVariable("taskId") Long taskId, @RequestParam("status") StatusEnum status)
+    public R<Boolean> 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<TaskDTO> getTaskByIdInner(@PathVariable("taskId") Long taskId)
     {
-        TaskDTO taskDTO = taskService.getTaskById(taskId);
+        return R.ok(TaskControllerConvert.from(taskService.getTaskById(taskId)));
-        return R.ok(taskDTO);
     }
 
     /**
@@ -126,8 +119,7 @@ public class TaskController extends BaseController
     @PostMapping("/inner/list")
     public R<List<TaskDTO>> listInner(@RequestBody TaskQueryDTO queryDTO)
     {
-        List<TaskDTO> list = taskService.getTaskList(queryDTO);
+        return R.ok(TaskControllerConvert.fromList(taskService.getTaskList(queryDTO)));
-        return R.ok(list);
     }
 
     /**
@@ -137,8 +129,7 @@ public class TaskController extends BaseController
     @GetMapping("/inner/uav/{uavId}")
     public R<List<TaskDTO>> getTaskByUavIdInner(@PathVariable("uavId") Long uavId)
     {
-        List<TaskDTO> taskList = taskService.getTaskByUavId(uavId);
+        return R.ok(TaskControllerConvert.fromList(taskService.getTaskByUavId(uavId)));
-        return R.ok(taskList);
     }
 
     /**
@@ -148,7 +139,6 @@ public class TaskController extends BaseController
     @GetMapping("/inner/uav/current/{uavId}")
     public R<TaskDTO> getCurrentTaskByUavIdInner(@PathVariable("uavId") Long uavId)
     {
-        TaskDTO taskDTO = taskService.getCurrentTaskByUavId(uavId);
+        return R.ok(TaskControllerConvert.from(taskService.getCurrentTaskByUavId(uavId)));
-        return R.ok(taskDTO);
     }
 }

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<Long> 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<Long> 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<TaskPlanDTO> 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<TaskPlanDTO>> list(@RequestBody TaskPlanQueryDTO queryDTO)
     {
-        startPage();
+        return R.ok(TaskPlanControllerConvert.fromList(taskPlanService.getTaskPlanList(TaskPlanQueryControllerConvert.to(queryDTO))));
-        return getDataTable(TaskPlanControllerConvert.fromList(taskPlanService.getTaskPlanList(TaskPlanQueryControllerConvert.to(queryDTO))));
     }
 
     /**
      * 更新任务计划
      */
     @PutMapping
-    public AjaxResult updateTaskPlan(@RequestBody TaskPlanDTO taskPlanDTO)
+    public R<Boolean> 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<Boolean> deleteTaskPlan(@PathVariable("planId") Long planId)
     {
         boolean result = taskPlanService.deleteTaskPlan(planId);
-        return success(result);
+        return R.ok(result);
     }
 
     /**

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<com.ruoyi.task.service.dto.TaskDTO, com.ruoyi.task.api.domain.TaskDTO> {
+
+    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<com.ruoyi.task.api.domain.TaskDTO> fromList(List<com.ruoyi.task.service.dto.TaskDTO> dtoList) {
+        return INSTANCE.innerFromList(dtoList);
+    }
+
+    /**
+     * API DTO List 转 服务DTO List
+     */
+    public static List<com.ruoyi.task.service.dto.TaskDTO> toList(List<com.ruoyi.task.api.domain.TaskDTO> apiDTOList) {
+        return INSTANCE.innerToList(apiDTOList);
+    }
+}