diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/RemoteAircraftFlyService.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/RemoteAircraftFlyService.java index 9d6ea01..6c7cacf 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/RemoteAircraftFlyService.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/RemoteAircraftFlyService.java @@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.device.api.domain.DroneCurrentStatusVO; import com.ruoyi.device.api.domain.DroneFlightControlRequest; import com.ruoyi.device.api.domain.DroneRealtimeInfoVO; +import com.ruoyi.device.api.domain.DroneTakeoffRequest; import com.ruoyi.device.api.domain.DroneTakeoffResponseVO; import com.ruoyi.device.api.domain.MachineStateVO; import com.ruoyi.device.api.factory.RemoteAircraftFlyFallbackFactory; @@ -52,13 +53,13 @@ public interface RemoteAircraftFlyService R getCurrentStatus(@PathVariable("dockId") Long dockId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** - * 无人机起飞接口 + * 无人机航线任务(一键起飞用的也是该接口) * - * @param sn 机场SN号 + * @param request 起飞请求对象 * @return 起飞响应 */ - @PostMapping("/drone/takeoff/{sn}") - R takeoff(@PathVariable("sn") String sn); + @PostMapping("/drone/takeoff") + R takeoff(@RequestBody DroneTakeoffRequest request); /** * 无人机开机接口 diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/factory/RemoteAircraftFlyFallbackFactory.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/factory/RemoteAircraftFlyFallbackFactory.java index 79eaa12..8f9e235 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/factory/RemoteAircraftFlyFallbackFactory.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/factory/RemoteAircraftFlyFallbackFactory.java @@ -5,6 +5,7 @@ import com.ruoyi.device.api.RemoteAircraftFlyService; import com.ruoyi.device.api.domain.DroneCurrentStatusVO; import com.ruoyi.device.api.domain.DroneFlightControlRequest; import com.ruoyi.device.api.domain.DroneRealtimeInfoVO; +import com.ruoyi.device.api.domain.DroneTakeoffRequest; import com.ruoyi.device.api.domain.DroneTakeoffResponseVO; import com.ruoyi.device.api.domain.MachineStateVO; import org.slf4j.Logger; @@ -48,7 +49,7 @@ public class RemoteAircraftFlyFallbackFactory implements FallbackFactory takeoff(String sn) + public R takeoff(DroneTakeoffRequest request) { return R.fail("无人机起飞失败:" + throwable.getMessage()); }