From 7fd0f7e7dde891e3877f3f144012fe09d9d68928 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 15:06:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=BE=E5=BC=80=E4=B8=80=E9=94=AE=E8=B5=B7?= =?UTF-8?q?=E9=A3=9E=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/controller/AircraftFlyController.java | 12 ++++++++---- .../device/service/impl/TuohengBufferDeviceImpl.java | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/ruoyi/device/controller/AircraftFlyController.java b/src/main/java/com/ruoyi/device/controller/AircraftFlyController.java index 31d9a20..fce281f 100644 --- a/src/main/java/com/ruoyi/device/controller/AircraftFlyController.java +++ b/src/main/java/com/ruoyi/device/controller/AircraftFlyController.java @@ -252,9 +252,9 @@ public class AircraftFlyController extends BaseController // Long taskId = flightService.createClickTakeOffTask(request.getSn(),airlineFileUrl); log.info("无人机航线任务（一键起飞用的也是该接口） {} ", JSON.toJSONString(request)); - if(true){ - return R.ok("无人机起飞命令发送失败: "); - } +// if(true){ +// return R.ok("无人机起飞命令发送失败: "); +// } try { java.util.Map params = new java.util.HashMap<>(); @@ -263,7 +263,11 @@ public class AircraftFlyController extends BaseController }else { 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()); CompletableFuture future = machineCommandManager.executeCommand(request.getSn(), CommandType.TAKE_OFF, params); CommandResult result = future.get(); diff --git a/src/main/java/com/ruoyi/device/service/impl/TuohengBufferDeviceImpl.java b/src/main/java/com/ruoyi/device/service/impl/TuohengBufferDeviceImpl.java index 66c58b8..7a8863c 100644 --- a/src/main/java/com/ruoyi/device/service/impl/TuohengBufferDeviceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/TuohengBufferDeviceImpl.java @@ -233,11 +233,11 @@ public class TuohengBufferDeviceImpl implements IBufferDeviceService { // 获取拓恒设备属性 AttributeMap attributes = thingsBoardDomain.getPredefinedTuohengDeviceAttributes(iotDeviceId); - log.info("拓恒设备属性数据: {}", attributes); +// log.info("拓恒设备属性数据: {}", attributes); // 获取拓恒设备遥测数据 TelemetryMap telemetry = thingsBoardDomain.getPredefinedTuohengDeviceTelemetry(iotDeviceId); - log.info("拓恒设备遥测数据: {}", telemetry); +// log.info("拓恒设备遥测数据: {}", telemetry); // 设置固件版本（从属性中获取 hardware_version） attributes.get(TuohengDeviceAttributes.HARDWARE_VERSION)