|
@@ -30,6 +30,7 @@ import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilde
|
|
|
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
|
|
|
import org.springframework.context.annotation.Bean;
|
|
|
import org.springframework.context.annotation.Configuration;
|
|
|
+import org.springframework.core.convert.converter.Converter;
|
|
|
import org.springframework.util.StringUtils;
|
|
|
|
|
|
import java.io.IOException;
|
|
@@ -257,4 +258,45 @@ public class JacksonConfig {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 字符串格式转日期
|
|
|
+ */
|
|
|
+ public static class CustomStringDateConverter implements Converter<String, Date> {
|
|
|
+ private static final String dateFormat = "yyyy-MM-dd HH:mm:ss";
|
|
|
+ private static final String shortDateFormat = "yyyy-MM-dd";
|
|
|
+ private static final String dateFormat2 = "yyyy/MM/dd HH:mm:ss";
|
|
|
+ private static final String shortDateFormat2 = "yyyy/MM/dd";
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public Date convert(String source) {
|
|
|
+ if (org.apache.commons.lang3.StringUtils.isBlank(source)) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+ source = source.trim();
|
|
|
+ try {
|
|
|
+ SimpleDateFormat formatter;
|
|
|
+ if (source.contains("-")) {
|
|
|
+ if (source.contains(":")) {
|
|
|
+ formatter = new SimpleDateFormat(dateFormat);
|
|
|
+ } else {
|
|
|
+ formatter = new SimpleDateFormat(shortDateFormat);
|
|
|
+ }
|
|
|
+ return formatter.parse(source);
|
|
|
+ } else if (source.contains("/")) {
|
|
|
+ if (source.contains(":")) {
|
|
|
+ formatter = new SimpleDateFormat(dateFormat2);
|
|
|
+ } else {
|
|
|
+ formatter = new SimpleDateFormat(shortDateFormat2);
|
|
|
+ }
|
|
|
+ return formatter.parse(source);
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ throw new RuntimeException(String.format("parser %s to Date fail", source));
|
|
|
+ }
|
|
|
+
|
|
|
+ throw new RuntimeException(String.format("parser %s to Date fail", source));
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
}
|