diff --git a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/Result/batch/BathchListResult.java b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/Result/batch/BathchListResult.java
new file mode 100644
index 0000000..6cfa109
--- /dev/null
+++ b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/Result/batch/BathchListResult.java
@@ -0,0 +1,42 @@
+package com.qiuguo.iot.data.Result.batch;
+
+import lombok.Data;
+
+@Data
+public class BathchListResult {
+    private boolean sub;
+
+    private int create_time;
+
+    private String local_key;
+
+    private String ip;
+
+    private String icon;
+
+    private String lon;
+
+    private String time_zone;
+
+    private String product_name;
+
+    private String uuid;
+
+    private int active_time;
+
+    private int update_time;
+
+    private String custom_name;
+
+    private String product_id;
+
+    private String name;
+
+    private Long id;
+
+    private boolean is_online;
+
+    private String category;
+
+    private String lat;
+}
diff --git a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/RoomAdminController.java b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/RoomAdminController.java
index 395c59b..b3e97f3 100644
--- a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/RoomAdminController.java
+++ b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/RoomAdminController.java
@@ -2,19 +2,23 @@ package com.qiuguo.iot.user.api.controller;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.qiuguo.iot.data.Result.batch.BathchListResult;
 import com.qiuguo.iot.data.entity.user.UserRoomEntity;
 import com.qiuguo.iot.data.request.user.UserRoomRequest;
 import com.qiuguo.iot.data.service.user.UserRoomService;
-import com.qiuguo.iot.user.api.rest.RoomInitResp;
+import com.qiuguo.iot.user.api.service.TuyaDeviceConnector;
 import lombok.extern.slf4j.Slf4j;
 import org.hswebframework.web.api.crud.entity.PagerResult;
 import org.springframework.web.bind.annotation.*;
 import reactor.core.publisher.Mono;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 @RestController
 @Slf4j
@@ -27,6 +31,9 @@ public class RoomAdminController {
     @Resource
     private UserRoomService roomService;
 
+    @Resource
+    private TuyaDeviceConnector deviceConnector;
+
     //新增
     @PostMapping("/save/room")
     public Mono<Void> roomSave(@RequestBody JSONObject jsonObject) {
@@ -65,20 +72,12 @@ public class RoomAdminController {
             //todo:为空
         }
        return roomService.deleteUserRoomById(id);
-
-        //return Mono.empty();
     }
 
     //查询
     @PostMapping("/get/room")
-    public Mono<PagerResult<UserRoomEntity>> getFamily(@RequestBody RoomInitResp resp) {
-        List<UserRoomEntity> aa = new ArrayList<>();
-
-        UserRoomRequest room = new UserRoomRequest();
-        room.setRoomName(resp.getRoomName());
-        room.setCurrPage(10);
-        room.setPageSize(20);
-       return roomService.selectUserRoomsByRequest(room);
+    public Mono<PagerResult<UserRoomEntity>> getFamily(@RequestBody UserRoomRequest resp) {
+       return roomService.selectUserRoomsByRequest(resp);
         /**
          * 判空
          * 查询对应设备id
diff --git a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/device/DeviceController.java b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/device/DeviceController.java
index 09018e5..d0603d7 100644
--- a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/device/DeviceController.java
+++ b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/device/DeviceController.java
@@ -1,6 +1,7 @@
 package com.qiuguo.iot.user.api.controller.device;
 
 import cn.hutool.crypto.digest.MD5;
+import com.alibaba.fastjson.JSONArray;
 import com.qiuguo.iot.base.enums.DeviceTypeEnum;
 import com.qiuguo.iot.base.utils.StringUtils;
 import com.qiuguo.iot.data.entity.device.DeviceInfoEntity;
@@ -9,6 +10,7 @@ import com.qiuguo.iot.data.resp.device.DeviceInfoResp;
 import com.qiuguo.iot.data.service.device.DeviceBatchService;
 import com.qiuguo.iot.data.service.device.DeviceInfoService;
 import com.qiuguo.iot.user.api.resp.device.DeviceInitResp;
+import com.qiuguo.iot.user.api.service.TuyaDeviceConnector;
 import lombok.extern.slf4j.Slf4j;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery;
 import org.hswebframework.web.api.crud.entity.PagerResult;
@@ -39,6 +41,9 @@ public class DeviceController {
     @Resource
     private DeviceBatchService deviceBatchService;
 
+    @Resource
+    private TuyaDeviceConnector tuyaDeviceConnector;
+
 
     @Value("${device.timeout}")
     private Long timeOut;//2分钟
@@ -108,4 +113,10 @@ public class DeviceController {
 
 
     }
+
+
+    @GetMapping("/deviceBySnId")
+    public Mono<JSONArray> aa(@RequestParam("sn") String sn){
+        return Mono.just(tuyaDeviceConnector.getByid(sn));
+    }
 }