From e034489976ae5bc1a914c70b6295dc24b6d8d102 Mon Sep 17 00:00:00 2001
From: zhouhao <zh.sqy@qq.com>
Date: Fri, 24 Feb 2023 13:40:37 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B0=E9=87=87=E7=BD=91=E5=85=B3):=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E9=87=87=E7=BD=91=E5=85=B3=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3topic=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 .../protocol/official/TopicMessageCodec.java  | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 273464f..1945cf4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -204,7 +204,7 @@
         <dependency>
             <groupId>org.jetlinks</groupId>
             <artifactId>jetlinks-supports</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/src/main/java/org/jetlinks/protocol/official/TopicMessageCodec.java b/src/main/java/org/jetlinks/protocol/official/TopicMessageCodec.java
index ddbae54..806960f 100644
--- a/src/main/java/org/jetlinks/protocol/official/TopicMessageCodec.java
+++ b/src/main/java/org/jetlinks/protocol/official/TopicMessageCodec.java
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.SneakyThrows;
 import org.hswebframework.web.bean.FastBeanCopier;
 import org.jetlinks.core.message.*;
+import org.jetlinks.core.message.collector.*;
 import org.jetlinks.core.message.event.EventMessage;
 import org.jetlinks.core.message.firmware.*;
 import org.jetlinks.core.message.function.FunctionInvokeMessage;
@@ -278,6 +279,35 @@ public enum TopicMessageCodec {
     //状态检查
     stateCheck("/*/state-check", DeviceStateCheckMessage.class),
     stateCheckReply("/*/state-check/reply", DeviceStateCheckMessageReply.class),
+
+    //数采相关
+    collector("/*/collector/report", ReportCollectorDataMessage.class
+            , builder -> builder
+            .upstream(true)
+            .group("数采网关")
+            .description("上报数采点位数据")),
+    collectorRead("/*/collector/read",
+                  ReadCollectorDataMessage.class,
+                  builder -> builder
+                          .downstream(true)
+                          .group("数采网关")
+                          .description("平台读取点位数据")),
+    collectorReadReply("/*/collector/read/reply",
+                       ReadCollectorDataMessageReply.class,
+                       builder -> builder
+                               .upstream(true)
+                               .group("数采网关")
+                               .description("平台读取点位数据结果回复")),
+    collectorWrite("/*/collector/write", WriteCollectorDataMessage.class,
+                   builder -> builder
+                           .downstream(true)
+                           .group("数采网关")
+                           .description("平台修改点位数据")),
+    collectorWriteReply("/*/collector/write/reply", WriteCollectorDataMessageReply.class,
+                        builder -> builder
+                                .upstream(true)
+                                .group("数采网关")
+                                .description("平台修改点位数据结果回复")),
     ;
 
     TopicMessageCodec(String topic,