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

放开一键起飞接口

This commit is contained in:
孙小云 2026-03-19 15:06:57 +08:00
parent a776cac1cb
commit 7fd0f7e7dd
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/ruoyi/device/controller/AircraftFlyController.java
View File

@ -252,9 +252,9 @@ public class AircraftFlyController extends BaseController
// Long taskId = flightService.createClickTakeOffTask(request.getSn(),airlineFileUrl); // Long taskId = flightService.createClickTakeOffTask(request.getSn(),airlineFileUrl);
log.info("无人机航线任务（一键起飞用的也是该接口） {} ", JSON.toJSONString(request)); log.info("无人机航线任务（一键起飞用的也是该接口） {} ", JSON.toJSONString(request));
if(true){ // if(true){
return R.ok("无人机起飞命令发送失败: "); // return R.ok("无人机起飞命令发送失败: ");
} // }
try { try {
java.util.Map<String, Object> params = new java.util.HashMap<>(); java.util.Map<String, Object> params = new java.util.HashMap<>();
@ -263,7 +263,11 @@ public class AircraftFlyController extends BaseController
}else { }else {
params.put("airlineFileUrl", request.getAirlineFileUrl()); params.put("airlineFileUrl", request.getAirlineFileUrl());
} }
params.put("flyBatteryMin", request.getFlyBatteryMin()); if(Objects.nonNull(request.getFlyBatteryMin())){
params.put("flyBatteryMin", request.getFlyBatteryMin());
}else {
params.put("flyBatteryMin", 0.3);
}
params.put("messageID", request.getTaskId()); params.put("messageID", request.getTaskId());
CompletableFuture<CommandResult> future = machineCommandManager.executeCommand(request.getSn(), CommandType.TAKE_OFF, params); CompletableFuture<CommandResult> future = machineCommandManager.executeCommand(request.getSn(), CommandType.TAKE_OFF, params);
CommandResult result = future.get(); CommandResult result = future.get();

4
src/main/java/com/ruoyi/device/service/impl/TuohengBufferDeviceImpl.java
View File

@ -233,11 +233,11 @@ public class TuohengBufferDeviceImpl implements IBufferDeviceService {
// 获取拓恒设备属性 // 获取拓恒设备属性
AttributeMap attributes = thingsBoardDomain.getPredefinedTuohengDeviceAttributes(iotDeviceId); AttributeMap attributes = thingsBoardDomain.getPredefinedTuohengDeviceAttributes(iotDeviceId);
log.info("拓恒设备属性数据: {}", attributes); // log.info("拓恒设备属性数据: {}", attributes);
// 获取拓恒设备遥测数据 // 获取拓恒设备遥测数据
TelemetryMap telemetry = thingsBoardDomain.getPredefinedTuohengDeviceTelemetry(iotDeviceId); TelemetryMap telemetry = thingsBoardDomain.getPredefinedTuohengDeviceTelemetry(iotDeviceId);
log.info("拓恒设备遥测数据: {}", telemetry); // log.info("拓恒设备遥测数据: {}", telemetry);
// 设置固件版本（从属性中获取 hardware_version） // 设置固件版本（从属性中获取 hardware_version）
attributes.get(TuohengDeviceAttributes.HARDWARE_VERSION) attributes.get(TuohengDeviceAttributes.HARDWARE_VERSION)