diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/MqttMessageController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/MqttMessageController.java
index 30d5de0..ce774f7 100644
--- a/ems-admin/src/main/java/com/xzzn/web/controller/ems/MqttMessageController.java
+++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/MqttMessageController.java
@@ -155,7 +155,7 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber {
                     Map<String, Object> fields = record.getValue();
 
                     EmsBatteryData data = new EmsBatteryData();
-                    data.setDeviceId(Long.parseLong(recordId));
+                    data.setDeviceId(recordId);
                     data.setBatteryCellId(recordId);
                     data.setSoc(new BigDecimal(fields.get("DTSOC").toString()));
                     data.setSoh(new BigDecimal(fields.get("DTSOH").toString()));
diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryData.java b/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryData.java
index 8faf4fc..1847431 100644
--- a/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryData.java
+++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryData.java
@@ -12,13 +12,13 @@ import com.xzzn.common.annotation.Excel;
  * 单体电池实时数据对象 ems_battery_data
  *
  * @author xzzn
- * @date 2025-06-25
+ * @date 2025-06-28
  */
 public class EmsBatteryData extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /**  */
+    /** $column.columnComment */
     private Long id;
 
     /** 电池堆 */
@@ -60,7 +60,7 @@ public class EmsBatteryData extends BaseEntity
 
     /** 设备唯一标识符 */
     @Excel(name = "设备唯一标识符")
-    private Long deviceId;
+    private String deviceId;
 
     /** 簇设备id */
     @Excel(name = "簇设备id")
@@ -166,12 +166,12 @@ public class EmsBatteryData extends BaseEntity
         return siteId;
     }
 
-    public void setDeviceId(Long deviceId)
+    public void setDeviceId(String deviceId)
     {
         this.deviceId = deviceId;
     }
 
-    public Long getDeviceId()
+    public String getDeviceId()
     {
         return deviceId;
     }