From f5fc8aa80721339ebe7995deebeda69815adbbc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Thu, 19 Mar 2026 08:34:31 +0800 Subject: [PATCH 1/2] =?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/device/api/domain/DroneTakeoffRequest.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) 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 e97400e..ea0a954 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 @@ -20,14 +20,9 @@ public class DroneTakeoffRequest implements Serializable { /** 机场SN号 */ @Schema(description = "机场SN号", example = "THJSQ03B2309DN7VQN43") private String sn; -// -// /** 消息ID */ -// @Schema(description = "消息ID", example = "9056") -// private Long messageID; -// /** 航线文件URL */ -// @Schema(description = "航线文件URL", example = "https://minio-jndsj.t-aaron.com:2443/th-airport/testFile/13912c62-b96f-4df5-ab65-813c8c4b04eb.waypoints") -// private String airlineFileUrl; + @Schema(description = "航线文件URL") + private String airlineFileUrl; /** 最低电池电量 */ @Schema(description = "最低电池电量", example = "0.3") From 2988e9d0b2a9bd63843f42a8a0d6e8c33bea7736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Thu, 19 Mar 2026 09:29:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=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 aa1de57..140786d 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 @@ -41,6 +41,16 @@ public interface RemoteTaskService @PostMapping("/task") R createTaskWithoutPlan(@RequestBody TaskVO taskVO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + /** + * 创建一键起飞任务 + * + * @param taskVO 任务DTO + * @param source 请求来源 + * @return 结果 + */ + @PostMapping("/task/{oneclick}") + R createOneClickTaskWithoutPlan(@RequestBody TaskVO taskVO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + /** * 根据ID获取任务 * 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 0675288..d7c8368 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 @@ -41,6 +41,11 @@ public class RemoteTaskFallbackFactory implements FallbackFactory createOneClickTaskWithoutPlan(TaskVO taskVO, String source) { + return R.fail("创建一键起飞任务失败"); + } + @Override public R getTaskById(Long taskId, String source) { return R.fail("获取任务失败");