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 c7776c1..4cc56ba 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
@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.TypeReference;
+import com.xzzn.common.enums.*;
 import com.xzzn.common.utils.DateUtils;
 import com.xzzn.common.utils.StringUtils;
 import com.xzzn.ems.domain.*;
@@ -188,9 +189,9 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber {
                 data.setTotalDischargeEnergy(BigDecimal.ZERO);
 
                 // 其他非 BigDecimal 字段
-                data.setWorkStatus("1"); // 或其他默认值
-                data.setPcsCommunicationStatus("1");
-                data.setEmsCommunicationStatus("1");
+                data.setWorkStatus(WorkStatus.NORMAL.getCode()); // 或其他默认值
+                data.setPcsCommunicationStatus(CommunicationStatus.OK.getCode());
+                data.setEmsCommunicationStatus(CommunicationStatus.OK.getCode());
                 data.setCreateBy("system");
                 data.setCreateTime(DateUtils.getNowDate());
                 data.setUpdateBy("system");
@@ -247,9 +248,9 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber {
                 dataStack.setTotalDischargeEnergy(BigDecimal.ZERO);
 
                 // 其他非 BigDecimal 字段
-                dataStack.setWorkStatus("1"); // 或其他默认值
-                dataStack.setPcsCommunicationStatus("1");
-                dataStack.setEmsCommunicationStatus("1");
+                dataStack.setWorkStatus(WorkStatus.NORMAL.getCode()); // 或其他默认值
+                dataStack.setPcsCommunicationStatus(CommunicationStatus.OK.getCode());
+                dataStack.setEmsCommunicationStatus(CommunicationStatus.OK.getCode());
                 dataStack.setCreateBy("system");
                 dataStack.setCreateTime(DateUtils.getNowDate());
                 dataStack.setUpdateBy("system");
@@ -307,10 +308,10 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber {
                 EmsPcsData pcsData = new EmsPcsData();
                 // 时间与状态类字段
                 pcsData.setDataUpdateTime(new Date());
-                pcsData.setWorkStatus("A");
-                pcsData.setGridStatus("B");
-                pcsData.setDeviceStatus("C");
-                pcsData.setControlMode("D");
+                pcsData.setWorkStatus(WorkStatus.NORMAL.getCode());
+                pcsData.setGridStatus(GridStatus.GRID.getCode());
+                pcsData.setDeviceStatus(DeviceStatus.ONLINE.getCode());
+                pcsData.setControlMode(ControlModeStatus.REMOTE.getCode());
 
                 // 功率与能量类字段
                 pcsData.setTotalActivePower(BigDecimal.ZERO);
@@ -338,11 +339,11 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber {
                 pcsData.setAcFrequency(BigDecimal.ZERO);
 
                 // 状态指示类
-                pcsData.setBranchStatus("A");
-                pcsData.setDischargeStatus("A");
-                pcsData.setAcSwitchStatus("A");
-                pcsData.setDcSwitchStatus("A");
-                pcsData.setRemoteControlStatus("A");
+                pcsData.setBranchStatus(BranchStatus.NORMAL.getCode());
+                pcsData.setDischargeStatus(ChargeStatus.CHARGING.getCode());
+                pcsData.setAcSwitchStatus(SwitchStatus.CLOSED.getCode());
+                pcsData.setDcSwitchStatus(SwitchStatus.CLOSED.getCode());
+                pcsData.setRemoteControlStatus(ControlModeStatus.REMOTE.getCode());
 
                 // 直流参数
                 pcsData.setDcVoltage(BigDecimal.ZERO);
@@ -359,8 +360,6 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber {
                 pcsData.setDateMonth(DateUtils.getNowMonthLong());
                 pcsData.setDateDay(DateUtils.getNowDayLong());
 
-                pcsData.setDeviceId(deviceId);
-
                 emsPcsDataService.insertEmsPcsData(pcsData);
 
                 Map<String, Map<String, Object>> records = processDataPrefix(JSON.parseObject(jsonData, new TypeReference<Map<String, Object>>() {}));