导入增加时间格式判断

@@ -26,4 +26,9 @@ public @interface ExcelCheck {
      * 长度校验,只对String生效
      */
     int length() default -1;
+
+    /**
+     * 时间格式校验
+     */
+    String dateFormatValid() default "";
 }
\ No newline at end of file

@@ -20,7 +20,7 @@ import java.util.Date;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class CaseExcelData  implements Serializable {
+public class CaseExcelData implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ExcelCheck(canEmpty = false, canRepeat = false)
@@ -47,13 +47,13 @@ public class CaseExcelData  implements Serializable {
     @ColumnWidth(25)
     private String caseDetail;
 
-    @ExcelCheck(canEmpty = false)
+    @ExcelCheck(canEmpty = false, dateFormatValid = "yyyy-MM-dd HH:mm:ss")
     @ExcelProperty(value = "接警时间", index = 4)
     @ContentStyle(dataFormat = 49)
     @ColumnWidth(25)
     private Date alarmDate;
 
-    @ExcelCheck(canEmpty = false)
+    @ExcelCheck(canEmpty = false, dateFormatValid = "yyyy-MM-dd HH:mm:ss")
     @ExcelProperty(value = "立案时间", index = 5)
     @ContentStyle(dataFormat = 49)
     @ColumnWidth(25)

@@ -35,7 +35,7 @@ public class WarningInstanceExcelData implements Serializable {
     @ColumnWidth(25)
     private Date alarmDate;
 
-    @ExcelCheck(canEmpty = false)
+    @ExcelCheck(canEmpty = false, dateFormatValid = "yyyy-MM-dd HH:mm:ss")
     @ExcelProperty(value = "报警电话", index = 2)
     @ContentStyle(dataFormat = 49)
     @ColumnWidth(25)

@@ -22,6 +22,8 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.lang.reflect.Field;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
@@ -29,7 +31,7 @@ import java.util.stream.Stream;
 
 @Slf4j
 public class CaseExcelListener extends AnalysisEventListener<CaseExcelData>
-        implements ReadListener<CaseExcelData>{
+        implements ReadListener<CaseExcelData> {
 
     private List<CaseExcelData> list = Collections.synchronizedList(new ArrayList<>());
 
@@ -106,10 +108,13 @@ public class CaseExcelListener extends AnalysisEventListener<CaseExcelData>
                 try {
                     // 校验是否空值
                     checkEmpty(data, rowIndex);
+                    // 校验时间类型
+                    checkDate(data, rowIndex);
                     // 校验长度
                     checkLength(data, rowIndex);
                 } catch (Exception e) {
                     log.error("校验excel信息失败,", e);
+                    addError(0, "导入异常");
                 }
             }
 
@@ -182,6 +187,35 @@ public class CaseExcelListener extends AnalysisEventListener<CaseExcelData>
         }));
     }
 
+    /**
+     * 检验时间格式
+     *
+     * @param data     数据
+     * @param rowIndex 行索引
+     */
+    public void checkDate(CaseExcelData data, Integer rowIndex) {
+        fieldMap.forEach(((field, annotation) -> {
+            ExcelCheck excelCheck = annotation.getExcelCheck();
+            try {
+                Object value = field.get(data);
+                //校验非空
+                if (StringUtils.isNotBlank(excelCheck.dateFormatValid())) {
+                    try {
+                        SimpleDateFormat format = new SimpleDateFormat(excelCheck.dateFormatValid());
+                        format.setLenient(false);
+                        format.parse(format.format(value.toString()));
+
+                    } catch (Exception e) {
+                        addError(rowIndex + 1, annotation.getHeadName() + "时间格式错误!");
+                    }
+                }
+            } catch (IllegalAccessException e) {
+                log.error("校验excel信息失败,", e);
+                throw new RuntimeException(e);
+            }
+        }));
+    }
+
 
     /**
      * 校验长度

@@ -23,6 +23,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.lang.reflect.Field;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
@@ -108,6 +109,8 @@ public class WarningInstanceExcelListener extends AnalysisEventListener<WarningI
                 try {
                     // 校验是否空值
                     checkEmpty(data, rowIndex);
+                    // 校验时间类型
+                    checkDate(data, rowIndex);
                     // 校验长度
                     checkLength(data, rowIndex);
                 } catch (Exception e) {
@@ -189,6 +192,36 @@ public class WarningInstanceExcelListener extends AnalysisEventListener<WarningI
 
 
     /**
+     * 检验时间格式
+     *
+     * @param data     数据
+     * @param rowIndex 行索引
+     */
+    public void checkDate(WarningInstanceExcelData data, Integer rowIndex) {
+        fieldMap.forEach(((field, annotation) -> {
+            ExcelCheck excelCheck = annotation.getExcelCheck();
+            try {
+                Object value = field.get(data);
+                //校验非空
+                if (StringUtils.isNotBlank(excelCheck.dateFormatValid())) {
+                    try {
+                        SimpleDateFormat format = new SimpleDateFormat(excelCheck.dateFormatValid());
+                        format.setLenient(false);
+                        format.parse(format.format(value.toString()));
+
+                    } catch (Exception e) {
+                        addError(rowIndex + 1, annotation.getHeadName() + "时间格式错误!");
+                    }
+                }
+            } catch (IllegalAccessException e) {
+                log.error("校验excel信息失败,", e);
+                throw new RuntimeException(e);
+            }
+        }));
+    }
+
+
+    /**
      * 校验长度
      *
      * @param data     数据