From c69d7a676838ff7e2bb2179ef63bba6707fdf118 Mon Sep 17 00:00:00 2001
From: wuyuan <15505152113@163.com>
Date: Mon, 12 May 2025 17:19:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=92=AD=E6=94=BE=E7=9B=B4?=
 =?UTF-8?q?=E6=92=AD=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/service/impl/DeviceServiceImpl.java       | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java
index aee999d..b833029 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java
@@ -551,6 +551,18 @@ public class DeviceServiceImpl implements IDeviceService {
         }
         DeviceDTO device = devicesList.get(0);
         device.setStatus(deviceRedisService.checkDeviceOnline(sn));
+        if (StringUtils.hasText(device.getChildDeviceSn())) {
+            Optional<DeviceDTO> childOpt = this.getDeviceBySn(device.getChildDeviceSn());
+            childOpt.ifPresent(child -> {
+                child.setStatus(deviceRedisService.checkDeviceOnline(child.getDeviceSn()));
+                child.setWorkspaceName(device.getWorkspaceName());
+                device.setChildren(child);
+            });
+        }
+        if(device.getProId() != null){
+            DeviceProEntity deviceProEntitie = deviceProMapper.selectOne(new LambdaQueryWrapper<DeviceProEntity>().eq(DeviceProEntity::getId, device.getProId()));
+            device.setDeviceProEntity(deviceProEntitie);
+        }
         return Optional.of(device);
     }