fix: 修正枚举类型多选时的校验及格式化逻辑 (#26)

* fix: 修正枚举类型多选时的校验及格式化逻辑

* fix: 优化对应类型格式化

src/main/java/org/jetlinks/core/metadata/types/EnumType.java

@@ -10,6 +10,7 @@
 import org.jetlinks.core.metadata.ValidateResult;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Getter
 @Setter
@@ -45,17 +46,59 @@ public ValidateResult validate(Object value) {
         if (elements == null) {
             return ValidateResult.fail("值[" + value + "]不在枚举中");
         }
+        Object _value;
+        if (multi) {
+            _value = convertMulti(value);
+        } else {
+            _value = convert(value);
+        }
+        if (_value == null) {
+            return ValidateResult.fail("值[" + value + "]不在枚举中");
+        }
+        return ValidateResult.success(_value);
+    }
+
+    private Object convert(Object value) {
         for (Element ele : elements) {
             if (match(value, ele)) {
                 //类型完全相同,则使用原始值作为对象.
                 Object actValue = String.valueOf(value).equals(ele.value) ? value : ele.value;
                 if (valueType instanceof Converter) {
                     actValue = ((Converter<?>) valueType).convert(actValue);
                 }
-                return ValidateResult.success(actValue);
+                return actValue;
             }
         }
-        return ValidateResult.fail("值[" + value + "]不在枚举中");
+        return null;
+    }
+
+    public Object convertMulti(Object value) {
+        List<Object> _value = new ArrayList<>();
+        List<Object> objects = toArray(value);
+        if (!objects.isEmpty()) {
+            for (Object object : objects) {
+                Object _v = convert(object);
+                if (_v != null) {
+                    _value.add(_v);
+                }
+            }
+        }
+        if (_value.isEmpty()) {
+            return null;
+        }
+        return _value;
+    }
+
+    private static List<Object> toArray(Object value) {
+        List<Object> values = new ArrayList<>();
+        if (value instanceof Collection) {
+            values = new ArrayList<>(((Collection<?>) value));
+        }
+        if (value instanceof String) {
+            String _string = (String) value;
+            values = Arrays.asList((_string).split(","));
+        }
+        return values;
     }
 
     private boolean match(Object value, Element ele) {
@@ -71,17 +114,30 @@ private boolean match(Object value, Element ele) {
     }
 
     @Override
-    public String format(Object value) {
-        String stringVal = String.valueOf(value);
+    public Object format(Object value) {
         if (elements == null) {
-            return stringVal;
+            return String.valueOf(value);
         }
+        if (multi) {
+            List<String> _format = toArray(value)
+                    .stream()
+                    .map(this::format0)
+                    .collect(Collectors.toList());
+            if (value instanceof String) {
+                return String.join(",", _format);
+            }
+            return _format;
+        }
+        return format0(value);
+    }
+
+    private String format0(Object value) {
         return elements
             .stream()
             .filter(ele -> String.valueOf(value).equals(ele.value))
             .findFirst()
             .map(Element::getText)
-            .orElse(stringVal);
+            .orElse(String.valueOf(value));
     }
 
     public EnumType addElement(Element element) {

src/test/java/org/jetlinks/core/metadata/types/EnumTypeTest.java

@@ -1,10 +1,9 @@
 package org.jetlinks.core.metadata.types;
 
+import com.google.common.collect.Lists;
 import org.junit.Assert;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 public class EnumTypeTest {
 
     @Test
@@ -24,4 +23,23 @@ public void test(){
 
     }
 
+    @Test
+    public void testMulti(){
+        EnumType type=new EnumType();
+        type.setMulti(true);
+
+        type.addElement(EnumType.Element.of("1","男"));
+        type.addElement(EnumType.Element.of("2","女"));
+
+        Assert.assertTrue(type.validate("1,2").isSuccess());
+        Assert.assertEquals(type.format("1,2"), "男,女");
+        Assert.assertEquals(type.format(Lists.newArrayList("1","2")), Lists.newArrayList("男","女"));
+
+        Assert.assertFalse(type.validate("3").isSuccess());
+        Assert.assertTrue(type.validate("1,3").isSuccess());
+        Assert.assertFalse(type.validate("3,4").isSuccess());
+        Assert.assertEquals(type.format("1,3"), "男,3");
+        Assert.assertEquals(type.format(Lists.newArrayList("1","3")), Lists.newArrayList("男","3"));
+    }
+
 }