feat: add import value range validate for number and date

sondertara · Nov 29, 2019 · a9b67a3 · a9b67a3
1 parent b36e9da
commit a9b67a3
Show file tree

Hide file tree

Showing 12 changed files with 315 additions and 45 deletions.
diff --git a/common-tara/pom.xml b/common-tara/pom.xml
@@ -9,12 +9,12 @@
     <parent>
         <groupId>com.sondertara</groupId>
         <artifactId>tara</artifactId>
-        <version>0.0.3.200</version>
+        <version>0.0.3.201</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>com.sondertara</groupId>
     <artifactId>common-tara</artifactId>
-    <version>0.0.3.200</version>
+    <version>0.0.3.201</version>
 
     <name>common-tara</name>
     <description>common utils.</description>

diff --git a/common-tara/src/main/java/com/sondertara/common/util/DateUtil.java b/common-tara/src/main/java/com/sondertara/common/util/DateUtil.java
@@ -40,7 +40,7 @@ public static String format(String pattern, Date value) throws ExecutionExceptio
      * 判断两个时间内的时间间隔（毫秒）
      *
      * @param startDate 开始时间
-     * @param endDate 终止时间
+     * @param endDate   终止时间
      */
     public static long afterTime(Date startDate, Date endDate) {
         if (startDate != null & endDate != null) {
@@ -51,14 +51,16 @@ public static long afterTime(Date startDate, Date endDate) {
     }
 
 
-
     /**
      * 尝试转换日期
      *
      * @param dateString 日期字符串
      * @return 转换后的date，尝试转换失败时返回null
      */
     public static Date parse(String dateString) throws ExecutionException {
+        if (StringUtil.isBlank(dateString)) {
+            return null;
+        }
         Date date = null;
         if (date == null) {
 
@@ -168,7 +170,6 @@ public static Date addMinute(Date date, int n) {
     }
 
 
-
     //日期转为字符串，格式为月日
     public static String dateToMD(Date d) {
         if (d == null) {
@@ -191,5 +192,4 @@ public static String dateToStringYMM(Date d) {
         int year = calendar.get(Calendar.YEAR);
         return year + "年" + dateToMD(d);
     }
-
 }
diff --git a/excel-tara/pom.xml b/excel-tara/pom.xml
@@ -7,12 +7,12 @@
     <parent>
         <groupId>com.sondertara</groupId>
         <artifactId>tara</artifactId>
-        <version>0.0.3.200</version>
+        <version>0.0.3.201</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>com.sondertara</groupId>
     <artifactId>excel-tara</artifactId>
-    <version>0.0.3.200</version>
+    <version>0.0.3.201</version>
     <name>excel-tara</name>
     <description>high performance excel kit.</description>
     <url>https://github.com/sondertara/tara</url>
@@ -118,7 +118,7 @@
         <dependency>
             <groupId>com.sondertara</groupId>
             <artifactId>common-tara</artifactId>
-            <version>0.0.3.200</version>
+            <version>0.0.3.201</version>
         </dependency>
 
     </dependencies>

diff --git a/excel-tara/src/main/java/com/sondertara/excel/annotation/ImportField.java b/excel-tara/src/main/java/com/sondertara/excel/annotation/ImportField.java
@@ -1,6 +1,8 @@
 
 package com.sondertara.excel.annotation;
 
+import com.sondertara.excel.enums.FieldRangeType;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -59,4 +61,18 @@
      * 最大值,需要配合required一起使用
      */
     double max() default Double.MAX_VALUE;
+
+    /**
+     * range
+     *
+     * @return the field value rang
+     */
+    String[] range() default {};
+
+    /**
+     * the range type
+     *
+     * @return range type enum
+     */
+    FieldRangeType rangeType() default FieldRangeType.RANGE_CLOSE;
 }
diff --git a/excel-tara/src/main/java/com/sondertara/excel/entity/ExcelPropertyEntity.java b/excel-tara/src/main/java/com/sondertara/excel/entity/ExcelPropertyEntity.java
@@ -1,6 +1,7 @@
 
 package com.sondertara.excel.entity;
 
+import com.sondertara.excel.enums.FieldRangeType;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
@@ -57,11 +58,15 @@ public class ExcelPropertyEntity {
      */
     private Boolean required;
     /**
-     * 最小值
+     * range
+     * <p>
+     * number  eg:{"2",""}(2, ),{"2","5"},{"","5"}
+     * date eg:{"2019-08-01 12:00:00",""},{"2019-08-01 12:00:00","2019-10-01 12:00:00"}
+     * </p>
      */
-    private Double min;
+    private String[] range;
     /**
-     * 最大值
+     * range type {@link FieldRangeType} ,default is {@link FieldRangeType#RANGE_CLOSE}
      */
-    private Double max;
+    private FieldRangeType rangeType;
 }
diff --git a/excel-tara/src/main/java/com/sondertara/excel/enums/FieldRangeType.java b/excel-tara/src/main/java/com/sondertara/excel/enums/FieldRangeType.java
@@ -0,0 +1,27 @@
+package com.sondertara.excel.enums;
+
+public enum FieldRangeType {
+    /**
+     * range[]
+     */
+    RANGE_CLOSE(1),
+    /**
+     * range()
+     */
+    RANGE_OPEN(2),
+    /**
+     * range(]
+     */
+    RANGE_LEFT_OPEN(3),
+    /**
+     * range[)
+     */
+    RANGE_RIGHT_OPEN(4),
+    ;
+
+    private Integer type;
+
+    FieldRangeType(Integer type) {
+        this.type = type;
+    }
+}
diff --git a/excel-tara/src/main/java/com/sondertara/excel/factory/ExcelMappingFactory.java b/excel-tara/src/main/java/com/sondertara/excel/factory/ExcelMappingFactory.java
@@ -41,8 +41,8 @@ public static ExcelEntity loadImportExcelClass(Class clazz) {
                         .regexMessage(importField.regexMessage().trim())
                         .scale(importField.scale())
                         .roundingMode(importField.roundingMode())
-                        .min(importField.min())
-                        .max(importField.max())
+                        .range(importField.range())
+                        .rangeType(importField.rangeType())
                         .build();
                 propertyList.add(excelPropertyEntity);
             }