From c09f7358f1643c6af0c40355830136a0df436547 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= <sunpengchina85@gmail.com>
Date: Wed, 21 Jan 2026 19:15:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=B5=E6=B1=A0=E5=89=A9?=
 =?UTF-8?q?=E4=BD=99=E9=A3=9E=E8=A1=8C=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attributes/battery/BatteryInfo.java       | 104 +-----------------
 .../device/service/dto/AircraftDetailDTO.java |   2 +-
 .../device/service/impl/BufferDeviceImpl.java |   1 +
 3 files changed, 7 insertions(+), 100 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/domain/model/thingsboard/attributes/battery/BatteryInfo.java b/src/main/java/com/ruoyi/device/domain/model/thingsboard/attributes/battery/BatteryInfo.java
index aa7396d..228eeed 100644
--- a/src/main/java/com/ruoyi/device/domain/model/thingsboard/attributes/battery/BatteryInfo.java
+++ b/src/main/java/com/ruoyi/device/domain/model/thingsboard/attributes/battery/BatteryInfo.java
@@ -1,10 +1,13 @@
 package com.ruoyi.device.domain.model.thingsboard.attributes.battery;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import lombok.Data;
 
 /**
  * 单个电池信息
  */
+@Data
 public class BatteryInfo {
 
     @JsonProperty("capacity_percent")
@@ -37,104 +40,7 @@ public class BatteryInfo {
     @JsonProperty("voltage")
     private Integer voltage;
 
-    // 构造方法
-    public BatteryInfo() {
-    }
+    @JsonProperty("remain_flight_time")
+    private Integer remainFlightTime;
 
-    // Getter和Setter方法
-    public Integer getCapacityPercent() {
-        return capacityPercent;
-    }
-
-    public void setCapacityPercent(Integer capacityPercent) {
-        this.capacityPercent = capacityPercent;
-    }
-
-    public String getFirmwareVersion() {
-        return firmwareVersion;
-    }
-
-    public void setFirmwareVersion(String firmwareVersion) {
-        this.firmwareVersion = firmwareVersion;
-    }
-
-    public Integer getHighVoltageStorageDays() {
-        return highVoltageStorageDays;
-    }
-
-    public void setHighVoltageStorageDays(Integer highVoltageStorageDays) {
-        this.highVoltageStorageDays = highVoltageStorageDays;
-    }
-
-    public Integer getIndex() {
-        return index;
-    }
-
-    public void setIndex(Integer index) {
-        this.index = index;
-    }
-
-    public Integer getLoopTimes() {
-        return loopTimes;
-    }
-
-    public void setLoopTimes(Integer loopTimes) {
-        this.loopTimes = loopTimes;
-    }
-
-    public String getSn() {
-        return sn;
-    }
-
-    public void setSn(String sn) {
-        this.sn = sn;
-    }
-
-    public Integer getSubType() {
-        return subType;
-    }
-
-    public void setSubType(Integer subType) {
-        this.subType = subType;
-    }
-
-    public Double getTemperature() {
-        return temperature;
-    }
-
-    public void setTemperature(Double temperature) {
-        this.temperature = temperature;
-    }
-
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    public Integer getVoltage() {
-        return voltage;
-    }
-
-    public void setVoltage(Integer voltage) {
-        this.voltage = voltage;
-    }
-
-    @Override
-    public String toString() {
-        return "BatteryInfo{" +
-                "capacityPercent=" + capacityPercent +
-                ", firmwareVersion='" + firmwareVersion + '\'' +
-                ", highVoltageStorageDays=" + highVoltageStorageDays +
-                ", index=" + index +
-                ", loopTimes=" + loopTimes +
-                ", sn='" + sn + '\'' +
-                ", subType=" + subType +
-                ", temperature=" + temperature +
-                ", type=" + type +
-                ", voltage=" + voltage +
-                '}';
-    }
 }
\ No newline at end of file
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 0b751fe..87317c9 100644
--- a/src/main/java/com/ruoyi/device/service/dto/AircraftDetailDTO.java
+++ b/src/main/java/com/ruoyi/device/service/dto/AircraftDetailDTO.java
@@ -83,7 +83,7 @@ public class AircraftDetailDTO implements Serializable
     private Integer batteryLevel;
 
     /** 续航 */
-    private Double flightTimeRemaining;
+    private Integer flightTimeRemaining;
 
     /** 电池温度 */
     private Double batteryTemperature;
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 4a4fda1..ee97b85 100644
--- a/src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java
@@ -185,6 +185,7 @@ public class BufferDeviceImpl implements IBufferDeviceService
                         dto.setBatteryTemperature(batteryData.getBatteries().get(0).getTemperature());
                         dto.setBatteryLevel(batteryData.getBatteries().get(0).getCapacityPercent());
                         dto.setCycleCount(batteryData.getBatteries().get(0).getLoopTimes());
+                        dto.setFlightTimeRemaining(batteryData.getBatteries().get(0).getRemainFlightTime());
                         dto.setBatterySn(batterySn);
                     }
                 });