From d2a6edead809d90e960d67de5f14c8f982e48e38 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:35:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E9=94=AE=E8=B5=B7?= =?UTF-8?q?=E9=A3=9E=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/controller/AircraftFlyController.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ruoyi/device/controller/AircraftFlyController.java b/src/main/java/com/ruoyi/device/controller/AircraftFlyController.java index 40a17cb..1832cca 100644 --- a/src/main/java/com/ruoyi/device/controller/AircraftFlyController.java +++ b/src/main/java/com/ruoyi/device/controller/AircraftFlyController.java @@ -2,6 +2,7 @@ package com.ruoyi.device.controller; import com.alibaba.fastjson.JSON; import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.device.api.domain.*; import com.ruoyi.device.api.enums.DroneCurrentStatusEnum; @@ -243,16 +244,20 @@ public class AircraftFlyController extends BaseController * @param request 起飞请求对象 * @return 起飞响应 */ - @Operation(summary = "无人机一键起飞", description = "控制指定机场的无人机执行起飞操作") + @Operation(summary = "无人机航线任务（一键起飞用的也是该接口）", description = "控制指定机场的无人机执行起飞操作") @PostMapping("/takeoff") public R takeoff(@RequestBody DroneTakeoffRequest request) { // Long taskId = flightService.createClickTakeOffTask(request.getSn(),airlineFileUrl); - log.info("一键起飞,生成一键起飞任务 {} ", JSON.toJSONString(request)); + log.info("无人机航线任务（一键起飞用的也是该接口） {} ", JSON.toJSONString(request)); try { java.util.Map params = new java.util.HashMap<>(); - params.put("airlineFileUrl", airlineFileUrl); + if(StringUtils.isEmpty(request.getAirlineFileUrl())){ + params.put("airlineFileUrl", airlineFileUrl); + }else { + params.put("airlineFileUrl", request.getAirlineFileUrl()); + } params.put("flyBatteryMin", request.getFlyBatteryMin()); params.put("messageID", request.getTaskId()); CompletableFuture future = machineCommandManager.executeCommand(request.getSn(), CommandType.TAKE_OFF, params);