src/main/java/com/ruoyi/device/domain/model/thingsboard/constants/DeviceTelemetry.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ruoyi.device.domain.model.thingsboard.AttributeKey;
 import com.ruoyi.device.domain.model.thingsboard.TelemetryKey;
-import com.ruoyi.device.domain.model.thingsboard.attributes.battery.BatteryInfo;
 import com.ruoyi.device.domain.model.thingsboard.attributes.psdk.PsdkDevice;
 import com.ruoyi.device.domain.model.thingsboard.attributes.battery.BatteryData;
 
@@ -306,7 +305,9 @@ public class DeviceTelemetry {
     );
 
 
-
+    /**
+     * 无人机特有
+     */
 
     /**
      * 无人机挂载信息

src/main/java/com/ruoyi/device/service/dto/AircraftDetailDTO.java

@@ -43,6 +43,8 @@ public class AircraftDetailDTO implements Serializable
 
     // ========== AircraftDetailVO 特有字段 ==========
 
+
+
     /** 无人机版本 */
     private String aircraftVersion;
 

src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java

@@ -151,9 +151,6 @@ public class BufferDeviceImpl implements IBufferDeviceService
         AircraftDetailDTO dto = getChangeAbleAirDetailDTO(device.getIotDeviceId());
         dto.setAircraftId(aircraft.getAircraftId());
         dto.setAircraftName(aircraft.getAircraftName());
-        dto.setSnNumber(device.getDeviceSn());
-        dto.setBindTime(device.getCreateTime().getTime());
-
 
         List<AircraftPayload> aircraftPayloads =
                 aircraftPayloadDomain.selectAircraftPayloadByAircraftId(aircraft.getAircraftId());
@@ -173,16 +170,6 @@ public class BufferDeviceImpl implements IBufferDeviceService
             dto.setPayloadList(payloads);
         }
 
-        // 获取电池SN号 - 从 batteries 数组里面的第一个的 SN号
-        TelemetryMap telemetryMap = thingsBoardDomain.getPredefinedDeviceTelemetry(device.getIotDeviceId());
-        telemetryMap.get(DeviceTelemetry.BATTERY)
-                .ifPresent(telemetryValue -> {
-                    var batteryData = telemetryValue.getValue();
-                    if (batteryData != null && !CollectionUtils.isEmpty(batteryData.getBatteries())) {
-                        String batterySn = batteryData.getBatteries().get(0).getSn();
-                        dto.setBatterySn(batterySn);
-                    }
-                });
 
         return dto;
     }