From d736e1a43b0b5466f46c052d5520d080d06e0a42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E4=BD=B3=E6=B6=9B?= Date: Sat, 2 Jul 2022 13:15:02 +0800 Subject: [PATCH 01/29] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/me/hekr/iotos/api/IotClientTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/me/hekr/iotos/api/IotClientTest.java b/src/test/java/me/hekr/iotos/api/IotClientTest.java index c0688c2..d4fc661 100644 --- a/src/test/java/me/hekr/iotos/api/IotClientTest.java +++ b/src/test/java/me/hekr/iotos/api/IotClientTest.java @@ -24,9 +24,9 @@ public class IotClientTest { client = IotClient.builder() - .host("http://10.1.1.200:7003/") - .ak("kuQrzR2GowzdSXGULwSvABY9") - .as("ERKp4JwzTQv3RUCVTBtITzNfFkAMog") + .host("http://202.101.162.69:5679/console-api/") + .ak("tmwCQtZbREv4zVlVfg2UWVVK") + .as("pAGM3bv2uoAgN1rpOcPey6daohrx9f") .build(); } -- Gitee From da8944ed04e892574374f21a25199145971c99f6 Mon Sep 17 00:00:00 2001 From: "jiatao.wang" Date: Sat, 2 Jul 2022 18:36:39 +0800 Subject: [PATCH 02/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/me/hekr/iotos/api/IotClient.java | 10 +++++ .../me/hekr/iotos/api/dto/DeviceAddReq.java | 22 +++++++++ .../me/hekr/iotos/api/dto/ProductDTO.java | 45 +++++++++++++++++++ .../iotos/api/service/RetrofitIotService.java | 9 ++++ .../java/me/hekr/iotos/api/IotClientTest.java | 10 +++++ 5 files changed, 96 insertions(+) diff --git a/src/main/java/me/hekr/iotos/api/IotClient.java b/src/main/java/me/hekr/iotos/api/IotClient.java index 586727b..56a19b9 100644 --- a/src/main/java/me/hekr/iotos/api/IotClient.java +++ b/src/main/java/me/hekr/iotos/api/IotClient.java @@ -50,6 +50,7 @@ import retrofit2.Response; import retrofit2.Retrofit; import retrofit2.converter.jackson.JacksonConverterFactory; import retrofit2.http.Body; +import retrofit2.http.GET; import retrofit2.http.POST; @Slf4j @@ -535,6 +536,15 @@ public class IotClient { return execute(retrofitIotService.getDeviceAggData(query.getPk(), query.getDevId(), params)); } + /** 获取萧山资源目录系统资源列表接口 */ + public Object getSystem() { + return execute(retrofitIotService.getSystem()); + } + + /** 获取萧山资源目录下拉信息接口 */ + public Object getCatProduct() { + return execute(retrofitIotService.getCatProduct()); + } /** */ @Data public static class Builder { diff --git a/src/main/java/me/hekr/iotos/api/dto/DeviceAddReq.java b/src/main/java/me/hekr/iotos/api/dto/DeviceAddReq.java index f52dc6f..5d0b542 100644 --- a/src/main/java/me/hekr/iotos/api/dto/DeviceAddReq.java +++ b/src/main/java/me/hekr/iotos/api/dto/DeviceAddReq.java @@ -2,6 +2,8 @@ package me.hekr.iotos.api.dto; import lombok.Data; +import javax.validation.constraints.NotEmpty; + /** 添加设备请求 */ @Data public class DeviceAddReq { @@ -12,4 +14,24 @@ public class DeviceAddReq { private String pk; /** 设备ID 必填 */ private String devId; + + /** 设备地址 */ + @NotEmpty(message = "设备地址不能为空") + private String address; + + /** 所属镇街 */ + @NotEmpty(message = "所属镇街不能为空") + private String town; + + /** 所属村社 */ + @NotEmpty(message = "所属村社不能为空") + private String village; + + /** 经纬度 */ + @NotEmpty(message = "经纬度不能为空") + private Double[] location; + + /** z轴 */ + @NotEmpty(message = "z轴不能为空") + private String zaxis; } diff --git a/src/main/java/me/hekr/iotos/api/dto/ProductDTO.java b/src/main/java/me/hekr/iotos/api/dto/ProductDTO.java index 039105a..97e8ddd 100644 --- a/src/main/java/me/hekr/iotos/api/dto/ProductDTO.java +++ b/src/main/java/me/hekr/iotos/api/dto/ProductDTO.java @@ -43,9 +43,54 @@ public class ProductDTO implements Serializable { private String remark; private boolean open; + + /** 不可见产品将被隐藏 */ + private boolean hide; /** 来自哪个pk的拷贝 */ private String copyFromPk; + /** 数据来源部门 */ + private String dept; + + /** 省主题 */ + private String provinceTopic; + + /** 区主题 */ + private String districtTopic; + + /** 行业分类 */ + private String industry; + + /** 数据级别 */ + private String dataLevel; + + /** 共享属性 */ + private String shareProp; + + /** 开放属性 */ + private String openProp; + + /** 资源领域 */ + private String scope; + + /** 资源范围描述 */ + private String scopeDesc; + + /** 信息资源描述 */ + private String desc; + + /** 周期 */ + private String period; + + /** 更新时间 */ + private String updateTime; + + /** 业务系统编码 */ + private String businessCode; + + /** 所属业务系统 */ + private String businessSys; + public DataFormat getDataFormat() { return this.dataFormat == null ? DataFormat.KLINK : this.dataFormat; } diff --git a/src/main/java/me/hekr/iotos/api/service/RetrofitIotService.java b/src/main/java/me/hekr/iotos/api/service/RetrofitIotService.java index 4b6a398..8aadade 100644 --- a/src/main/java/me/hekr/iotos/api/service/RetrofitIotService.java +++ b/src/main/java/me/hekr/iotos/api/service/RetrofitIotService.java @@ -359,4 +359,13 @@ public interface RetrofitIotService { @GET("api/deviceStat/agglog/{pk}/{devId}") Call getDeviceAggData( @Path("pk") String pk, @Path("devId") String devId, @QueryMap Map params); + + /** 获取萧山资源目录系统资源列表接口 */ + @GET("cat/system") + Call getSystem(); + + /** 获取萧山资源目录下拉信息接口 */ + @GET("cat/product") + Call getCatProduct(); + } diff --git a/src/test/java/me/hekr/iotos/api/IotClientTest.java b/src/test/java/me/hekr/iotos/api/IotClientTest.java index d4fc661..0fd37a3 100644 --- a/src/test/java/me/hekr/iotos/api/IotClientTest.java +++ b/src/test/java/me/hekr/iotos/api/IotClientTest.java @@ -205,4 +205,14 @@ public class IotClientTest { sub.setPk("c33d447799e343f4bb2237390b82604d"); System.out.println(client.delTopo(pk, devId, sub)); } + + @Test + public void getSystem() { + System.out.println(client.getSystem()); + } + + @Test + public void getCatProduct() { + System.out.println(client.getCatProduct()); + } } -- Gitee From af6b3c1c8078529bc873fe73696720b32026ea0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E4=BD=B3=E6=B6=9B?= Date: Tue, 5 Jul 2022 17:55:45 +0800 Subject: [PATCH 03/29] =?UTF-8?q?=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/codeStyles/Project.xml | 24 ----- .idea/encodings.xml | 1 - .../java/me/hekr/iotos/api/IotClient.java | 24 +++++ .../hekr/iotos/api/dto/ConsoleProductReq.java | 88 +++++++++++++++++++ .../api/dto/ConsoleUpdateProductReq.java | 80 +++++++++++++++++ .../iotos/api/service/RetrofitIotService.java | 28 +++++- .../java/me/hekr/iotos/api/IotClientTest.java | 62 ++++++++++++- 7 files changed, 277 insertions(+), 30 deletions(-) create mode 100644 src/main/java/me/hekr/iotos/api/dto/ConsoleProductReq.java create mode 100644 src/main/java/me/hekr/iotos/api/dto/ConsoleUpdateProductReq.java diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 49f7b87..3cdc6ae 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -24,29 +24,5 @@