diff --git a/collector-core/src/main/java/org/jetlinks/collector/AbstractDataCollectorProvider.java b/collector-core/src/main/java/org/jetlinks/collector/AbstractDataCollectorProvider.java index c7d4f9c..a2dffca 100644 --- a/collector-core/src/main/java/org/jetlinks/collector/AbstractDataCollectorProvider.java +++ b/collector-core/src/main/java/org/jetlinks/collector/AbstractDataCollectorProvider.java @@ -2,12 +2,9 @@ import io.netty.buffer.ByteBufAllocator; import lombok.AllArgsConstructor; -import org.jetlinks.collector.command.GetEditorResourceCommand; +import org.jetlinks.collector.command.*; import org.jetlinks.collector.metadata.MetadataResolver; import org.jetlinks.core.annotation.command.CommandHandler; -import org.jetlinks.collector.command.GetChannelConfigMetadataCommand; -import org.jetlinks.collector.command.GetCollectorConfigMetadataCommand; -import org.jetlinks.collector.command.GetPointConfigMetadataCommand; import org.jetlinks.core.command.CommandMetadataResolver; import org.jetlinks.core.metadata.PropertyMetadata; import org.jetlinks.supports.command.AnnotationCommandSupport; diff --git a/collector-core/src/main/java/org/jetlinks/collector/CollectorConstants.java b/collector-core/src/main/java/org/jetlinks/collector/CollectorConstants.java index 3af6deb..65e1562 100644 --- a/collector-core/src/main/java/org/jetlinks/collector/CollectorConstants.java +++ b/collector-core/src/main/java/org/jetlinks/collector/CollectorConstants.java @@ -27,6 +27,8 @@ interface Headers { HeaderKey pointId = HeaderKey.of("pointId", null, String.class); HeaderKey reason = HeaderKey.of("reason", null, String.class); + HeaderKey channelId = HeaderKey.of("channelId", null, String.class); + HeaderKey collectorId = HeaderKey.of("collectorId", null, String.class); } diff --git a/collector-core/src/main/java/org/jetlinks/collector/PointMetadata.java b/collector-core/src/main/java/org/jetlinks/collector/PointMetadata.java index 4ab33ff..09dcb28 100644 --- a/collector-core/src/main/java/org/jetlinks/collector/PointMetadata.java +++ b/collector-core/src/main/java/org/jetlinks/collector/PointMetadata.java @@ -5,10 +5,10 @@ import lombok.Getter; import lombok.Setter; import org.jetlinks.collector.address.PointAddress; -import org.jetlinks.core.codec.Codec; import org.jetlinks.core.codec.layout.ByteLayout; import org.jetlinks.core.metadata.DataType; +import java.util.List; import java.util.Map; @Getter @@ -18,6 +18,11 @@ public class PointMetadata { @Schema(title = "点位地址标识") private PointAddress address; + @Schema(title = "访问方式") + private AccessMode[] accessModes = new AccessMode[]{ + AccessMode.read, AccessMode.write, AccessMode.subscribe + }; + /** * 点位是否自动编解码,为true时,表示点位直接处理java类型,平台无需进行{@link Codec#encode(Object, ByteBuf)}. * @@ -26,6 +31,13 @@ public class PointMetadata { @Schema(title = "是否自动编解码") private boolean autoCodec; + + /** + * 点位使用平台的解码时 + */ + @Schema(title = "当前支持的平台解码") + private List supportCodecs; + /** * 当{@link PointMetadata#isAutoCodec()}为false时,此字段表示点位数据的字节长度,-1表示长度不确定. * @@ -46,4 +58,6 @@ public class PointMetadata { @Schema(title = "自定义元数据信息") private Map metadata; + + } diff --git a/collector-core/src/main/java/org/jetlinks/collector/command/GetSupportAccessModesCommand.java b/collector-core/src/main/java/org/jetlinks/collector/command/GetSupportAccessModesCommand.java new file mode 100644 index 0000000..33e9f89 --- /dev/null +++ b/collector-core/src/main/java/org/jetlinks/collector/command/GetSupportAccessModesCommand.java @@ -0,0 +1,13 @@ +package org.jetlinks.collector.command; + +import org.jetlinks.collector.AccessMode; +import org.jetlinks.core.command.AbstractCommand; +import reactor.core.publisher.Mono; + +import java.util.List; + +/** + * 获取支持的访问方式 + */ +public class GetSupportAccessModesCommand extends AbstractCommand>, GetSupportAccessModesCommand> { +}