From 02915c3598dd0db2412e1c24c665b8402245e068 Mon Sep 17 00:00:00 2001 From: weiyachao <13526234727@126.com> Date: Tue, 19 Sep 2023 20:54:54 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- iot-modules/iot-box-websocket-api/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/iot-modules/iot-box-websocket-api/pom.xml b/iot-modules/iot-box-websocket-api/pom.xml index 3c1dd48..ca41280 100644 --- a/iot-modules/iot-box-websocket-api/pom.xml +++ b/iot-modules/iot-box-websocket-api/pom.xml @@ -76,6 +76,7 @@ + ${project.artifactId} org.springframework.boot From 63fa785800c95ffdc90cca4a687fd5a7d892bff4 Mon Sep 17 00:00:00 2001 From: weiyachao <13526234727@126.com> Date: Tue, 19 Sep 2023 20:57:28 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7-2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- iot-common/iot-base/pom.xml | 1 + iot-common/iot-data/pom.xml | 1 + iot-gateway/pom.xml | 1 + iot-modules/iot-admin-http-api/pom.xml | 1 + iot-modules/iot-customer-http-api/pom.xml | 1 + pom.xml | 1 + 6 files changed, 6 insertions(+) diff --git a/iot-common/iot-base/pom.xml b/iot-common/iot-base/pom.xml index b3be87f..fb2ce62 100644 --- a/iot-common/iot-base/pom.xml +++ b/iot-common/iot-base/pom.xml @@ -36,6 +36,7 @@ + ${project.artifactId} org.springframework.boot diff --git a/iot-common/iot-data/pom.xml b/iot-common/iot-data/pom.xml index a02dfa1..11d50d1 100644 --- a/iot-common/iot-data/pom.xml +++ b/iot-common/iot-data/pom.xml @@ -38,6 +38,7 @@ + ${project.artifactId} org.springframework.boot diff --git a/iot-gateway/pom.xml b/iot-gateway/pom.xml index 159ae3f..c2cd5ea 100644 --- a/iot-gateway/pom.xml +++ b/iot-gateway/pom.xml @@ -52,6 +52,7 @@ + ${project.artifactId} org.springframework.boot diff --git a/iot-modules/iot-admin-http-api/pom.xml b/iot-modules/iot-admin-http-api/pom.xml index 48bca5d..dd07807 100644 --- a/iot-modules/iot-admin-http-api/pom.xml +++ b/iot-modules/iot-admin-http-api/pom.xml @@ -72,6 +72,7 @@ + ${project.artifactId} org.springframework.boot diff --git a/iot-modules/iot-customer-http-api/pom.xml b/iot-modules/iot-customer-http-api/pom.xml index f7f13bc..d921c17 100644 --- a/iot-modules/iot-customer-http-api/pom.xml +++ b/iot-modules/iot-customer-http-api/pom.xml @@ -41,6 +41,7 @@ + ${project.artifactId} org.springframework.boot diff --git a/pom.xml b/pom.xml index 6e59b91..7b7d409 100644 --- a/pom.xml +++ b/pom.xml @@ -83,6 +83,7 @@ + ${project.artifactId} org.springframework.boot From d6d0aaf2feed2f0252d3da5e102c74e764274a2d Mon Sep 17 00:00:00 2001 From: weiyachao <13526234727@126.com> Date: Tue, 19 Sep 2023 21:06:28 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7-3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- iot-modules/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/iot-modules/pom.xml b/iot-modules/pom.xml index 7c36fc7..34d662f 100644 --- a/iot-modules/pom.xml +++ b/iot-modules/pom.xml @@ -14,7 +14,6 @@ iot-admin-http-api iot-box-websocket-api iot-box-user-api - iot-box-websocket-api UTF-8 From efd0002795f9244be4ea405986f8c196b2548859 Mon Sep 17 00:00:00 2001 From: weiyachao <13526234727@126.com> Date: Tue, 19 Sep 2023 21:47:00 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/qiuguo/iot/base/nlp/lac/LacNlp.java | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/nlp/lac/LacNlp.java b/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/nlp/lac/LacNlp.java index de78973..dc3ae9e 100644 --- a/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/nlp/lac/LacNlp.java +++ b/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/nlp/lac/LacNlp.java @@ -3,27 +3,17 @@ package com.qiuguo.iot.base.nlp.lac; import cn.hutool.extra.spring.SpringUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.qiuguo.iot.base.enums.ChinesePartSpeechEnum; import com.qiuguo.iot.base.nlp.INlp; import com.qiuguo.iot.base.nlp.Nlp; import com.qiuguo.iot.base.nlp.NlpKey; -import javafx.application.Application; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.SpringApplication; -import org.springframework.context.ApplicationContext; -import org.springframework.core.env.Environment; -import org.springframework.http.HttpHeaders; -import org.springframework.web.reactive.function.client.WebClient; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - -import javax.annotation.Resource; import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.Objects; -import java.util.stream.Collectors; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpHeaders; +import org.springframework.web.reactive.function.client.WebClient; +import reactor.core.publisher.Mono; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; /** From d5d2367b6754280afed2b4072d72a36cde8a4194 Mon Sep 17 00:00:00 2001 From: weiyachao <13526234727@126.com> Date: Tue, 19 Sep 2023 21:49:49 +0800 Subject: [PATCH 5/5] 1 --- .../qiuguo/iot/user/api/service/TuyaDeviceConnector.java | 3 +++ iot-modules/iot-box-user-api/src/test/java/UserTest.java | 6 ++++++ 2 files changed, 9 insertions(+) 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 977d857..7f90242 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 @@ -20,6 +20,9 @@ import java.util.List; */ public interface TuyaDeviceConnector { + @GET("/v1.0/iot-03/device-categories") + JSONArray categories(); + // 转移设备 @POST("/v2.0/cloud/thing/{device_id}/transfer") Boolean transferDevice(@Path("device_id") String deviceId,@Body JSONObject jsonObject); 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 dd8e191..59628cf 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 @@ -25,6 +25,12 @@ public class UserTest { @Autowired private TuyaDeviceConnector tuyaDeviceConnector; + @Test + public void 查询所有分类() { + JSONArray aa = tuyaDeviceConnector.categories(); + aa.forEach(System.out::println); + } + @Test public void 转移设备() { JSONObject jsonObject = new JSONObject();