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 2c52393..a995230 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
@@ -327,7 +327,7 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber {
 
                     // ID字段
                     batteryData.setSiteId(("021_FXX_01"));
-                    batteryData.setClusterDeviceId(("021"));
+                    batteryData.setClusterDeviceId(deviceId);
 
                     list.add(batteryData);
                 }