wulin/qiuguo-iot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决分页问题

Browse Source
This commit is contained in:
wulin 2023-09-19 23:06:58 +08:00
commit 2d48d4bb63
15 changed files with 9415 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
iot-common/iot-base/pom.xml
View File

@ -36,6 +36,7 @@
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>

1
iot-common/iot-base/src/main/java/com/qiuguo/iot/base/nlp/lac/LacNlp.java
View File

@ -3,7 +3,6 @@ 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;

17
iot-common/iot-data/pom.xml
View File

@ -34,10 +34,27 @@
<groupId>org.hswebframework.web</groupId>
<artifactId>hsweb-commons-crud</artifactId>
<version>${hsweb.framework.version}</version>
<exclusions>
<exclusion>
<groupId>org.hswebframework</groupId>
<artifactId>hsweb-easy-orm-rdb</artifactId>
</exclusion>
</exclusions>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>org.hswebframework</groupId>
<artifactId>hsweb-easy-orm-core</artifactId>
<version>4.1.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>

3
iot-common/iot-data/src/main/java/com/qiuguo/iot/data/entity/device/DeviceAlarmClockRecordEntity.java
View File

@ -1,9 +1,10 @@
package com.qiuguo.iot.data.entity.device;
import lombok.Data;
import org.hswebframework.ezorm.rdb.mapping.annotation.Comment;
import org.hswebframework.web.crud.annotation.EnableEntityEvent;
import org.hswebframework.web.api.crud.entity.GenericEntity;
import javax.persistence.Column;
import javax.persistence.Table;import lombok.Data;
import javax.persistence.Table;
import java.util.Date;
/**
* <p>

1
iot-gateway/pom.xml
View File

@ -52,6 +52,7 @@
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>

13
iot-modules/iot-admin-http-api/pom.xml
View File

@ -21,6 +21,12 @@
<groupId>org.hswebframework.web</groupId>
<artifactId>hsweb-commons-crud</artifactId>
<version>${hswebframework.version}</version>
<exclusions>
<exclusion>
<groupId>org.hswebframework</groupId>
<artifactId>hsweb-easy-orm-rdb</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@ -36,6 +42,12 @@
<groupId>org.hswebframework.web</groupId>
<artifactId>hsweb-starter</artifactId>
<version>${hswebframework.version}</version>
<exclusions>
<exclusion>
<groupId>org.hswebframework</groupId>
<artifactId>hsweb-easy-orm-rdb</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.r2dbc</groupId>
@ -72,6 +84,7 @@
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>

18
iot-modules/iot-box-user-api/pom.xml
View File

@ -37,11 +37,23 @@
<groupId>org.hswebframework.web</groupId>
<artifactId>hsweb-commons-crud</artifactId>
<version>${hswebframework.version}</version>
<exclusions>
<exclusion>
<groupId>org.hswebframework</groupId>
<artifactId>hsweb-easy-orm-rdb</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hswebframework.web</groupId>
<artifactId>hsweb-system-authorization-default</artifactId>
<version>${hswebframework.version}</version>
<exclusions>
<exclusion>
<groupId>org.hswebframework</groupId>
<artifactId>hsweb-easy-orm-rdb</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@ -54,6 +66,12 @@
<groupId>org.hswebframework.web</groupId>
<artifactId>hsweb-starter</artifactId>
<version>${hswebframework.version}</version>
<exclusions>
<exclusion>
<groupId>org.hswebframework</groupId>
<artifactId>hsweb-easy-orm-rdb</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>

3
iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/service/TuyaDeviceConnector.java
View File

@ -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);

6
iot-modules/iot-box-user-api/src/test/java/UserTest.java
View File

@ -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();

7
iot-modules/iot-box-websocket-api/pom.xml
View File

@ -46,6 +46,12 @@
<groupId>org.hswebframework.web</groupId>
<artifactId>hsweb-commons-crud</artifactId>
<version>${hswebframework.version}</version>
<exclusions>
<exclusion>
<groupId>org.hswebframework</groupId>
<artifactId>hsweb-easy-orm-rdb</artifactId>
</exclusion>
</exclusions>
<scope>compile</scope>
</dependency>
<dependency>
@ -76,6 +82,7 @@
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>

7
iot-modules/iot-customer-http-api/pom.xml
View File

@ -20,6 +20,12 @@
<groupId>org.hswebframework.web</groupId>
<artifactId>hsweb-commons-crud</artifactId>
<version>${hswebframework.version}</version>
<exclusions>
<exclusion>
<groupId>org.hswebframework</groupId>
<artifactId>hsweb-easy-orm-rdb</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@ -41,6 +47,7 @@
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>

3113
logs/iot-user-api/error.log
View File

File diff suppressed because it is too large Load Diff

3113
logs/iot-user-api/info.log
View File

File diff suppressed because it is too large Load Diff

3113
logs/iot-user-api/warn.log
View File

File diff suppressed because it is too large Load Diff

1
pom.xml
View File

@ -83,6 +83,7 @@
</dependencyManagement>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>