Skip to content

feat(数采): 增加获取协议支持的访问方式命令 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
liu4410 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat(数采): 增加获取协议支持的访问方式命令 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90b2392
feat(数采): 增加获取协议支持的访问方式命令
liu4410 Jan 8, 2026
c03ea9b
feat(数采): 优化获取访问方式
liu4410 Jan 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions collector-core/src/main/java/org/jetlinks/collector/AbstractDataCollectorProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions collector-core/src/main/java/org/jetlinks/collector/CollectorConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ interface Headers {

HeaderKey<String> pointId = HeaderKey.of("pointId", null, String.class);
HeaderKey<String> reason = HeaderKey.of("reason", null, String.class);
HeaderKey<String> channelId = HeaderKey.of("channelId", null, String.class);
HeaderKey<String> collectorId = HeaderKey.of("collectorId", null, String.class);

}

Expand Down
16 changes: 15 additions & 1 deletion collector-core/src/main/java/org/jetlinks/collector/PointMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)}.
*
Expand All @@ -26,6 +31,13 @@ public class PointMetadata {
@Schema(title = "是否自动编解码")
private boolean autoCodec;


/**
* 点位使用平台的解码时
*/
@Schema(title = "当前支持的平台解码")
private List<String> supportCodecs;
Copy link
Member

@zhou-hao zhou-hao Jan 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

不用设置这个吧? 采集器应该不关心平台支持哪些编解码. 根据字节长度来由平台决定更合适? 看最新的org.jetlinks.core.codec.Codec.isByteLengthSupported


/**
* 当{@link PointMetadata#isAutoCodec()}为false时,此字段表示点位数据的字节长度,-1表示长度不确定.
*
Expand All @@ -46,4 +58,6 @@ public class PointMetadata {

@Schema(title = "自定义元数据信息")
private Map<String, Object> metadata;


}
13 changes: 13 additions & 0 deletions ...ector-core/src/main/java/org/jetlinks/collector/command/GetSupportAccessModesCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<Mono<List<AccessMode>>, GetSupportAccessModesCommand> {
}