From a4fd0fb15a44daac990208f551ed334831143e5b Mon Sep 17 00:00:00 2001
From: weiyachao <13526234727@126.com>
Date: Tue, 19 Sep 2023 17:35:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/user/api/service/TuyaDeviceConnector.java |  9 +++++++--
 .../iot-box-user-api/src/test/java/UserTest.java  | 15 +++++++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/service/TuyaDeviceConnector.java b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/service/TuyaDeviceConnector.java
index 6a5c583..f8829ff 100644
--- a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/service/TuyaDeviceConnector.java
+++ b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/service/TuyaDeviceConnector.java
@@ -1,5 +1,6 @@
 package com.qiuguo.iot.user.api.service;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.JsonArray;
 import com.tuya.connector.api.annotations.Body;
@@ -19,13 +20,17 @@ import java.util.List;
  */
 public interface TuyaDeviceConnector {
     
+    // 转移设备
+    @POST("/v2.0/cloud/thing/{device_id}/transfer")
+    Boolean transferDevice(@Path("device_id") String deviceId,@Body JSONObject jsonObject);
+    
     // 查询设备信息,多个id使用,隔开
     @GET("/v2.0/cloud/thing/{device_id}")
-    JSONObject getByid(@Path("device_id") String deviceId);
+    JSONArray getByid(@Path("device_id") String deviceId);
     
     // 查询空间下设备列表
     @GET("/v2.0/cloud/thing/space/device")
-    JsonArray getDevicesBySpaceIds(@Query("space_ids") String spaces,@Query("page_size") Integer size);
+    JSONArray getDevicesBySpaceIds(@Query("space_ids") String spaces, @Query("page_size") Integer size);
     
     // 控制设备动作
     @POST("/v1.0/iot-03/devices/{device_id}/commands")
diff --git a/iot-modules/iot-box-user-api/src/test/java/UserTest.java b/iot-modules/iot-box-user-api/src/test/java/UserTest.java
index de1338c..086d80e 100644
--- a/iot-modules/iot-box-user-api/src/test/java/UserTest.java
+++ b/iot-modules/iot-box-user-api/src/test/java/UserTest.java
@@ -1,8 +1,7 @@
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.google.gson.JsonArray;
 import com.qiuguo.iot.user.api.IotBoxUserApiApplication;
 import com.qiuguo.iot.user.api.service.TuyaDeviceConnector;
-import com.tuya.connector.api.annotations.Path;
 import java.util.Arrays;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
@@ -26,6 +25,14 @@ public class UserTest {
     @Autowired
     private TuyaDeviceConnector tuyaDeviceConnector;
     
+    @Test
+    public void 转移设备() {
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("space_id", "163257138");
+        Boolean aBoolean = tuyaDeviceConnector.transferDevice(deviceId, jsonObject);
+        System.out.println(aBoolean);
+    }
+    
     @Test
     public void 获取设备支持的指令集() {
         Object functions = tuyaDeviceConnector.getFunctions(deviceId);
@@ -43,7 +50,7 @@ public class UserTest {
     @Test
     public void 查询空间() {
         //40001900
-        JSONObject spaceInfo = tuyaDeviceConnector.getSpaceInfo("163258893");
+        JSONObject spaceInfo = tuyaDeviceConnector.getSpaceInfo("163257138");
         System.out.println(spaceInfo);
     }
     
@@ -84,7 +91,7 @@ public class UserTest {
     
     @Test
     public void 查询空间下设备列表() {
-        JsonArray devicesBySpaceIds = tuyaDeviceConnector.getDevicesBySpaceIds(spaceId, 20);
+        JSONArray devicesBySpaceIds = tuyaDeviceConnector.getDevicesBySpaceIds("163257138", 20);
         System.out.println(devicesBySpaceIds);
     }