diff --git a/src/main/java/com/zsc/edu/gateway/framework/message/websocket/WebSocketServer.java b/src/main/java/com/zsc/edu/gateway/framework/message/websocket/WebSocketServer.java
new file mode 100644
index 0000000..76c68d5
--- /dev/null
+++ b/src/main/java/com/zsc/edu/gateway/framework/message/websocket/WebSocketServer.java
@@ -0,0 +1,4 @@
+package com.zsc.edu.gateway.framework.message.websocket;
+
+public class WebSocketServer {
+}
diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/device/repo/DeviceRepository.java b/src/main/java/com/zsc/edu/gateway/modules/iot/device/repo/DeviceRepository.java
index b7abb06..4ce1a5a 100644
--- a/src/main/java/com/zsc/edu/gateway/modules/iot/device/repo/DeviceRepository.java
+++ b/src/main/java/com/zsc/edu/gateway/modules/iot/device/repo/DeviceRepository.java
@@ -11,6 +11,8 @@ import com.zsc.edu.gateway.modules.iot.device.vo.DeviceVo;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+
 
 /**
  * @author zhuang
@@ -28,4 +30,6 @@ public interface DeviceRepository extends BaseMapper<Device> {
 
     @Select("select * from iot_device where client_id=#{clientId}")
     Device findByClientId(@Param("clientId") String clientId);
+
+    List<Device> selectListByName(@Param("name") String name);
 }
diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/impl/DeviceServiceImpl.java b/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/impl/DeviceServiceImpl.java
index d5ad87f..1d74de7 100644
--- a/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/impl/DeviceServiceImpl.java
@@ -227,9 +227,10 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceRepository, Device> imp
      */
     @Override
     public List<Device> findByName(String name) {
-        LambdaQueryWrapper<Device> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.like(Device::getName, name);
-        return baseMapper.selectList(queryWrapper);
+        if (name == null) {
+            return baseMapper.selectList(new QueryWrapper<>());
+        }
+        return baseMapper.selectListByName(name);
     }
 
     /**
diff --git a/src/main/resources/mappers/iot/DeviceMapper.xml b/src/main/resources/mappers/iot/DeviceMapper.xml
index a81522a..a313a5b 100644
--- a/src/main/resources/mappers/iot/DeviceMapper.xml
+++ b/src/main/resources/mappers/iot/DeviceMapper.xml
@@ -87,4 +87,26 @@
         FROM iot_device d
                  LEFT JOIN iot_product p ON d.product_id = p.id
     </select>
+
+    <select id="selectListByName" resultMap="BaseResultMap">
+        select d.*,
+               p.*,
+               ip.id         as param_id,
+               ip.data_type  as param_data_type,
+               ip.uint       as param_uint,
+               ip.type       as param_type,
+               ip.identifier as param_identifier,
+               ip.name       as param_name,
+               ip.remark     as param_remark,
+               ai.id         as icon_id,
+               ai.file_name  as icon_file_name,
+               ap.file_name  as preview_file_name,
+               ap.id         as preview_id
+        from iot_device d
+                 left join iot_product p on d.product_id = p.id
+                 left join iot_param ip on p.id = ip.foreign_id and ip.foreign_type = 3
+                 left join attachment ai on d.icon_id = ai.id
+                 left join attachment ap on d.preview_id = ap.id
+        WHERE d.name LIKE concat('%', #{name}, '%')
+    </select>
 </mapper>
\ No newline at end of file