修改接口

ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/RemoteTaskService.java

@@ -3,8 +3,7 @@ package com.ruoyi.task.api;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.constant.ServiceNameConstants;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.task.api.domain.TaskDTO;
+import com.ruoyi.task.api.domain.TaskVO;
-import com.ruoyi.task.api.domain.TaskQueryVO;
 import com.ruoyi.task.api.domain.TaskTempVO;
 import com.ruoyi.task.api.enums.StatusEnum;
 import com.ruoyi.task.api.factory.RemoteTaskFallbackFactory;
@@ -35,12 +34,12 @@ public interface RemoteTaskService
     /**
      * 创建无关联计划的任务
      *
-     * @param taskDTO 任务DTO
+     * @param taskVO 任务DTO
      * @param source 请求来源
      * @return 结果
      */
     @PostMapping("/task")
-    R<Long> createTaskWithoutPlan(@RequestBody TaskDTO taskDTO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    R<Long> createTaskWithoutPlan(@RequestBody TaskVO taskVO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     /**
      * 根据ID获取任务
@@ -50,7 +49,7 @@ public interface RemoteTaskService
      * @return 结果
      */
     @GetMapping("/task/{taskId}")
-    R<TaskDTO> getTaskById(@PathVariable("taskId") Long taskId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    R<TaskVO> getTaskById(@PathVariable("taskId") Long taskId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
 //    /**
 //     * 查询任务列表
@@ -65,12 +64,12 @@ public interface RemoteTaskService
     /**
      * 更新任务
      *
-     * @param taskDTO 任务DTO
+     * @param taskVO 任务DTO
      * @param source 请求来源
      * @return 结果
      */
     @PutMapping("/task")
-    R<Boolean> updateTask(@RequestBody TaskDTO taskDTO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    R<Boolean> updateTask(@RequestBody TaskVO taskVO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     /**
      * 删除任务
@@ -90,7 +89,7 @@ public interface RemoteTaskService
      * @return 结果
      */
     @GetMapping("/task/uav/{uavId}")
-    R<List<TaskDTO>> getTaskByUavId(@PathVariable("uavId") String uavId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    R<List<TaskVO>> getTaskByUavId(@PathVariable("uavId") String uavId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     /**
      * 根据无人机ID获取最新的一条任务
@@ -100,7 +99,7 @@ public interface RemoteTaskService
      * @return 结果
      */
     @GetMapping("/task/uav/current/{uavId}")
-    R<TaskDTO> getCurrentTaskByUavId(@PathVariable("uavId") String uavId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    R<TaskVO> getCurrentTaskByUavId(@PathVariable("uavId") String uavId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
 
 

ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskVO.java

@@ -13,7 +13,7 @@ import java.util.Date;
  * @author ruoyi
  * @date 2026-03-05
  */
-public class TaskDTO {
+public class TaskVO {
 
     /** 任务ID */
     private Long id;
@@ -42,6 +42,9 @@ public class TaskDTO {
     /** 状态 */
     private StatusEnum status;
 
+    /** 错误是否恢复 */
+    private Boolean recovery;
+
     /** 开始时间 */
     private Date startTime;
 
@@ -136,6 +139,14 @@ public class TaskDTO {
         this.status = status;
     }
 
+    public Boolean getRecovery() {
+        return recovery;
+    }
+
+    public void setRecovery(Boolean recovery) {
+        this.recovery = recovery;
+    }
+
     public Date getStartTime() {
         return startTime;
     }

ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/factory/RemoteTaskFallbackFactory.java

@@ -2,8 +2,7 @@ package com.ruoyi.task.api.factory;
 
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.task.api.RemoteTaskService;
-import com.ruoyi.task.api.domain.TaskDTO;
+import com.ruoyi.task.api.domain.TaskVO;
-import com.ruoyi.task.api.domain.TaskQueryVO;
 import com.ruoyi.task.api.domain.TaskTempVO;
 import com.ruoyi.task.api.enums.StatusEnum;
 import org.slf4j.Logger;
@@ -38,12 +37,12 @@ public class RemoteTaskFallbackFactory implements FallbackFactory<RemoteTaskServ
             }
 
             @Override
-            public R<Long> createTaskWithoutPlan(TaskDTO taskDTO, String source) {
+            public R<Long> createTaskWithoutPlan(TaskVO taskVO, String source) {
                 return R.fail("创建任务失败");
             }
 
             @Override
-            public R<TaskDTO> getTaskById(Long taskId, String source) {
+            public R<TaskVO> getTaskById(Long taskId, String source) {
                 return R.fail("获取任务失败");
             }
 
@@ -53,7 +52,7 @@ public class RemoteTaskFallbackFactory implements FallbackFactory<RemoteTaskServ
 //            }
 
             @Override
-            public R<Boolean> updateTask(TaskDTO taskDTO, String source) {
+            public R<Boolean> updateTask(TaskVO taskVO, String source) {
                 return R.fail("更新任务失败");
             }
 
@@ -63,12 +62,12 @@ public class RemoteTaskFallbackFactory implements FallbackFactory<RemoteTaskServ
             }
 
             @Override
-            public R<List<TaskDTO>> getTaskByUavId(String uavId, String source) {
+            public R<List<TaskVO>> getTaskByUavId(String uavId, String source) {
                 return R.ok(Collections.emptyList());
             }
 
             @Override
-            public R<TaskDTO> getCurrentTaskByUavId(String uavId, String source) {
+            public R<TaskVO> getCurrentTaskByUavId(String uavId, String source) {
                 return R.fail("获取最新任务失败");
             }