diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/RemoteTaskService.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/RemoteTaskService.java index 9f0bc54..e930bca 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/RemoteTaskService.java +++ b/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.TaskQueryVO; +import com.ruoyi.task.api.domain.TaskVO; 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 createTaskWithoutPlan(@RequestBody TaskDTO taskDTO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + R createTaskWithoutPlan(@RequestBody TaskVO taskVO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 根据ID获取任务 @@ -50,7 +49,7 @@ public interface RemoteTaskService * @return 结果 */ @GetMapping("/task/{taskId}") - R getTaskById(@PathVariable("taskId") Long taskId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + R 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 updateTask(@RequestBody TaskDTO taskDTO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + R updateTask(@RequestBody TaskVO taskVO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 删除任务 @@ -90,7 +89,7 @@ public interface RemoteTaskService * @return 结果 */ @GetMapping("/task/uav/{uavId}") - R> getTaskByUavId(@PathVariable("uavId") String uavId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + R> 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 getCurrentTaskByUavId(@PathVariable("uavId") String uavId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + R getCurrentTaskByUavId(@PathVariable("uavId") String uavId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskDTO.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskVO.java similarity index 95% rename from ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskDTO.java rename to ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskVO.java index 2cb5ecf..3e4793b 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskDTO.java +++ b/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; } diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/factory/RemoteTaskFallbackFactory.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/factory/RemoteTaskFallbackFactory.java index f80d5e3..a884a89 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/factory/RemoteTaskFallbackFactory.java +++ b/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.TaskQueryVO; +import com.ruoyi.task.api.domain.TaskVO; 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 createTaskWithoutPlan(TaskDTO taskDTO, String source) { + public R createTaskWithoutPlan(TaskVO taskVO, String source) { return R.fail("创建任务失败"); } @Override - public R getTaskById(Long taskId, String source) { + public R getTaskById(Long taskId, String source) { return R.fail("获取任务失败"); } @@ -53,7 +52,7 @@ public class RemoteTaskFallbackFactory implements FallbackFactory updateTask(TaskDTO taskDTO, String source) { + public R updateTask(TaskVO taskVO, String source) { return R.fail("更新任务失败"); } @@ -63,12 +62,12 @@ public class RemoteTaskFallbackFactory implements FallbackFactory> getTaskByUavId(String uavId, String source) { + public R> getTaskByUavId(String uavId, String source) { return R.ok(Collections.emptyList()); } @Override - public R getCurrentTaskByUavId(String uavId, String source) { + public R getCurrentTaskByUavId(String uavId, String source) { return R.fail("获取最新任务失败"); }