|
|
|
@ -1,5 +1,7 @@
|
|
|
|
|
package com.xydl.cac.util;
|
|
|
|
|
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
|
|
|
|
|
import java.text.ParseException;
|
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
|
|
import java.time.*;
|
|
|
|
@ -8,6 +10,7 @@ import java.time.temporal.ChronoUnit;
|
|
|
|
|
import java.util.Calendar;
|
|
|
|
|
import java.util.Date;
|
|
|
|
|
|
|
|
|
|
@Slf4j
|
|
|
|
|
public class DateUtil {
|
|
|
|
|
public final static String defaultDatePattern = "yyyy-MM-dd HH:mm:ss";
|
|
|
|
|
public static DateTimeFormatter defaultFormatter = DateTimeFormatter.ofPattern(defaultDatePattern);
|
|
|
|
@ -109,6 +112,10 @@ public class DateUtil {
|
|
|
|
|
Date date = parse(time);
|
|
|
|
|
time = format(date);
|
|
|
|
|
LocalDateTime localtime = LocalDateTime.parse(time, defaultFormatter);
|
|
|
|
|
if (localtime.getYear() < 2000) {
|
|
|
|
|
log.warn("该时间小于2000年: " + str);
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
ZonedDateTime zonedDateTime = localtime.atZone(ZoneOffset.UTC);
|
|
|
|
|
ZonedDateTime convertedDateTime = zonedDateTime.withZoneSameInstant(ZoneId.systemDefault());
|
|
|
|
|
String result = convertedDateTime.format(defaultFormatter);
|
|
|
|
|