From a5e51849d94175ee246f3864b8a26dce95a37886 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Wed, 11 Feb 2026 16:37:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A0=E4=BA=BA=E6=9C=BA?= =?UTF-8?q?=E7=9A=84=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TuohengBufferDeviceImpl.java | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/ruoyi/device/service/impl/TuohengBufferDeviceImpl.java b/src/main/java/com/ruoyi/device/service/impl/TuohengBufferDeviceImpl.java index 6743b3f..e3803b9 100644 --- a/src/main/java/com/ruoyi/device/service/impl/TuohengBufferDeviceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/TuohengBufferDeviceImpl.java @@ -153,22 +153,21 @@ public class TuohengBufferDeviceImpl implements IBufferDeviceService { dto.setAircraftManufacturer(device.getDeviceManufacturer()); // 查询无人机关联的机场，获取机场SN（用于从MachineStateManager获取状态） -// String dockSn = null; -// List dockAircrafts = dockAircraftDomain.selectDockAircraftByAircraftId(aircraftId); -// if (!CollectionUtils.isEmpty(dockAircrafts)) { -// DockAircraft dockAircraft = dockAircrafts.get(0); -// Dock dock = dockDomain.selectDockByDockId(dockAircraft.getDockId()); -// if (dock != null) { -// Device dockDevice = deviceDomain.selectDeviceByDeviceId(dock.getDeviceId()); -// if (dockDevice != null) { -// dockSn = dockDevice.getDeviceSn(); -// } -// } -// } + String dockSn = null; + List dockAircrafts = dockAircraftDomain.selectDockAircraftByAircraftId(aircraftId); + if (!CollectionUtils.isEmpty(dockAircrafts)) { + DockAircraft dockAircraft = dockAircrafts.get(0); + Dock dock = dockDomain.selectDockByDockId(dockAircraft.getDockId()); + if (dock != null) { + Device dockDevice = deviceDomain.selectDeviceByDeviceId(dock.getDeviceId()); + if (dockDevice != null) { + dockSn = dockDevice.getDeviceSn(); + } + } + } // 获取ThingsBoard数据并填充到DTO（传入机场SN用于获取状态） - // 这边的SN号是通用的 - fillTuohengAircraftDetail(dto, device.getIotDeviceId(), device.getDeviceSn()); + fillTuohengAircraftDetail(dto, device.getIotDeviceId(), dockSn); return dto; }