Merge remote-tracking branch 'origin/main'

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")

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

@@ -41,6 +41,16 @@ public interface RemoteTaskService
     @PostMapping("/task")
     R<Long> createTaskWithoutPlan(@RequestBody TaskVO taskVO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
+    /**
+     * 创建一键起飞任务
+     *
+     * @param taskVO 任务DTO
+     * @param source 请求来源
+     * @return 结果
+     */
+    @PostMapping("/task/{oneclick}")
+    R<Long> createOneClickTaskWithoutPlan(@RequestBody TaskVO taskVO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
     /**
      * 根据ID获取任务
      *

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

@@ -41,6 +41,11 @@ public class RemoteTaskFallbackFactory implements FallbackFactory<RemoteTaskServ
                 return R.fail("创建任务失败");
             }
 
+            @Override
+            public R<Long> createOneClickTaskWithoutPlan(TaskVO taskVO, String source) {
+                return R.fail("创建一键起飞任务失败");
+            }
+
             @Override
             public R<TaskVO> getTaskById(Long taskId, String source) {
                 return R.fail("获取任务失败");