瀏覽代碼

优化类型转换

zhou-hao 5 年之前
父節點
當前提交
f8246f25d4

+ 4 - 0
jetlinks-components/dashboard-component/src/main/java/org/jetlinks/community/dashboard/MeasurementParameter.java

@@ -21,4 +21,8 @@ public class MeasurementParameter implements ValueObject {
         return Optional.ofNullable(params).map(p -> p.get(name));
     }
 
+    @Override
+    public Map<String, Object> getAll() {
+        return params;
+    }
 }

+ 2 - 2
jetlinks-components/network-component/tcp-component/src/main/java/org/jetlinks/community/network/tcp/server/TcpServerProvider.java

@@ -53,9 +53,9 @@ public class TcpServerProvider implements NetworkProvider<TcpServerProperties> {
     private void initTcpServer(VertxTcpServer tcpServer, TcpServerProperties properties) {
         NetServer netServer = vertx.createNetServer(properties.getOptions());
 
-        payloadParserBuilder.build(properties.getParserType(), Values.of(properties.getParserConfiguration()));
+        payloadParserBuilder.build(properties.getParserType(), properties);
 
-        tcpServer.setParserSupplier(() -> payloadParserBuilder.build(properties.getParserType(), Values.of(properties.getParserConfiguration())));
+        tcpServer.setParserSupplier(() -> payloadParserBuilder.build(properties.getParserType(),properties));
         tcpServer.setServer(netServer);
         tcpServer.setKeepAliveTimeout(properties.getLong("keepAliveTimeout").orElse(Duration.ofMinutes(10).toMillis()));
         netServer.listen(properties.createSocketAddress(), result -> {

+ 2 - 1
jetlinks-components/network-component/tcp-component/src/test/java/org/jetlinks/community/network/tcp/parser/strateies/ScriptPayloadParserBuilderTest.java

@@ -1,6 +1,7 @@
 package org.jetlinks.community.network.tcp.parser.strateies;
 
 import io.vertx.core.buffer.Buffer;
+import org.jetlinks.community.ValueObject;
 import org.jetlinks.community.network.tcp.parser.PayloadParser;
 import org.jetlinks.community.network.utils.BytesUtils;
 import org.jetlinks.core.Values;
@@ -31,7 +32,7 @@ class ScriptPayloadParserBuilderTest {
                 "                   .complete();\n" +
                 "        });");
         config.put("lang", "javascript");
-        PayloadParser parser = builder.build(Values.of(config));
+        PayloadParser parser = builder.build(ValueObject.of(config));
 
         parser.handlePayload()
                 .doOnSubscribe(sb -> {