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; }