From ac9a8944cb3d4ce3b888ca316a8b70e52f491a86 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 15:37:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/service/enums/DockStatusEnum.java  | 54 ++++++-------------
 .../device/service/impl/BufferDeviceImpl.java | 13 +++--
 2 files changed, 25 insertions(+), 42 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/service/enums/DockStatusEnum.java b/src/main/java/com/ruoyi/device/service/enums/DockStatusEnum.java
index 6e9a4e0..71a059c 100644
--- a/src/main/java/com/ruoyi/device/service/enums/DockStatusEnum.java
+++ b/src/main/java/com/ruoyi/device/service/enums/DockStatusEnum.java
@@ -11,71 +11,49 @@ public enum DockStatusEnum
     /**
      * 空闲中
      */
-    IDLE(0, "Idle"),
+    IDLE("IDLE", "空闲中"),
 
     /**
      * 现场调试
      */
-    ON_SITE_DEBUGGING(1, "On-site Debugging"),
-
-    /**
-     * 远程调试
-     */
-    REMOTE_DEBUGGING(2, "Remote Debugging"),
+    Debugging("Debugging", "现场调试/远程调试"),
 
     /**
      * 固件升级中
      */
-    FIRMWARE_UPGRADING(3, "Firmware Upgrading"),
+    FIRMWARE_UPGRADING("Upgrading", "固件升级中"),
 
     /**
      * 作业中
      */
-    WORKING(4, "Working"),
+    WORKING("Working", "作业中"),
 
     /**
      * 待标定
      */
-    TO_BE_CALIBRATED(5, "To Be Calibrated");
+    UNKNOWN("UNKNOWN", "待标定");
 
-    private final int code;
+
+    private final String code;
     private final String description;
 
-    DockStatusEnum(int code, String description)
-    {
+
+    DockStatusEnum(String code, String description) {
         this.code = code;
         this.description = description;
     }
 
-    public Integer getCode()
-    {
-        return (Integer) code;
+    public String getCode() {
+        return code;
     }
 
-    public String getDescription()
-    {
+    public String getDescription() {
         return description;
     }
 
-    /**
-     * 根据code获取枚举
-     *
-     * @param code 状态码
-     * @return 枚举值
-     */
-    public static DockStatusEnum fromCode(Integer code)
-    {
-        if (code == null)
-        {
-            return null;
-        }
-        for (DockStatusEnum status : DockStatusEnum.values())
-        {
-            if (status.getCode().equals(code))
-            {
-                return status;
-            }
-        }
-        return null;
+
+    @Override
+    public String toString() {
+        return code;
     }
 }
\ No newline at end of file
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 3bacb46..02244ad 100644
--- a/src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java
@@ -7,6 +7,8 @@ import com.ruoyi.device.domain.api.IAircraftDomain;
 import com.ruoyi.device.domain.api.IThingsBoardDomain;
 import com.ruoyi.device.domain.model.Device;
 import com.ruoyi.device.domain.model.Dock;
+import com.ruoyi.device.domain.model.thingsboard.AttributeMap;
+import com.ruoyi.device.domain.model.thingsboard.TelemetryMap;
 import com.ruoyi.device.service.api.IBufferDeviceService;
 import com.ruoyi.device.service.dto.AircraftDetailDTO;
 import com.ruoyi.device.service.dto.DockDetailDTO;
@@ -57,14 +59,13 @@ public class BufferDeviceImpl implements IBufferDeviceService
 
 
         DockDetailDTO dto = getChangeAbleDockDetailDTO(device.getIotDeviceId());
-
         dto.setDockId(dock.getDockId());
         dto.setDockName(dock.getDockName());
         dto.setDockLocation(dock.getDockLocation());
-
         dto.setDockIotId(device.getIotDeviceId());
+        return dto;
+
 
-        return null;
     }
 
     @Override
@@ -78,9 +79,13 @@ public class BufferDeviceImpl implements IBufferDeviceService
 
     private DockDetailDTO getChangeAbleDockDetailDTO(String deviceIotId)
     {
+        DockDetailDTO dto = new DockDetailDTO();
+        AttributeMap attributeMap = thingsBoardDomain.getPredefinedDeviceAttributes(deviceIotId);
+        TelemetryMap telemetryMap = thingsBoardDomain.getPredefinedDeviceTelemetry(deviceIotId);
 
 
-        return null;
+
+        return dto;
     }
 
     private AircraftDetailDTO getChangeAbleAirDetailDTO(String deviceIotId)