THENG
/
a-cloud-all
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
gyb 2026-03-20 10:49:14 +08:00
parent 676fd358c1 60c8affc0d
commit c41217a780
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/RemoteAircraftFlyService.java
View File

@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.R;
import com.ruoyi.device.api.domain.DroneCurrentStatusVO; import com.ruoyi.device.api.domain.DroneCurrentStatusVO;
import com.ruoyi.device.api.domain.DroneFlightControlRequest; import com.ruoyi.device.api.domain.DroneFlightControlRequest;
import com.ruoyi.device.api.domain.DroneRealtimeInfoVO; 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.DroneTakeoffResponseVO;
import com.ruoyi.device.api.domain.MachineStateVO; import com.ruoyi.device.api.domain.MachineStateVO;
import com.ruoyi.device.api.factory.RemoteAircraftFlyFallbackFactory; import com.ruoyi.device.api.factory.RemoteAircraftFlyFallbackFactory;
@ -52,13 +53,13 @@ public interface RemoteAircraftFlyService
R<DroneCurrentStatusVO> getCurrentStatus(@PathVariable("dockId") Long dockId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); R<DroneCurrentStatusVO> getCurrentStatus(@PathVariable("dockId") Long dockId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
/** /**
* 无人机起飞接口 * 无人机航线任务（一键起飞用的也是该接口）
* *
* @param sn 机场SN号 * @param request 起飞请求对象
* @return 起飞响应 * @return 起飞响应
*/ */
@PostMapping("/drone/takeoff/{sn}") @PostMapping("/drone/takeoff")
R<String> takeoff(@PathVariable("sn") String sn); R<String> takeoff(@RequestBody DroneTakeoffRequest request);
/** /**
* 无人机开机接口 * 无人机开机接口

3
ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/factory/RemoteAircraftFlyFallbackFactory.java
View File

@ -5,6 +5,7 @@ import com.ruoyi.device.api.RemoteAircraftFlyService;
import com.ruoyi.device.api.domain.DroneCurrentStatusVO; import com.ruoyi.device.api.domain.DroneCurrentStatusVO;
import com.ruoyi.device.api.domain.DroneFlightControlRequest; import com.ruoyi.device.api.domain.DroneFlightControlRequest;
import com.ruoyi.device.api.domain.DroneRealtimeInfoVO; 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.DroneTakeoffResponseVO;
import com.ruoyi.device.api.domain.MachineStateVO; import com.ruoyi.device.api.domain.MachineStateVO;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -48,7 +49,7 @@ public class RemoteAircraftFlyFallbackFactory implements FallbackFactory<RemoteA
} }
@Override @Override
public R<String> takeoff(String sn) public R<String> takeoff(DroneTakeoffRequest request)
{ {
return R.fail("无人机起飞失败:" + throwable.getMessage()); return R.fail("无人机起飞失败:" + throwable.getMessage());
} }