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

Compare commits

base: THENG:60c8affc0d7d2de51e1ce90912ecb13df2a2d7ba
Branches Tags
THENG:main
THENG:test
THENG:dev
THENG:f_paush
THENG:f_deploy
THENG:f_add_shuxing
..
compare: THENG:6969e1788e80d75fd7b0104d9d4196b3a0e22e73
Branches Tags
THENG:test
THENG:dev
THENG:f_paush
THENG:f_deploy
THENG:f_add_shuxing
THENG:main

No commits in common. "60c8affc0d7d2de51e1ce90912ecb13df2a2d7ba" and "6969e1788e80d75fd7b0104d9d4196b3a0e22e73" have entirely different histories.
60c8affc0d ... 6969e1788e

2 changed files with 5 additions and 7 deletions
Show Stats Expand all files Collapse all files

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

@ -6,7 +6,6 @@ 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;
@ -53,13 +52,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 request 起飞请求对象 * @param sn 机场SN号
* @return 起飞响应 * @return 起飞响应
*/ */
@PostMapping("/drone/takeoff") @PostMapping("/drone/takeoff/{sn}")
R<String> takeoff(@RequestBody DroneTakeoffRequest request); R<String> takeoff(@PathVariable("sn") String sn);
/** /**
* 无人机开机接口 * 无人机开机接口

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

@ -5,7 +5,6 @@ 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;
@ -49,7 +48,7 @@ public class RemoteAircraftFlyFallbackFactory implements FallbackFactory<RemoteA
} }
@Override @Override
public R<String> takeoff(DroneTakeoffRequest request) public R<String> takeoff(String sn)
{ {
return R.fail("无人机起飞失败:" + throwable.getMessage()); return R.fail("无人机起飞失败:" + throwable.getMessage());
} }