From 34cba3d6a2de55df0009ff667fcc589abac41396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Wed, 21 Jan 2026 19:10:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=B5=E6=B1=A0=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/device/service/dto/AircraftDetailDTO.java | 2 +- .../ruoyi/device/service/impl/BufferDeviceImpl.java | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ruoyi/device/service/dto/AircraftDetailDTO.java b/src/main/java/com/ruoyi/device/service/dto/AircraftDetailDTO.java index 0202c22..0b751fe 100644 --- a/src/main/java/com/ruoyi/device/service/dto/AircraftDetailDTO.java +++ b/src/main/java/com/ruoyi/device/service/dto/AircraftDetailDTO.java @@ -77,7 +77,7 @@ public class AircraftDetailDTO implements Serializable private Integer maxDistance; /** 电压 */ - private Double voltage; + private Integer voltage; /** 电量 */ private Integer batteryLevel; diff --git a/src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java b/src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java index e100582..4a4fda1 100644 --- a/src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java @@ -180,6 +180,11 @@ public class BufferDeviceImpl implements IBufferDeviceService var batteryData = telemetryValue.getValue(); if (batteryData != null && !CollectionUtils.isEmpty(batteryData.getBatteries())) { String batterySn = batteryData.getBatteries().get(0).getSn(); + dto.setVoltage(batteryData.getBatteries().get(0).getVoltage()); + dto.setBatteryLevel(batteryData.getBatteries().get(0).getCapacityPercent()); + dto.setBatteryTemperature(batteryData.getBatteries().get(0).getTemperature()); + dto.setBatteryLevel(batteryData.getBatteries().get(0).getCapacityPercent()); + dto.setCycleCount(batteryData.getBatteries().get(0).getLoopTimes()); dto.setBatterySn(batterySn); } }); @@ -415,6 +420,14 @@ public class BufferDeviceImpl implements IBufferDeviceService } }); + // 限高 + telemetryMap.get(DeviceTelemetry.Height_Limit) + .ifPresent(telemetryValue -> dto.setMaxAltitude(telemetryValue.getValue())); + + // 限远 + telemetryMap.get(DeviceTelemetry.Distance_Limit_Status_Distance_Limit) + .ifPresent(telemetryValue -> dto.setMaxDistance(telemetryValue.getValue())); + return dto; }