mqtt协议包修改

src/main/java/org/jetlinks/protocol/official/TopicMessageCodec.java

@@ -13,6 +13,8 @@ import org.jetlinks.core.message.state.DeviceStateCheckMessage;
 import org.jetlinks.core.message.state.DeviceStateCheckMessageReply;
 import org.jetlinks.core.message.state.DeviceStateCheckMessageReply;
 import org.jetlinks.core.route.MqttRoute;
 import org.jetlinks.core.route.MqttRoute;
 import org.jetlinks.core.utils.TopicUtils;
 import org.jetlinks.core.utils.TopicUtils;
+import org.jetlinks.protocol.official.entity.CustomReadMessage;
+import org.jetlinks.protocol.official.entity.CustomWriteMessage;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.Mono;
@@ -35,7 +37,7 @@ public enum TopicMessageCodec {
                            .example("{\"properties\":{\"属性ID\":\"属性值\"}}")),
                            .example("{\"properties\":{\"属性ID\":\"属性值\"}}")),
     //读取属性
     //读取属性
     readProperty("/*/properties/read",
     readProperty("/*/properties/read",
-                 ReadPropertyMessage.class,
+            CustomReadMessage.class,
                  route -> route
                  route -> route
                          .upstream(false)
                          .upstream(false)
                          .downstream(true)
                          .downstream(true)
@@ -53,7 +55,7 @@ public enum TopicMessageCodec {
                               .example("{\"messageId\":\"消息ID,与读取指令中的ID一致.\",\"properties\":{\"属性ID\":\"属性值\"}}")),
                               .example("{\"messageId\":\"消息ID,与读取指令中的ID一致.\",\"properties\":{\"属性ID\":\"属性值\"}}")),
     //修改属性
     //修改属性
     writeProperty("/*/properties/write",
     writeProperty("/*/properties/write",
-                  WritePropertyMessage.class,
+            CustomWriteMessage.class,
                   route -> route
                   route -> route
                           .upstream(false)
                           .upstream(false)
                           .downstream(true)
                           .downstream(true)

src/main/java/org/jetlinks/protocol/official/entity/CustomMessage.java

+package org.jetlinks.protocol.official.entity;
+
+import lombok.Data;
+
+@Data
+public class CustomMessage {
+
+    private Header header;
+    private PayLoad payload;
+    private boolean success;
+    private String messageId;
+    private Long timestamp;
+
+
+
+    @Data
+    public class Header {
+        private String version;
+        private String uuid;
+        private Long timestamp;
+    }
+
+    @Data
+    public class PayLoad {
+        private String deviceId;
+        private String properties;
+    }
+
+    @Data
+    public class DeviceAttrInfo {
+        private String key;
+        private String value;
+    }
+
+}

src/main/java/org/jetlinks/protocol/official/entity/CustomReadMessage.java

+package org.jetlinks.protocol.official.entity;
+
+import lombok.Data;
+import org.jetlinks.core.message.property.ReadPropertyMessage;
+
+import java.util.List;
+
+@Data
+public class CustomReadMessage extends ReadPropertyMessage {
+
+    private Header header;
+    private PayLoad payload;
+    private String messageId;
+    private long timestamp;
+
+    @Data
+    public static class Header {
+        private String version;
+        private String uuid;
+        private Long timestamp;
+    }
+
+    @Data
+    public static class PayLoad {
+        private String deviceId;
+        private List<String> properties;
+    }
+}

src/main/java/org/jetlinks/protocol/official/entity/CustomWriteMessage.java

+package org.jetlinks.protocol.official.entity;
+
+import lombok.Data;
+import org.jetlinks.core.message.property.ReadPropertyMessage;
+
+import java.util.Map;
+
+@Data
+public class CustomWriteMessage extends ReadPropertyMessage {
+
+    private Header header;
+    private PayLoad payload;
+    private String messageId;
+    private long timestamp;
+
+    @Data
+    public static class Header {
+        private String version;
+        private String uuid;
+        private Long timestamp;
+    }
+
+    @Data
+    public static class PayLoad {
+        private String deviceId;
+        private Map<String, Object> properties;
+    }
+}