终端详情添加主机信息

@@ -10,6 +10,8 @@ import com.ruoyi.common.core.domain.ApiName;
 import com.ruoyi.common.core.domain.DeviceCommandApi;
 import com.ruoyi.common.core.domain.DeviceCommandApi;
 import com.ruoyi.common.core.domain.DeviceCommandApiParameter;
 import com.ruoyi.common.core.domain.DeviceCommandApiParameter;
 import com.zhonglai.luhui.dao.service.PublicService;
 import com.zhonglai.luhui.dao.service.PublicService;
+import com.zhonglai.luhui.device.domain.IotDevice;
+import com.zhonglai.luhui.device.mapper.IotDeviceMapper;
 import com.zhonglai.luhui.device.service.IIotDeviceService;
 import com.zhonglai.luhui.device.service.IIotDeviceService;
 import com.zhonglai.luhui.rocketmq.service.RocketMqService;
 import com.zhonglai.luhui.rocketmq.service.RocketMqService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +33,9 @@ public class IotTerminalServiceImpl implements IIotTerminalService
     private IotTerminalMapper iotTerminalMapper;
     private IotTerminalMapper iotTerminalMapper;
 
 
     @Autowired
     @Autowired
+    private IotDeviceMapper iotDeviceMapper;
+
+    @Autowired
     private PublicService publicService;
     private PublicService publicService;
 
 
     @Autowired
     @Autowired
@@ -44,7 +49,13 @@ public class IotTerminalServiceImpl implements IIotTerminalService
     @Override
     @Override
     public IotTerminal selectIotTerminalById(String id)
     public IotTerminal selectIotTerminalById(String id)
     {
     {
-        return iotTerminalMapper.selectIotTerminalById(id);
+        IotTerminal iotTerminal = iotTerminalMapper.selectIotTerminalById(id);
+        if(null != iotTerminal)
+        {
+            IotDevice iotDevice = iotDeviceMapper.selectIotDeviceByClient_id(iotTerminal.getDevice_id());
+            iotTerminal.setIotDevice(iotDevice);
+        }
+        return iotTerminal;
     }
     }
 
 
     /**
     /**