From eac9e611c20c66fba40f12002bee1317b7e0d005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Fri, 13 Mar 2026 15:01:50 +0800 Subject: [PATCH 1/9] xx --- ...ngframework.boot.autoconfigure.AutoConfiguration.imports | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 ruoyi-api/tuoheng-api-device/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-api/tuoheng-api-device/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-api/tuoheng-api-device/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..53751ac --- /dev/null +++ b/ruoyi-api/tuoheng-api-device/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,6 @@ +com.ruoyi.device.api.factory.RemoteAircraftFallbackFactory +com.ruoyi.device.api.factory.RemoteAircraftFlyFallbackFactory +com.ruoyi.device.api.factory.RemoteDeviceFallbackFactory +com.ruoyi.device.api.factory.RemoteDockFallbackFactory +com.ruoyi.device.api.factory.RemoteGroupFallbackFactory +com.ruoyi.device.api.factory.RemoteStatisticsFallbackFactory From e97ab46ec6e0fd5a1081c1f04c986a4331255b79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Fri, 13 Mar 2026 15:14:45 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0DTO=E2=80=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/api/domain/TaskStatItemDTO.java | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatItemDTO.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatItemDTO.java index 085b8a1..58d8a69 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatItemDTO.java +++ b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatItemDTO.java @@ -15,6 +15,11 @@ public class TaskStatItemDTO { private Long planId; private String taskName; private String planName; + private String routeName; + private String airVendor; + private String airType; + private Date planStartDate; + private Date planEndDate; private Date startTime; private Date endTime; private Date actualStartTime; @@ -53,6 +58,46 @@ public class TaskStatItemDTO { this.planName = planName; } + public String getRouteName() { + return routeName; + } + + public void setRouteName(String routeName) { + this.routeName = routeName; + } + + public String getAirVendor() { + return airVendor; + } + + public void setAirVendor(String airVendor) { + this.airVendor = airVendor; + } + + public String getAirType() { + return airType; + } + + public void setAirType(String airType) { + this.airType = airType; + } + + public Date getPlanStartDate() { + return planStartDate; + } + + public void setPlanStartDate(Date planStartDate) { + this.planStartDate = planStartDate; + } + + public Date getPlanEndDate() { + return planEndDate; + } + + public void setPlanEndDate(Date planEndDate) { + this.planEndDate = planEndDate; + } + public Date getStartTime() { return startTime; } From b15f6954dac5c3022154ebbb5c1ddbbf40a280ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Fri, 13 Mar 2026 15:53:53 +0800 Subject: [PATCH 3/9] API --- ...ByMonthDTO.java => TaskStatByMonthVO.java} | 8 +++---- ...skStatItemDTO.java => TaskStatItemVO.java} | 22 ++++++++++++++++++- 2 files changed, 25 insertions(+), 5 deletions(-) rename ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/{TaskStatByMonthDTO.java => TaskStatByMonthVO.java} (68%) rename ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/{TaskStatItemDTO.java => TaskStatItemVO.java} (83%) diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatByMonthDTO.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatByMonthVO.java similarity index 68% rename from ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatByMonthDTO.java rename to ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatByMonthVO.java index ce9b051..54109ce 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatByMonthDTO.java +++ b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatByMonthVO.java @@ -9,13 +9,13 @@ import java.util.Map; * @author ruoyi * @date 2026-03-09 */ -public class TaskStatByMonthDTO { +public class TaskStatByMonthVO { /** 总数 */ private Integer total; /** 每日任务列表 key:日期(1-31) value:任务列表 */ - private Map> days; + private Map> days; public Integer getTotal() { return total; @@ -25,11 +25,11 @@ public class TaskStatByMonthDTO { this.total = total; } - public Map> getDays() { + public Map> getDays() { return days; } - public void setDays(Map> days) { + public void setDays(Map> days) { this.days = days; } } diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatItemDTO.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatItemVO.java similarity index 83% rename from ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatItemDTO.java rename to ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatItemVO.java index 58d8a69..f28c34b 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatItemDTO.java +++ b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatItemVO.java @@ -1,6 +1,8 @@ package com.ruoyi.task.api.domain; import com.ruoyi.task.api.enums.StatusEnum; +import com.ruoyi.task.api.enums.TaskCategoryEnum; +import com.ruoyi.task.api.enums.TaskTypeEnum; import java.util.Date; /** @@ -9,7 +11,7 @@ import java.util.Date; * @author ruoyi * @date 2026-03-09 */ -public class TaskStatItemDTO { +public class TaskStatItemVO { private Long taskId; private Long planId; @@ -25,6 +27,8 @@ public class TaskStatItemDTO { private Date actualStartTime; private Date actualEndTime; private StatusEnum status; + private TaskTypeEnum taskType; + private TaskCategoryEnum taskCategory; public Long getTaskId() { return taskId; @@ -137,4 +141,20 @@ public class TaskStatItemDTO { public void setStatus(StatusEnum status) { this.status = status; } + + public TaskTypeEnum getTaskType() { + return taskType; + } + + public void setTaskType(TaskTypeEnum taskType) { + this.taskType = taskType; + } + + public TaskCategoryEnum getTaskCategory() { + return taskCategory; + } + + public void setTaskCategory(TaskCategoryEnum taskCategory) { + this.taskCategory = taskCategory; + } } From a6f422f4a928ef6e097d0a6804151c8e6fbe9675 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Fri, 13 Mar 2026 16:17:11 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/task/api/domain/TaskStatItemVO.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatItemVO.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatItemVO.java index f28c34b..3d95bd0 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatItemVO.java +++ b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatItemVO.java @@ -29,6 +29,9 @@ public class TaskStatItemVO { private StatusEnum status; private TaskTypeEnum taskType; private TaskCategoryEnum taskCategory; + private String airlineType; + private Date taskCreateTime; + private String taskCreateBy; public Long getTaskId() { return taskId; @@ -157,4 +160,28 @@ public class TaskStatItemVO { public void setTaskCategory(TaskCategoryEnum taskCategory) { this.taskCategory = taskCategory; } + + public String getAirlineType() { + return airlineType; + } + + public void setAirlineType(String airlineType) { + this.airlineType = airlineType; + } + + public Date getTaskCreateTime() { + return taskCreateTime; + } + + public void setTaskCreateTime(Date taskCreateTime) { + this.taskCreateTime = taskCreateTime; + } + + public String getTaskCreateBy() { + return taskCreateBy; + } + + public void setTaskCreateBy(String taskCreateBy) { + this.taskCreateBy = taskCreateBy; + } } From 789a11bf1d85215a444fddf5faaecc78fabdaaf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Sat, 14 Mar 2026 09:25:23 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/device/api/domain/DockWithGPSVO.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockWithGPSVO.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockWithGPSVO.java index 04aafca..edc0fc6 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockWithGPSVO.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockWithGPSVO.java @@ -93,4 +93,13 @@ public class DockWithGPSVO implements Serializable { @Schema(description = "无人机SN号") private String snNumber; + @Schema(description = "舱内视频地址") + private String cabinVideoUrl; + + @Schema(description = "舱外视频地址") + private String outsideVideoUrl; + + @Schema(description = "直播视频地址") + private String liveVideoUrl; + } From fbc1d4fd2218a06617bec1e099d07469d19e931b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Sat, 14 Mar 2026 10:17:20 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/task/api/enums/StatusEnum.java | 1 + 1 file changed, 1 insertion(+) diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/StatusEnum.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/StatusEnum.java index 17f9c12..fd59d38 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/StatusEnum.java +++ b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/enums/StatusEnum.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonValue; public enum StatusEnum { PENDING("pending", "待执行"), + CHECKING("checking", "自检中"), RUNNING("running", "执行中"), COMPLETED("completed", "已完成"), FAILED("failed", "失败"), From 7e8b721a6e6f147f2f3672d64366f94bbb769fb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Sat, 14 Mar 2026 10:40:17 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/task/api/RemoteTaskService.java | 17 ++++++++--------- .../api/domain/{TaskDTO.java => TaskVO.java} | 13 ++++++++++++- .../api/factory/RemoteTaskFallbackFactory.java | 13 ++++++------- 3 files changed, 26 insertions(+), 17 deletions(-) rename ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/{TaskDTO.java => TaskVO.java} (95%) 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("获取最新任务失败"); } From 097682d1b9bb9355eb3a2b3c6fe80f44a2f9d786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Sat, 14 Mar 2026 11:03:16 +0800 Subject: [PATCH 8/9] xx --- .../com/ruoyi/device/api/domain/DroneTakeoffRequest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DroneTakeoffRequest.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DroneTakeoffRequest.java index 6bef56b..e97400e 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DroneTakeoffRequest.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DroneTakeoffRequest.java @@ -32,4 +32,9 @@ public class DroneTakeoffRequest implements Serializable { /** 最低电池电量 */ @Schema(description = "最低电池电量", example = "0.3") private Double flyBatteryMin; + + /** + * 任务ID + */ + private Long taskId; } From b2f2601f372dd5eff69ab7ca99834b16ee7ecd01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Sat, 14 Mar 2026 11:39:23 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/task/api/RemoteTaskService.java | 10 ++++++++++ .../task/api/factory/RemoteTaskFallbackFactory.java | 5 +++++ 2 files changed, 15 insertions(+) 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 e930bca..aa1de57 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 @@ -113,4 +113,14 @@ public interface RemoteTaskService */ @PutMapping("/task/status/{taskId}") R updateTaskStatus(@PathVariable("taskId") Long taskId, @RequestParam("status") StatusEnum status, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + /** + * 设置 recovery 为 true + * + * @param taskId 任务ID + * @param source 请求来源 + * @return 结果 + */ + @PutMapping("/task/recovery/{taskId}") + R updateTaskRecovery(@PathVariable("taskId") Long taskId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } \ No newline at end of file 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 a884a89..0675288 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 @@ -77,6 +77,11 @@ public class RemoteTaskFallbackFactory implements FallbackFactory updateTaskStatus(Long taskId, StatusEnum status, String source) { return R.fail("修改执行状态失败"); } + + @Override + public R updateTaskRecovery(Long taskId, String source) { + return R.fail("设置recovery失败"); + } }; } } \ No newline at end of file