fix(场景联动): 修复场景联动触发条件，当选择为事件时，json参数为enum，没有enum枚举选项问题 (#503)

jetlinks · May 6, 2024 · ff0f7dd · ff0f7dd
1 parent 884d7ea
commit ff0f7dd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/...ngine-manager/src/main/java/org/jetlinks/community/rule/engine/scene/DeviceOperation.java b/...ngine-manager/src/main/java/org/jetlinks/community/rule/engine/scene/DeviceOperation.java
@@ -205,6 +205,8 @@ private List<TermColumn> createTermColumn(String prefix, PropertyMetadata proper
                         TermColumn term = createTermColumn(_prefix, prop, false, valueTypes).get(0);
                         column.setColumn(term.getColumn());
                         column.setName(term.getName());
+                        column.setOptions(term.getOptions());
+                        column.withOthers(term.getOthers());
                     } else {
                         column.setChildren(createTermColumn(_prefix, prop, last, valueTypes));
                     }

diff --git a/...ngine-manager/src/main/java/org/jetlinks/community/rule/engine/scene/term/TermColumn.java b/...ngine-manager/src/main/java/org/jetlinks/community/rule/engine/scene/term/TermColumn.java
@@ -56,6 +56,9 @@ public class TermColumn {
     @Schema(description = "可选内容")
     private List<PropertyMetric> options;
 
+    @Schema(description = "其它配置")
+    private Map<String, Object> others;
+
     @Schema(description = "子列,在类型为object时有值")
     private List<TermColumn> children;
 
@@ -235,4 +238,15 @@ public void refactorFullName(String parentName) {
         }
     }
 
+    public TermColumn withOthers(Map<String, Object> options) {
+        if (options != null) {
+            safeOptions().putAll(options);
+        }
+        return this;
+    }
+
+    public synchronized Map<String, Object> safeOptions() {
+        return others == null ? others = new HashMap<>() : others;
+    }
+
 }