diff --git a/README.md b/README.md index fbf156bea..dd6a0754a 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,3 @@ - :rocket: 项目文档请阅读 [`IOT DC3 Wiki (https://doc.dc3.site)`](https://doc.dc3.site) ！ - - :boom: 你的 `Star` 是我开发的动力，下载源码 `git clone https://gitee.com/pnoker/iot-dc3.git` ！ - - :seedling: 为了便于你的二次开发和理解，`DC3` 开源了 `Demo Web UI` ， https://gitee.com/pnoker/dc3-web -


star @@ -16,8 +10,6 @@
DC3是基于Spring Cloud的开源可分布式物联网(IOT)平台,用于快速开发、部署物联设备接入项目,是一整套物联系统解决方案。
IOT DC3 is an open source, distributed Internet of Things (IOT) platform based on Spring Cloud. It is used for rapid development of IOT projects and management of IOT devices. It is a set of solutions for IOT system.

- - ------ @@ -25,6 +17,8 @@ ![iot-dc3-architecture](./docs/images/dc3/architecture1.jpg) + + #### DC3 模块划分，四层架构 * [x] 驱动层：用于提供标准或者私有协议连接物理设备的 `SDK`，负责南向设备的数据采集和指令控制，基于 `SDK` 可实现驱动的快速开发； @@ -32,6 +26,8 @@ * [x] 管理层：用于提供微服务注册中心、设备指令接口、设备注册与关联配对、数据管理中心，是所有微服务交互的核心部分，负责各类配置数据的管理，并对外提供接口服务； * [ ] 应用层(开发中...)：用于提供数据开放、任务调度、报警与消息通知、日志管理等，具备对接第三方平台能力。 + + #### DC3 功能设计，定位目标 * [x] 可伸缩：水平可伸缩的平台,构建使用领先的 `Spring Cloud` 开源技术； @@ -41,8 +37,8 @@ * [x] 跨平台：使用 `Java` 环境可异地、分布式多平台部署； * [x] 自主可控：私有云、公有云、边缘部署； * [X] 完善性：设备快速接入、注册、权限校验； - * [ ] 安全(开发中...)：数据加密传输； - * [ ] 多租户(开发中...)：命名空间，多租户化； + * [ ] 安全(开发中...)：数据加密传输（mqtt 驱动已实现数据加密传输）； + * [x] 多租户：命名空间，多租户化； * [X] 云原生：Kubernetes； * [x] 容器化：Docker。 @@ -55,8 +51,6 @@ ![iot-dc3-architecture](./docs/images/dc3/architecture2.jpg) -[`Spring Cloud Netflix`](https://cloud.spring.io/spring-cloud-netflix)、[`Spring Cloud Gateway`](https://cloud.spring.io/spring-cloud-gateway)、[`Spring Cloud Security`](https://cloud.spring.io/spring-cloud-security)、[`Spring Cloud OpenFeign`](https://cloud.spring.io/spring-cloud-openfeign) 等微服务模块。 - ### 3 项目文档 @@ -65,6 +59,23 @@ > > **其中包括：安装配置文档、部署文档、项目结构说明、平台介绍等内容。** -> **入门：一睹为快，快速启动一个，[`Demo Application (https://web.dc3.site)`](https://web.dc3.site) ！** + + +> **入门：一睹为快，快速启动一个！** > -> 请阅读 [`快速开始`](https://doc.dc3.site/#/quick-start?id=%e4%b8%80%e7%9d%b9%e4%b8%ba%e5%bf%ab) 文档 \ No newline at end of file +> 请阅读 [`快速开始`](https://doc.dc3.site/#/quick-start?id=%e4%b8%80%e7%9d%b9%e4%b8%ba%e5%bf%ab) 文档 + + + +### 4 开源贡献 + +- 从 `master` 分支 `checkout` 一个新分支（**注**：*请务必保证 `master` 代码是最新的*） +- 新分支命名格式：`docs/username_description`，例如：`docs/pnoker_新增mqtt使用说明` +- 在新分支上编辑文档，并提交代码 +- 最后 `PR` 合并到 `develop` 分支，等待作者合并即可 + + + +### 5 开源协议 + +`IOT DC3` 开源平台遵循 [Apache 2.0 协议](https://www.apache.org/licenses/LICENSE-2.0.html)。 允许商业使用，但务必保留类作者、Copyright 信息。 \ No newline at end of file diff --git a/dc3-api/dc3-api-auth/src/main/java/com/dc3/api/center/auth/feign/DictionaryClient.java b/dc3-api/dc3-api-auth/src/main/java/com/dc3/api/center/auth/feign/DictionaryClient.java index 5b68c14b6..34b214a94 100644 --- a/dc3-api/dc3-api-auth/src/main/java/com/dc3/api/center/auth/feign/DictionaryClient.java +++ b/dc3-api/dc3-api-auth/src/main/java/com/dc3/api/center/auth/feign/DictionaryClient.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestHeader; import java.util.List; /** - *

字典 FeignClient + * 字典 FeignClient * * @author pnoker */ diff --git a/dc3-api/dc3-api-auth/src/main/java/com/dc3/api/center/auth/feign/TokenClient.java b/dc3-api/dc3-api-auth/src/main/java/com/dc3/api/center/auth/feign/TokenClient.java index ee5cbec77..9d5f997d8 100644 --- a/dc3-api/dc3-api-auth/src/main/java/com/dc3/api/center/auth/feign/TokenClient.java +++ b/dc3-api/dc3-api-auth/src/main/java/com/dc3/api/center/auth/feign/TokenClient.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; /** - *

令牌 FeignClient + * 令牌 FeignClient * * @author pnoker */ diff --git a/dc3-api/dc3-api-auth/src/main/java/com/dc3/api/center/auth/hystrix/DictionaryClientHystrix.java b/dc3-api/dc3-api-auth/src/main/java/com/dc3/api/center/auth/hystrix/DictionaryClientHystrix.java index 8c9a13111..ad0f8eddc 100644 --- a/dc3-api/dc3-api-auth/src/main/java/com/dc3/api/center/auth/hystrix/DictionaryClientHystrix.java +++ b/dc3-api/dc3-api-auth/src/main/java/com/dc3/api/center/auth/hystrix/DictionaryClientHystrix.java @@ -23,7 +23,7 @@ import org.springframework.stereotype.Component; import java.util.List; /** - *

DictionaryClientHystrix + * DictionaryClientHystrix * * @author pnoker */ diff --git a/dc3-api/dc3-api-auth/src/main/java/com/dc3/api/center/auth/hystrix/TokenClientHystrix.java b/dc3-api/dc3-api-auth/src/main/java/com/dc3/api/center/auth/hystrix/TokenClientHystrix.java index 354ee498a..ee192bf37 100644 --- a/dc3-api/dc3-api-auth/src/main/java/com/dc3/api/center/auth/hystrix/TokenClientHystrix.java +++ b/dc3-api/dc3-api-auth/src/main/java/com/dc3/api/center/auth/hystrix/TokenClientHystrix.java @@ -21,7 +21,7 @@ import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; /** - *

TokenClientHystrix + * TokenClientHystrix * * @author pnoker */ diff --git a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/BatchClient.java b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/BatchClient.java index fb4e16f5a..1d18d3768 100644 --- a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/BatchClient.java +++ b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/BatchClient.java @@ -25,7 +25,7 @@ import javax.validation.constraints.NotNull; import java.util.List; /** - *

批量导入 FeignClient + * 批量导入 FeignClient * * @author pnoker */ diff --git a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/DictionaryClient.java b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/DictionaryClient.java index 0c496a991..394696c5a 100644 --- a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/DictionaryClient.java +++ b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/DictionaryClient.java @@ -26,7 +26,7 @@ import javax.validation.constraints.NotNull; import java.util.List; /** - *

字典 FeignClient + * 字典 FeignClient * * @author pnoker */ diff --git a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/DriverAttributeClient.java b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/DriverAttributeClient.java index 1b0874b3c..ed03c168b 100644 --- a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/DriverAttributeClient.java +++ b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/DriverAttributeClient.java @@ -32,7 +32,7 @@ import javax.validation.constraints.NotNull; import java.util.List; /** - *

驱动配置属性 FeignClient + * 驱动配置属性 FeignClient * * @author pnoker */ diff --git a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/DriverClient.java b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/DriverClient.java index c57da11a2..848d5e65b 100644 --- a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/DriverClient.java +++ b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/DriverClient.java @@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.constraints.NotNull; /** - *

驱动 FeignClient + * 驱动 FeignClient * * @author pnoker */ diff --git a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/DriverInfoClient.java b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/DriverInfoClient.java index f95ecd1b1..749e9b218 100644 --- a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/DriverInfoClient.java +++ b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/DriverInfoClient.java @@ -32,7 +32,7 @@ import javax.validation.constraints.NotNull; import java.util.List; /** - *

驱动配置信息 FeignClient + * 驱动配置信息 FeignClient * * @author pnoker */ diff --git a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/GroupClient.java b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/GroupClient.java index 5972b99ab..da0ba4ad1 100644 --- a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/GroupClient.java +++ b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/GroupClient.java @@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.constraints.NotNull; /** - *

分组 FeignClient + * 分组 FeignClient * * @author pnoker */ diff --git a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/LabelClient.java b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/LabelClient.java index c241e2f51..0706c8845 100644 --- a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/LabelClient.java +++ b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/LabelClient.java @@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.constraints.NotNull; /** - *

标签 FeignClient + * 标签 FeignClient * * @author pnoker */ diff --git a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/PointAttributeClient.java b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/PointAttributeClient.java index e1a109cc3..ff7165649 100644 --- a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/PointAttributeClient.java +++ b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/PointAttributeClient.java @@ -32,7 +32,7 @@ import javax.validation.constraints.NotNull; import java.util.List; /** - *

位号配置属性 FeignClient + * 位号配置属性 FeignClient * * @author pnoker */ diff --git a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/PointClient.java b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/PointClient.java index 8c8ee6a09..f9897fcf5 100644 --- a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/PointClient.java +++ b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/PointClient.java @@ -31,7 +31,7 @@ import java.util.Map; import java.util.Set; /** - *

位号 FeignClient + * 位号 FeignClient * * @author pnoker */ diff --git a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/PointInfoClient.java b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/PointInfoClient.java index fa3bd39e9..ddb250a8f 100644 --- a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/PointInfoClient.java +++ b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/PointInfoClient.java @@ -32,7 +32,7 @@ import javax.validation.constraints.NotNull; import java.util.List; /** - *

位号配置信息 FeignClient + * 位号配置信息 FeignClient * * @author pnoker */ diff --git a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/ProfileClient.java b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/ProfileClient.java index dbc2039e9..9a8d31207 100644 --- a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/ProfileClient.java +++ b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/feign/ProfileClient.java @@ -29,7 +29,7 @@ import javax.validation.constraints.NotNull; import java.util.List; /** - *

模板 FeignClient + * 模板 FeignClient * * @author pnoker */ diff --git a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/AutoClientHystrix.java b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/AutoClientHystrix.java index 49e900f9f..f6e3ce67e 100644 --- a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/AutoClientHystrix.java +++ b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/AutoClientHystrix.java @@ -21,7 +21,7 @@ import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; /** - *

AutoClientHystrix + * AutoClientHystrix * * @author pnoker */ diff --git a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/BatchClientHystrix.java b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/BatchClientHystrix.java index 63482001e..70e0e7e5f 100644 --- a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/BatchClientHystrix.java +++ b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/BatchClientHystrix.java @@ -24,7 +24,7 @@ import org.springframework.web.multipart.MultipartFile; import java.util.List; /** - *

ImportClientHystrix + * ImportClientHystrix * * @author pnoker */ diff --git a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/DeviceClientHystrix.java b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/DeviceClientHystrix.java index 582cb36d0..80ee50dbe 100644 --- a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/DeviceClientHystrix.java +++ b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/DeviceClientHystrix.java @@ -25,7 +25,7 @@ import org.springframework.stereotype.Component; import java.util.List; /** - *

DeviceClientHystrix + * DeviceClientHystrix * * @author pnoker */ diff --git a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/DictionaryClientHystrix.java b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/DictionaryClientHystrix.java index bd6343011..561dffa20 100644 --- a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/DictionaryClientHystrix.java +++ b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/DictionaryClientHystrix.java @@ -23,7 +23,7 @@ import org.springframework.stereotype.Component; import java.util.List; /** - *

DictionaryClientHystrix + * DictionaryClientHystrix * * @author pnoker */ diff --git a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/DriverAttributeClientHystrix.java b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/DriverAttributeClientHystrix.java index d33cfde37..b66cfd23d 100644 --- a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/DriverAttributeClientHystrix.java +++ b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/DriverAttributeClientHystrix.java @@ -26,7 +26,7 @@ import javax.validation.constraints.NotNull; import java.util.List; /** - *

DriverAttributeClient + * DriverAttributeClient * * @author pnoker */ diff --git a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/DriverClientHystrix.java b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/DriverClientHystrix.java index b7919f4a9..dd3597675 100644 --- a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/DriverClientHystrix.java +++ b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/DriverClientHystrix.java @@ -23,7 +23,7 @@ import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; /** - *

DriverClientHystrix + * DriverClientHystrix * * @author pnoker */ diff --git a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/DriverInfoClientHystrix.java b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/DriverInfoClientHystrix.java index 817905eb7..36963f4fa 100644 --- a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/DriverInfoClientHystrix.java +++ b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/DriverInfoClientHystrix.java @@ -25,7 +25,7 @@ import org.springframework.stereotype.Component; import java.util.List; /** - *

DriverInfoClientHystrix + * DriverInfoClientHystrix * * @author pnoker */ diff --git a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/GroupClientHystrix.java b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/GroupClientHystrix.java index 1dbfea1e9..8ec34f42e 100644 --- a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/GroupClientHystrix.java +++ b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/GroupClientHystrix.java @@ -23,7 +23,7 @@ import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; /** - *

GroupClientHystrix + * GroupClientHystrix * * @author pnoker */ diff --git a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/LabelClientHystrix.java b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/LabelClientHystrix.java index c703a7301..5efe9c796 100644 --- a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/LabelClientHystrix.java +++ b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/LabelClientHystrix.java @@ -23,7 +23,7 @@ import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; /** - *

LabelClientHystrix + * LabelClientHystrix * * @author pnoker */ diff --git a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/PointAttributeClientHystrix.java b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/PointAttributeClientHystrix.java index 93de55b99..89b804dee 100644 --- a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/PointAttributeClientHystrix.java +++ b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/PointAttributeClientHystrix.java @@ -26,7 +26,7 @@ import javax.validation.constraints.NotNull; import java.util.List; /** - *

PointAttributeClientHystrix + * PointAttributeClientHystrix * * @author pnoker */ diff --git a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/PointClientHystrix.java b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/PointClientHystrix.java index 4eafed9c3..510381883 100644 --- a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/PointClientHystrix.java +++ b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/PointClientHystrix.java @@ -27,7 +27,7 @@ import java.util.Map; import java.util.Set; /** - *

PointClientHystrix + * PointClientHystrix * * @author pnoker */ diff --git a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/PointInfoClientHystrix.java b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/PointInfoClientHystrix.java index 23fbab872..43c163095 100644 --- a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/PointInfoClientHystrix.java +++ b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/PointInfoClientHystrix.java @@ -25,7 +25,7 @@ import org.springframework.stereotype.Component; import java.util.List; /** - *

PointInfoClientHystrix + * PointInfoClientHystrix * * @author pnoker */ diff --git a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/ProfileClientHystrix.java b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/ProfileClientHystrix.java index 8780602e9..cac033331 100644 --- a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/ProfileClientHystrix.java +++ b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/ProfileClientHystrix.java @@ -25,7 +25,7 @@ import org.springframework.stereotype.Component; import java.util.List; /** - *

ProfileClientHystrix + * ProfileClientHystrix * * @author pnoker */ diff --git a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/StatusClientHystrix.java b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/StatusClientHystrix.java index 861676e49..f903812dc 100644 --- a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/StatusClientHystrix.java +++ b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/hystrix/StatusClientHystrix.java @@ -24,7 +24,7 @@ import org.springframework.stereotype.Component; import java.util.Map; /** - *

DeviceClientHystrix + * DeviceClientHystrix * * @author pnoker */ diff --git a/dc3-center/dc3-auth/src/main/java/com/dc3/center/auth/service/impl/TenantBindServiceImpl.java b/dc3-center/dc3-auth/src/main/java/com/dc3/center/auth/service/impl/TenantBindServiceImpl.java index dd7602ade..bcbc6d667 100644 --- a/dc3-center/dc3-auth/src/main/java/com/dc3/center/auth/service/impl/TenantBindServiceImpl.java +++ b/dc3-center/dc3-auth/src/main/java/com/dc3/center/auth/service/impl/TenantBindServiceImpl.java @@ -35,7 +35,7 @@ import javax.annotation.Resource; import java.util.Optional; /** - *

TenantBindService Impl + * TenantBindService Impl * * @author pnoker */ diff --git a/dc3-center/dc3-data/src/main/java/com/dc3/center/data/config/MongoDbConfig.java b/dc3-center/dc3-data/src/main/java/com/dc3/center/data/config/MongoDbConfig.java index 62ed45e0b..4c5adc2f2 100644 --- a/dc3-center/dc3-data/src/main/java/com/dc3/center/data/config/MongoDbConfig.java +++ b/dc3-center/dc3-data/src/main/java/com/dc3/center/data/config/MongoDbConfig.java @@ -1,3 +1,16 @@ +/* + * Copyright 2016-2021 Pnoker. All Rights Reserved. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.dc3.center.data.config; import lombok.extern.slf4j.Slf4j; diff --git a/dc3-center/dc3-data/src/main/java/com/dc3/center/data/config/OkHttpClientConfig.java b/dc3-center/dc3-data/src/main/java/com/dc3/center/data/config/OkHttpClientConfig.java index 379fa4549..9a2272ab1 100644 --- a/dc3-center/dc3-data/src/main/java/com/dc3/center/data/config/OkHttpClientConfig.java +++ b/dc3-center/dc3-data/src/main/java/com/dc3/center/data/config/OkHttpClientConfig.java @@ -1,3 +1,16 @@ +/* + * Copyright 2016-2021 Pnoker. All Rights Reserved. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.dc3.center.data.config; import lombok.extern.slf4j.Slf4j; diff --git a/dc3-center/dc3-data/src/main/java/com/dc3/center/data/service/impl/DataCustomServiceImpl.java b/dc3-center/dc3-data/src/main/java/com/dc3/center/data/service/impl/DataCustomServiceImpl.java index 2c1418fef..351d2b0ff 100644 --- a/dc3-center/dc3-data/src/main/java/com/dc3/center/data/service/impl/DataCustomServiceImpl.java +++ b/dc3-center/dc3-data/src/main/java/com/dc3/center/data/service/impl/DataCustomServiceImpl.java @@ -13,11 +13,18 @@ package com.dc3.center.data.service.impl; +import com.alibaba.fastjson.JSON; import com.dc3.center.data.service.DataCustomService; import com.dc3.common.bean.point.PointValue; +import com.dc3.common.bean.point.TsPointValue; +import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; +import okhttp3.*; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.io.IOException; +import java.util.ArrayList; import java.util.List; /** @@ -27,6 +34,11 @@ import java.util.List; @Service public class DataCustomServiceImpl implements DataCustomService { + private static final String putUrl = ""; + + @Resource + private OkHttpClient okHttpClient; + @Override public void preHandle(PointValue pointValue) { // TODO 接收数据之后，存储数据之前的操作 @@ -34,16 +46,81 @@ public class DataCustomServiceImpl implements DataCustomService { @Override public void postHandle(PointValue pointValue) { - // TODO 接收数据之后，存储数据的时候的操作，此处可以自定义逻辑，将数据存放到别的数据库，或者发送到别的地方 + String metric = pointValue.getDeviceId().toString(); + List tsPointValues = convertToTsPointValues(metric, pointValue); + savePointValueToOpenTsdb(tsPointValues); } @Override public void postHandle(Long deviceId, List pointValues) { - // TODO 接收数据之后，存储数据的时候的操作，此处可以自定义逻辑，将数据存放到别的数据库，或者发送到别的地方 + String metric = deviceId.toString(); + + List tsPointValues = pointValues.stream() + .map(pointValue -> convertToTsPointValues(metric, pointValue)) + .reduce(new ArrayList<>(), (first, second) -> { + first.addAll(second); + return first; + }); + List> partition = Lists.partition(tsPointValues, 100); + partition.forEach(this::savePointValueToOpenTsdb); } @Override public void afterHandle(PointValue pointValue) { - // TODO 接收数据之后，存储数据之后的操作 + // TODO 接收数据之后，存储数据的时候的操作，此处可以自定义逻辑，将数据存放到别的数据库，或者发送到别的地方 + } + + /** + * convert point value to opentsdb point value + * + * @param metric Metric Name + * @param pointValue Point Value + * @return TsPointValue Array + */ + private List convertToTsPointValues(String metric, PointValue pointValue) { + String point = pointValue.getPointId().toString(); + String value = pointValue.getValue(); + Long timestamp = pointValue.getOriginTime().getTime(); + + List tsPointValues = new ArrayList<>(4); + + TsPointValue tsValue = new TsPointValue(metric, value); + tsValue.setTimestamp(timestamp) + .addTag("point", point) + .addTag("valueType", "value"); + tsPointValues.add(tsValue); + + TsPointValue tsRawValue = new TsPointValue(metric, value); + tsRawValue.setTimestamp(timestamp) + .addTag("point", point) + .addTag("valueType", "rawValue"); + tsPointValues.add(tsRawValue); + + return tsPointValues; + } + + /** + * send point value to opentsdb + * + * @param tsPointValues TsPointValue Array + */ + private void savePointValueToOpenTsdb(List tsPointValues) { + RequestBody requestBody = RequestBody.create(MediaType.parse("application/json;charset=utf-8"), JSON.toJSONString(tsPointValues)); + Request request = new Request.Builder() + .url(putUrl) + .post(requestBody) + .build(); + + try { + Response response = okHttpClient.newCall(request).execute(); + ResponseBody body = response.body(); + if (null != body) { + log.debug("send pointValue to opentsdb {}: {}", response.message(), body.string()); + body.close(); + } + response.close(); + } catch (IOException e) { + log.error("send pointValue to opentsdb error: {}", e.getMessage()); + } } } diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/ManagerApplication.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/ManagerApplication.java index 5a686baa5..dab6e3af1 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/ManagerApplication.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/ManagerApplication.java @@ -20,7 +20,7 @@ import org.springframework.context.annotation.AdviceMode; import org.springframework.transaction.annotation.EnableTransactionManagement; /** - *

设备管理服务入口 + * 设备管理服务入口 * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/AutoApi.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/AutoApi.java index 3ee3686fd..3102bdf48 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/AutoApi.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/AutoApi.java @@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; /** - *

自发现 Client 接口实现 + * 自发现 Client 接口实现 * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/BatchApi.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/BatchApi.java index 03079d561..e591fc4ac 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/BatchApi.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/BatchApi.java @@ -31,7 +31,7 @@ import javax.annotation.Resource; import java.util.List; /** - *

批量导入 Client 接口实现 + * 批量导入 Client 接口实现 * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/DeviceApi.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/DeviceApi.java index d043a0044..5b5ce1500 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/DeviceApi.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/DeviceApi.java @@ -29,7 +29,7 @@ import javax.annotation.Resource; import java.util.List; /** - *

设备 Client 接口实现 + * 设备 Client 接口实现 * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/DriverApi.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/DriverApi.java index c2cadf929..12f59983c 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/DriverApi.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/DriverApi.java @@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; /** - *

驱动 Client 接口实现 + * 驱动 Client 接口实现 * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/DriverAttributeApi.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/DriverAttributeApi.java index 07c60057b..52fdada82 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/DriverAttributeApi.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/DriverAttributeApi.java @@ -30,7 +30,7 @@ import java.util.ArrayList; import java.util.List; /** - *

驱动连接配置信息 Client 接口实现 + * 驱动连接配置信息 Client 接口实现 * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/DriverInfoApi.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/DriverInfoApi.java index d53557d6a..937f336ca 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/DriverInfoApi.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/DriverInfoApi.java @@ -29,7 +29,7 @@ import javax.annotation.Resource; import java.util.List; /** - *

位号配置信息 Client 接口实现 + * 位号配置信息 Client 接口实现 * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/GroupApi.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/GroupApi.java index 9e64dffd3..2fb838fcb 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/GroupApi.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/GroupApi.java @@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; /** - *

设备 Client 接口实现 + * 设备 Client 接口实现 * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/LabelApi.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/LabelApi.java index 5baacff33..ead7a700a 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/LabelApi.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/LabelApi.java @@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; /** - *

标签 Client 接口实现 + * 标签 Client 接口实现 * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/PointApi.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/PointApi.java index 0c5803def..cd9b428d6 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/PointApi.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/PointApi.java @@ -31,7 +31,7 @@ import java.util.Map; import java.util.Set; /** - *

位号 Client 接口实现 + * 位号 Client 接口实现 * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/PointAttributeApi.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/PointAttributeApi.java index 4eec93f00..71b417fb4 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/PointAttributeApi.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/PointAttributeApi.java @@ -30,7 +30,7 @@ import java.util.ArrayList; import java.util.List; /** - *

驱动属性配置信息 Client 接口实现 + * 驱动属性配置信息 Client 接口实现 * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/PointInfoApi.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/PointInfoApi.java index de7de66a7..e78a19987 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/PointInfoApi.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/PointInfoApi.java @@ -29,7 +29,7 @@ import javax.annotation.Resource; import java.util.List; /** - *

位号配置信息 Client 接口实现 + * 位号配置信息 Client 接口实现 * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/ProfileApi.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/ProfileApi.java index c351d2687..0a2be3075 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/ProfileApi.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/ProfileApi.java @@ -29,7 +29,7 @@ import javax.annotation.Resource; import java.util.List; /** - *

模板 Client 接口实现 + * 模板 Client 接口实现 * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/StatusApi.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/StatusApi.java index 40f637032..9546b8187 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/StatusApi.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/api/StatusApi.java @@ -27,7 +27,7 @@ import javax.annotation.Resource; import java.util.Map; /** - *

设备 Client 接口实现 + * 设备 Client 接口实现 * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/config/MongoDbConfig.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/config/MongoDbConfig.java index 85986396b..9171a6658 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/config/MongoDbConfig.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/config/MongoDbConfig.java @@ -1,3 +1,16 @@ +/* + * Copyright 2016-2021 Pnoker. All Rights Reserved. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.dc3.center.manager.config; import lombok.extern.slf4j.Slf4j; diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/AutoService.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/AutoService.java index 49717e3d9..ee5d04a49 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/AutoService.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/AutoService.java @@ -16,7 +16,7 @@ package com.dc3.center.manager.service; import com.dc3.common.bean.point.PointDetail; /** - *

Auto Interface + * Auto Interface * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/BatchService.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/BatchService.java index 1f654558d..8126e2f2f 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/BatchService.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/BatchService.java @@ -19,7 +19,7 @@ import com.dc3.common.bean.driver.DriverMetadata; import java.util.List; /** - *

BatchService Interface + * BatchService Interface * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/DeviceService.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/DeviceService.java index 01f209674..74df2e0d3 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/DeviceService.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/DeviceService.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Set; /** - *

Device Interface + * Device Interface * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/DriverAttributeService.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/DriverAttributeService.java index 0c4ed8f2d..8da7114f4 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/DriverAttributeService.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/DriverAttributeService.java @@ -20,7 +20,7 @@ import com.dc3.common.model.DriverAttribute; import java.util.List; /** - *

DriverAttribute Interface + * DriverAttribute Interface * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/DriverInfoService.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/DriverInfoService.java index 5ccad9b0a..487e7cba3 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/DriverInfoService.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/DriverInfoService.java @@ -20,7 +20,7 @@ import com.dc3.common.model.DriverInfo; import java.util.List; /** - *

DriverInfo Interface + * DriverInfo Interface * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/DriverSdkService.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/DriverSdkService.java index eba479d30..af6924595 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/DriverSdkService.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/DriverSdkService.java @@ -16,7 +16,7 @@ package com.dc3.center.manager.service; import com.dc3.common.bean.driver.DriverRegister; /** - *

Driver Sdk Interface + * Driver Sdk Interface * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/DriverService.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/DriverService.java index d90088c95..0cef69d57 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/DriverService.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/DriverService.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Set; /** - *

Driver Interface + * Driver Interface * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/GroupService.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/GroupService.java index 82485bf87..3e4600533 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/GroupService.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/GroupService.java @@ -18,7 +18,7 @@ import com.dc3.common.dto.GroupDto; import com.dc3.common.model.Group; /** - *

Group Interface + * Group Interface * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/LabelBindService.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/LabelBindService.java index 1bf256107..718d48eef 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/LabelBindService.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/LabelBindService.java @@ -18,7 +18,7 @@ import com.dc3.common.dto.LabelBindDto; import com.dc3.common.model.LabelBind; /** - *

LabelBind Interface + * LabelBind Interface * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/LabelService.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/LabelService.java index 9942fcc38..ee1d033ee 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/LabelService.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/LabelService.java @@ -18,7 +18,7 @@ import com.dc3.common.dto.LabelDto; import com.dc3.common.model.Label; /** - *

Label Interface + * Label Interface * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/NotifyService.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/NotifyService.java index 02e8fb9b8..303cdaf2f 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/NotifyService.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/NotifyService.java @@ -16,7 +16,7 @@ package com.dc3.center.manager.service; import com.dc3.common.model.*; /** - *

Notify Interface + * Notify Interface * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/PointAttributeService.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/PointAttributeService.java index 52433fd51..cc34772c7 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/PointAttributeService.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/PointAttributeService.java @@ -20,7 +20,7 @@ import com.dc3.common.model.PointAttribute; import java.util.List; /** - *

PointAttribute Interface + * PointAttribute Interface * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/PointInfoService.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/PointInfoService.java index e4077588d..ff4e5682c 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/PointInfoService.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/PointInfoService.java @@ -20,7 +20,7 @@ import com.dc3.common.model.PointInfo; import java.util.List; /** - *

PointInfo Interface + * PointInfo Interface * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/PointService.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/PointService.java index d2885890b..f8f04ea7a 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/PointService.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/PointService.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.Set; /** - *

Point Interface + * Point Interface * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/ProfileBindService.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/ProfileBindService.java index f95272195..07a9da196 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/ProfileBindService.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/ProfileBindService.java @@ -20,7 +20,7 @@ import com.dc3.common.model.ProfileBind; import java.util.Set; /** - *

ProfileBind Interface + * ProfileBind Interface * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/ProfileService.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/ProfileService.java index 35edce9ba..e2958dec5 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/ProfileService.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/ProfileService.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Set; /** - *

Profile Interface + * Profile Interface * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/StatusService.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/StatusService.java index 5dc15d0fa..6384df833 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/StatusService.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/StatusService.java @@ -19,7 +19,7 @@ import com.dc3.common.dto.DriverDto; import java.util.Map; /** - *

Device Interface + * Device Interface * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/BatchServiceImpl.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/BatchServiceImpl.java index a06780c6d..3efd4e995 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/BatchServiceImpl.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/BatchServiceImpl.java @@ -33,7 +33,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; /** - *

BatchService Impl + * BatchService Impl * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/DeviceServiceImpl.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/DeviceServiceImpl.java index b7f5e9000..b09fd098e 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/DeviceServiceImpl.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/DeviceServiceImpl.java @@ -43,7 +43,7 @@ import java.util.Optional; import java.util.Set; /** - *

DeviceService Impl + * DeviceService Impl * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/DriverAttributeServiceImpl.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/DriverAttributeServiceImpl.java index 43525415b..b28275835 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/DriverAttributeServiceImpl.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/DriverAttributeServiceImpl.java @@ -37,7 +37,7 @@ import javax.annotation.Resource; import java.util.List; /** - *

DriverAttributeService Impl + * DriverAttributeService Impl * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/DriverInfoServiceImpl.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/DriverInfoServiceImpl.java index 863ccd97c..2679f3496 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/DriverInfoServiceImpl.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/DriverInfoServiceImpl.java @@ -37,7 +37,7 @@ import java.util.List; import java.util.Optional; /** - *

DriverInfoService Impl + * DriverInfoService Impl * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/DriverSdkServiceImpl.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/DriverSdkServiceImpl.java index b3d8f892b..5d4eba453 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/DriverSdkServiceImpl.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/DriverSdkServiceImpl.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.Map; /** - *

DriverService Impl + * DriverService Impl * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/DriverServiceImpl.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/DriverServiceImpl.java index d5a88e960..2f8e8fd49 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/DriverServiceImpl.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/DriverServiceImpl.java @@ -42,7 +42,7 @@ import java.util.Set; import java.util.stream.Collectors; /** - *

DriverService Impl + * DriverService Impl * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/GroupServiceImpl.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/GroupServiceImpl.java index 732dc4c3d..25b7547df 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/GroupServiceImpl.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/GroupServiceImpl.java @@ -37,7 +37,7 @@ import javax.annotation.Resource; import java.util.Optional; /** - *

GroupService Impl + * GroupService Impl * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/LabelBindServiceImpl.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/LabelBindServiceImpl.java index 709488284..e0848470f 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/LabelBindServiceImpl.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/LabelBindServiceImpl.java @@ -36,7 +36,7 @@ import javax.annotation.Resource; import java.util.Optional; /** - *

LabelBindService Impl + * LabelBindService Impl * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/LabelServiceImpl.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/LabelServiceImpl.java index 990b45270..ae981ce3f 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/LabelServiceImpl.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/LabelServiceImpl.java @@ -39,7 +39,7 @@ import javax.annotation.Resource; import java.util.Optional; /** - *

LabelService Impl + * LabelService Impl * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/PointAttributeServiceImpl.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/PointAttributeServiceImpl.java index ad29281f7..067f03283 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/PointAttributeServiceImpl.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/PointAttributeServiceImpl.java @@ -38,7 +38,7 @@ import java.util.List; import java.util.Optional; /** - *

PointAttributeService Impl + * PointAttributeService Impl * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/PointInfoServiceImpl.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/PointInfoServiceImpl.java index 093a6393b..1bf7204d4 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/PointInfoServiceImpl.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/PointInfoServiceImpl.java @@ -41,7 +41,7 @@ import java.util.Set; import java.util.stream.Collectors; /** - *

PointInfoService Impl + * PointInfoService Impl * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/PointServiceImpl.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/PointServiceImpl.java index b85ab406d..9dc287eff 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/PointServiceImpl.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/PointServiceImpl.java @@ -39,7 +39,7 @@ import java.util.*; import java.util.stream.Collectors; /** - *

PointService Impl + * PointService Impl * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/ProfileBindServiceImpl.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/ProfileBindServiceImpl.java index 3bbfc8713..966a3ea6f 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/ProfileBindServiceImpl.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/ProfileBindServiceImpl.java @@ -39,7 +39,7 @@ import java.util.Set; import java.util.stream.Collectors; /** - *

ProfileBindService Impl + * ProfileBindService Impl * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/ProfileServiceImpl.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/ProfileServiceImpl.java index c18fe4eda..bd17b1ae4 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/ProfileServiceImpl.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/ProfileServiceImpl.java @@ -45,7 +45,7 @@ import java.util.Set; import java.util.stream.Collectors; /** - *

ProfileService Impl + * ProfileService Impl * * @author pnoker */ diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/StatusServiceImpl.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/StatusServiceImpl.java index 534466002..3d81b7df5 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/StatusServiceImpl.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/service/impl/StatusServiceImpl.java @@ -32,7 +32,7 @@ import java.util.HashMap; import java.util.Map; /** - *

DeviceService Impl + * DeviceService Impl * * @author pnoker */ diff --git a/dc3-common/dc3-base/src/main/java/com/dc3/common/bean/point/PointValue.java b/dc3-common/dc3-base/src/main/java/com/dc3/common/bean/point/PointValue.java index b0ec866a1..5c1560753 100644 --- a/dc3-common/dc3-base/src/main/java/com/dc3/common/bean/point/PointValue.java +++ b/dc3-common/dc3-base/src/main/java/com/dc3/common/bean/point/PointValue.java @@ -30,6 +30,8 @@ import java.util.List; import java.util.concurrent.TimeUnit; /** + * MongoDB 位号数据 + * * @author pnoker */ @Data diff --git a/dc3-common/dc3-base/src/main/java/com/dc3/common/bean/point/TsPointValue.java b/dc3-common/dc3-base/src/main/java/com/dc3/common/bean/point/TsPointValue.java new file mode 100644 index 000000000..9fdd79a26 --- /dev/null +++ b/dc3-common/dc3-base/src/main/java/com/dc3/common/bean/point/TsPointValue.java @@ -0,0 +1,86 @@ +/* + * Copyright 2016-2021 Pnoker. All Rights Reserved. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.dc3.common.bean.point; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; + +/** + * OpenTSDB 位号数据 + * + * @author pnoker + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Accessors(chain = true) +@ToString(callSuper = true) +public class TsPointValue implements Serializable { + private String metric; + private Long timestamp; + private Object value; + private Map tags = new HashMap<>(4); + + public TsPointValue addTag(String tagName, String tagValue) { + this.tags.put(tagName, tagValue); + return this; + } + + public TsPointValue(String metric, Integer value) { + this.metric = metric; + this.timestamp = System.currentTimeMillis(); + this.value = value; + } + + public TsPointValue(String metric, Float value) { + this.metric = metric; + this.timestamp = System.currentTimeMillis(); + this.value = value; + } + + public TsPointValue(String metric, String value) { + this.metric = metric; + this.timestamp = System.currentTimeMillis(); + this.value = value; + } + + public TsPointValue(String metric, Integer value, String tagName, String tagValue) { + this.metric = metric; + this.timestamp = System.currentTimeMillis(); + this.value = value; + addTag(tagName, tagValue); + } + + public TsPointValue(String metric, Float value, String tagName, String tagValue) { + this.metric = metric; + this.timestamp = System.currentTimeMillis(); + this.value = value; + addTag(tagName, tagValue); + } + + public TsPointValue(String metric, String value, String tagName, String tagValue) { + this.metric = metric; + this.timestamp = System.currentTimeMillis(); + this.value = value; + addTag(tagName, tagValue); + } + +} diff --git a/dc3-common/dc3-core/src/main/java/com/dc3/common/config/MybatisPlusConfig.java b/dc3-common/dc3-core/src/main/java/com/dc3/common/config/MybatisPlusConfig.java index c256b860b..b8f42a962 100644 --- a/dc3-common/dc3-core/src/main/java/com/dc3/common/config/MybatisPlusConfig.java +++ b/dc3-common/dc3-core/src/main/java/com/dc3/common/config/MybatisPlusConfig.java @@ -20,7 +20,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; /** - *

MybatisPlus配置 + * MybatisPlus配置 * * @author : pnoker */ diff --git a/dc3-common/dc3-sdk/src/main/java/com/dc3/common/sdk/service/DriverCustomService.java b/dc3-common/dc3-sdk/src/main/java/com/dc3/common/sdk/service/DriverCustomService.java index 5ac2e5a76..aa5cda86d 100644 --- a/dc3-common/dc3-sdk/src/main/java/com/dc3/common/sdk/service/DriverCustomService.java +++ b/dc3-common/dc3-sdk/src/main/java/com/dc3/common/sdk/service/DriverCustomService.java @@ -20,7 +20,7 @@ import com.dc3.common.bean.driver.AttributeInfo; import java.util.Map; /** - *

自定义驱动接口，开发的自定义驱动需要实现 read 和 write 接口，可以参考以提供的驱动模块写法

+ * 自定义驱动接口，开发的自定义驱动需要实现 read 和 write 接口，可以参考以提供的驱动模块写法

* *
    *
  1. {@link DriverCustomService#initial} 初始化操作，需要根据不同的驱动实现该功能
    2. diff --git a/docs/about.md b/docs/about.md index 56a2094a3..810fa8fb7 100644 --- a/docs/about.md +++ b/docs/about.md @@ -1,13 +1,12 @@ ## 🏆 荣誉

    - GiteeStart -
    GiteeGVP

    + ## 💡 贡献 期待能有更多的开发者参与到 `IOT DC3` 的开发中来，我会保证尽快 Review PR 并且及时回复。提交 PR 请确保 @@ -16,7 +15,7 @@ 2. 遵守开发规范 3. 如若需要，请更新相对应的文档 -也非常欢迎开发者能为 `IOT DC3` 提供更多的示例，共同来完善文档(./docs/)。 +也非常欢迎开发者能为 `IOT DC3` 提供更多的示例，共同来完善文档(`./docs/`)。 - 遇到任何问题，请提交 [issue](https://gitee.com/pnoker/iot-dc3/issues) ，标明遇到的问题、开发环境和如何复现，作者每周会进行定期处理； - 提出新想法和设计方案。 @@ -27,4 +26,9 @@ > DC3 开源项目纯个人兴趣爱好，从16年开始利用业余时间开始设计、开发和测试，如果感兴趣参与可以 Email 说明。 -:whale2: 邮箱: pnokers@gmail.com \ No newline at end of file +:whale2: 邮箱 : pnokers@gmail.com + +**:beers:** QQ群: 224029423 + +**:fire::fire::fire: 拒绝一切广告！！！ 拒绝一切广告！！！ 拒绝一切广告！！！**** +