Merge pull request #6 from kyouji/master

fix(插件): 修复默认配置每次重复添加的问题
jetlinks · Jun 30, 2023 · 94e7309 · 94e7309
2 parents 5768ef2 + b869b61
commit 94e7309
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/plugin-examples/hc-net-sdk/src/main/java/org/jetlinks/plugin/example/sdk/PluginProduct.java b/plugin-examples/hc-net-sdk/src/main/java/org/jetlinks/plugin/example/sdk/PluginProduct.java
@@ -1,5 +1,6 @@
 package org.jetlinks.plugin.example.sdk;
 
+import org.jetlinks.core.config.ConfigKey;
 import org.jetlinks.core.device.DeviceOperator;
 import org.jetlinks.core.metadata.ConfigMetadata;
 import org.jetlinks.plugin.example.sdk.hc.NetSDKDemo;
@@ -15,6 +16,10 @@
  */
 public interface PluginProduct {
 
+    String USERNAME    = "user";
+    String PASSWORD    = "psw";
+    ConfigKey<Boolean> required = ConfigKey.of("required", "是否必填", Boolean.TYPE);
+
     String getId();
 
     String getGroup();

diff --git a/...n-examples/hc-net-sdk/src/main/java/org/jetlinks/plugin/example/sdk/PluginProductPTZ.java b/...n-examples/hc-net-sdk/src/main/java/org/jetlinks/plugin/example/sdk/PluginProductPTZ.java
@@ -26,8 +26,6 @@
 public class PluginProductPTZ implements PluginProduct {
     private static String METADATA;
 
-    private static final String USERNAME    = "user";
-    private static final String PASSWORD    = "psw";
     private static final String FUNCTION_ID = "regular_inspection";
 
     static {

diff --git a/...examples/hc-net-sdk/src/main/java/org/jetlinks/plugin/example/sdk/PluginProductRS485.java b/...examples/hc-net-sdk/src/main/java/org/jetlinks/plugin/example/sdk/PluginProductRS485.java
@@ -7,6 +7,7 @@
 import org.jetlinks.core.metadata.ConfigMetadata;
 import org.jetlinks.core.metadata.DefaultConfigMetadata;
 import org.jetlinks.core.metadata.DeviceConfigScope;
+import org.jetlinks.core.metadata.types.PasswordType;
 import org.jetlinks.core.metadata.types.StringType;
 import org.jetlinks.plugin.example.sdk.hc.HCNetSDK;
 import org.jetlinks.plugin.example.sdk.hc.NetSDKDemo;
@@ -31,13 +32,13 @@
 public class PluginProductRS485 implements PluginProduct {
     private static String METADATA;
 
-    private static final String USERNAME    = "user";
-    private static final String PASSWORD    = "psw";
     private static final String DW_CHANNEL  = "dwChannel";
     private static final String FUNCTION_ID = "monthly_record";
 
     private static final ConfigMetadata deviceConfigMetadata = new DefaultConfigMetadata("设备配置", "设备接入配置")
-            .add(DW_CHANNEL, "通道号", new StringType(), DeviceConfigScope.device);
+            .add(DW_CHANNEL, "通道号", new StringType(), DeviceConfigScope.device)
+                    .add(USERNAME, "用户名", new StringType().expand(required.value(true)), DeviceConfigScope.device)
+                    .add(PASSWORD, "密码", new PasswordType().expand(required.value(true)), DeviceConfigScope.device);
     private static final ConfigMetadata productConfigMetadata = new DefaultConfigMetadata("产品配置", "设备接入配置")
             .add(DW_CHANNEL, "通道号", new StringType(), DeviceConfigScope.product);
 

diff --git a/...in-examples/hc-net-sdk/src/main/java/org/jetlinks/plugin/example/sdk/SdkDevicePlugin.java b/...in-examples/hc-net-sdk/src/main/java/org/jetlinks/plugin/example/sdk/SdkDevicePlugin.java
@@ -36,6 +36,8 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static org.jetlinks.plugin.example.sdk.PluginProduct.*;
+
 /**
  * 输入描述.
  *
@@ -46,11 +48,8 @@ public class SdkDevicePlugin extends DeviceGatewayPlugin {
 
     static final String IP       = "ip";
     static final String PORT     = "port";
-    static final String USERNAME = "user";
-    static final String PASSWORD = "psw";
     static final String USER_ID  = "user_id";
 
-    public static final ConfigKey<Boolean> required = ConfigKey.of("required", "是否必填", Boolean.TYPE);
     private static final NetSDKDemo sdk = new NetSDKDemo();
     public static final Map<String, PluginProduct> pluginProducts = new HashMap<>();
 
@@ -73,9 +72,6 @@ public Mono<ConfigMetadata> getDeviceConfigMetadata(String productId) {
         return Mono
                 .justOrEmpty(pluginProducts.get(productId))
                 .mapNotNull(PluginProduct::getDeviceConfigMetadata)
-                .map(configMetadata -> ((DefaultConfigMetadata) configMetadata)
-                        .add(USERNAME, "用户名", new StringType().expand(required.value(true)), DeviceConfigScope.device)
-                        .add(PASSWORD, "密码", new PasswordType().expand(required.value(true)), DeviceConfigScope.device))
                 .defaultIfEmpty(new DefaultConfigMetadata()
                         .add(USERNAME, "用户名", new StringType().expand(required.value(true)), DeviceConfigScope.device)
                         .add(PASSWORD, "密码", new PasswordType().expand(required.value(true)), DeviceConfigScope.device))