feat(rule-engine): 添加字段分组名称支持 (#700)

* feat(rule-engine): 添加字段分组名称支持

- 在TermColumn中新增groupName字段
- 更新with方法以支持从PropertyMetadata获取分组名称

* refactor(rule-engine):优化场景条件列配置

- 使用 ConfigKey 动态处理分组名称配置

* 优化

* 优化

Author: PengyuDeng

jetlinks-components/common-component/src/main/java/org/jetlinks/community/PropertyMetadataConstants.java

@@ -16,6 +16,7 @@
 package org.jetlinks.community;
 
 import org.jetlinks.community.utils.ConverterUtils;
+import org.jetlinks.core.config.ConfigKey;
 import org.jetlinks.core.message.DeviceMessage;
 import org.jetlinks.core.message.HeaderKey;
 import org.jetlinks.core.metadata.PropertyMetadata;
@@ -110,7 +111,7 @@ interface Metrics {
         String id = "metrics";
 
 
-        static Map<String,Object> metricsToExpands(List<PropertyMetric> metrics) {
+        static Map<String, Object> metricsToExpands(List<PropertyMetric> metrics) {
             return Collections.singletonMap(id, metrics);
         }
 
@@ -126,7 +127,7 @@ static Optional<PropertyMetric> getMetric(PropertyMetadata metadata, String metr
                 .getExpand(id)
                 .map(obj -> {
                     for (PropertyMetric propertyMetric : ConverterUtils.convertToList(obj, PropertyMetric::of)) {
-                        if(Objects.equals(metric, propertyMetric.getId())){
+                        if (Objects.equals(metric, propertyMetric.getId())) {
                             return propertyMetric;
                         }
                     }
@@ -135,4 +136,22 @@ static Optional<PropertyMetric> getMetric(PropertyMetadata metadata, String metr
         }
 
     }
+
+    interface Group {
+        ConfigKey<String> id = ConfigKey.of("groupId", "分组ID", String.class);
+        ConfigKey<String> name = ConfigKey.of("groupName", "分组名称", String.class);
+
+
+        static String getId(PropertyMetadata metadata) {
+            return metadata
+                .getExpand(id)
+                .orElse("");
+        }
+
+        static String getName(PropertyMetadata metadata) {
+            return metadata
+                .getExpand(name)
+                .orElse("");
+        }
+    }
 }

jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/scene/term/TermColumn.java

@@ -189,6 +189,8 @@ public TermColumn with(PropertyMetadata metadata) {
             setFullNameCode(I18nSpec.of(null, localeName));
             setFullName(fullNameCode.resolveI18nMessage());
         }
+        others.put(PropertyMetadataConstants.Group.id.getKey(), PropertyMetadataConstants.Group.getId(metadata));
+        others.put(PropertyMetadataConstants.Group.name.getKey(), PropertyMetadataConstants.Group.getName(metadata));
         return this;
     }