Explorar el Código

feat:工程下载代码合并

侯茂昌 hace 1 año
padre
commit
381aa04441
Se han modificado 1 ficheros con 20 adiciones y 4 borrados
  1. 20 4
      zkqy-common/src/main/java/com/zkqy/common/utils/StringUtils.java

+ 20 - 4
zkqy-common/src/main/java/com/zkqy/common/utils/StringUtils.java

@@ -26,13 +26,29 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
     /** 下划线 */
     private static final char SEPARATOR = '_';
 
-    private static final String DATE_TIME_PATTERN = "\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}";
+    /**
+     * 不带T
+     */
+    private static final String DATE_TIME_PATTERN1 = "\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}";
+
+    /**
+     * 带T的
+     */
+    private static final String DATE_TIME_PATTERN2 = "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}";
+
+    /**
+     * 只有年月日的
+     */
+    private static final String DATE_PATTERN = "^\\d{4}-\\d{2}-\\d{2}$";
+
 
+    private static final Pattern pattern1 = Pattern.compile(DATE_TIME_PATTERN1);
+    private static final Pattern pattern2 = Pattern.compile(DATE_TIME_PATTERN2);
 
     public static boolean isValidDateTimeFormat(String input) {
-        Pattern pattern = Pattern.compile(DATE_TIME_PATTERN);
-        Matcher matcher = pattern.matcher(input);
-        return matcher.matches();
+        Matcher matcher1 = pattern1.matcher(input);
+        Matcher matcher2 = pattern2.matcher(input);
+        return matcher1.matches() || matcher2.matches();
     }
 
     /**