From 894bceaa22717c9534e828d004f26fb4e5565b8f 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 14:16:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/service/impl/BufferDeviceImpl.java | 73 ++++++++++---------
 1 file changed, 40 insertions(+), 33 deletions(-)

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 a9cca26..76886e3 100644
--- a/src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java
@@ -55,49 +55,56 @@ public class BufferDeviceImpl implements IBufferDeviceService
     @Override
     public DockDetailDTO getDockDetailById(Long dockId)
     {
+
+        DockDetailDTO dto = new DockDetailDTO();
+
         Dock dock = dockDomain.selectDockByDockId(dockId);
+        log.info("selectDockByDockId {}",JSON.toJSONString(dock));
         if (dock == null)
         {
             return null;
         }
-        Device device = deviceDomain.selectDeviceByDeviceId(dock.getDeviceId());
+        dto.setDockId(dock.getDockId());
+        dto.setDockName(dock.getDockName());
+        dto.setDockLocation(dock.getDockLocation());
+
+        Device device = deviceDomain.selectDeviceByDeviceId(dock.getDeviceId());
+        log.info("selectDeviceByDeviceId {}",JSON.toJSONString(device));
+        dto.setDockIotId(device.getIotDeviceId());
+
 
-        DockDetailDTO result = new DockDetailDTO();
-        result.setDockId(dock.getDockId());
-        result.setDockName(dock.getDockName());
-        result.setDockLocation(dock.getDockLocation());
 
         ThingsBoardData thingsBoardData = getThingsBoardData("dock", device.getIotDeviceId());
 
-        result.setFirmwareVersion(thingsBoardData.getFirmwareVersion());
-        result.setSnNumber(thingsBoardData.getSnNumber());
-        result.setBindTime(thingsBoardData.getBindTime());
-        result.setMaintenanceDays(thingsBoardData.getMaintenanceDays());
-        result.setDockName(thingsBoardData.getDockName());
-        result.setDockStatus(thingsBoardData.getDockStatus());
-        result.setBackupLongitude(thingsBoardData.getBackupLongitude());
-        result.setBackupLatitude(thingsBoardData.getBackupLatitude());
-        result.setRunningDuration(thingsBoardData.getRunningDuration());
-        result.setMissionCount(thingsBoardData.getMissionCount());
-        result.setWindSpeed(thingsBoardData.getWindSpeed());
-        result.setRainfall(thingsBoardData.getRainfall());
-        result.setEnvironmentTemperature(thingsBoardData.getEnvironmentTemperature());
-        result.setEnvironmentHumidity(thingsBoardData.getEnvironmentHumidity());
-        result.setNetworkType(thingsBoardData.getNetworkType());
-        result.setNetworkDelay(thingsBoardData.getNetworkDelay());
-        result.setAirConditionerStatus(thingsBoardData.getAirConditionerStatus());
-        result.setCabinDoorStatus(thingsBoardData.getCabinDoorStatus());
-        result.setDockRunStatus(thingsBoardData.getDockRunStatus());
-        result.setInternalCamera(thingsBoardData.getInternalCamera());
-        result.setExternalCamera(thingsBoardData.getExternalCamera());
-        result.setChargingStatus(thingsBoardData.getChargingStatus());
-        result.setCabinTemperature(thingsBoardData.getCabinTemperature());
-        result.setCabinHumidity(thingsBoardData.getCabinHumidity());
-        result.setElevatorPosition(thingsBoardData.getElevatorPosition());
-        result.setXAxisClampStatus(thingsBoardData.getXAxisClampStatus());
-        result.setYAxisClampStatus(thingsBoardData.getYAxisClampStatus());
+        dto.setFirmwareVersion(thingsBoardData.getFirmwareVersion());
+        dto.setSnNumber(thingsBoardData.getSnNumber());
+        dto.setBindTime(thingsBoardData.getBindTime());
+        dto.setMaintenanceDays(thingsBoardData.getMaintenanceDays());
+        dto.setDockName(thingsBoardData.getDockName());
+        dto.setDockStatus(thingsBoardData.getDockStatus());
+        dto.setBackupLongitude(thingsBoardData.getBackupLongitude());
+        dto.setBackupLatitude(thingsBoardData.getBackupLatitude());
+        dto.setRunningDuration(thingsBoardData.getRunningDuration());
+        dto.setMissionCount(thingsBoardData.getMissionCount());
+        dto.setWindSpeed(thingsBoardData.getWindSpeed());
+        dto.setRainfall(thingsBoardData.getRainfall());
+        dto.setEnvironmentTemperature(thingsBoardData.getEnvironmentTemperature());
+        dto.setEnvironmentHumidity(thingsBoardData.getEnvironmentHumidity());
+        dto.setNetworkType(thingsBoardData.getNetworkType());
+        dto.setNetworkDelay(thingsBoardData.getNetworkDelay());
+        dto.setAirConditionerStatus(thingsBoardData.getAirConditionerStatus());
+        dto.setCabinDoorStatus(thingsBoardData.getCabinDoorStatus());
+        dto.setDockRunStatus(thingsBoardData.getDockRunStatus());
+        dto.setInternalCamera(thingsBoardData.getInternalCamera());
+        dto.setExternalCamera(thingsBoardData.getExternalCamera());
+        dto.setChargingStatus(thingsBoardData.getChargingStatus());
+        dto.setCabinTemperature(thingsBoardData.getCabinTemperature());
+        dto.setCabinHumidity(thingsBoardData.getCabinHumidity());
+        dto.setElevatorPosition(thingsBoardData.getElevatorPosition());
+        dto.setXAxisClampStatus(thingsBoardData.getXAxisClampStatus());
+        dto.setYAxisClampStatus(thingsBoardData.getYAxisClampStatus());
 
-        return result;
+        return dto;
     }
 
     @Override