Commit 8f72992d authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16

parents c3c82501 69b08b53
...@@ -40,9 +40,7 @@ import java.net.URL; ...@@ -40,9 +40,7 @@ import java.net.URL;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.*;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import static com.alibaba.fastjson.serializer.SerializerFeature.*; import static com.alibaba.fastjson.serializer.SerializerFeature.*;
...@@ -546,16 +544,28 @@ public class FascUtil { ...@@ -546,16 +544,28 @@ public class FascUtil {
if (dateValue == null || dateValue.trim().isEmpty() || pattern == null) { if (dateValue == null || dateValue.trim().isEmpty() || pattern == null) {
return dateValue; return dateValue;
} }
String trimmedValue = dateValue.trim(); SimpleDateFormat sdfInput = new SimpleDateFormat("EEE MMM dd HH:mm:ss z yyyy", Locale.ENGLISH);
SimpleDateFormat sdfOutput = new SimpleDateFormat(pattern);
try { try {
// 尝试解析为java.util.Date Date date = sdfInput.parse(dateValue);
java.util.Date date = parseDate(trimmedValue); String result = sdfOutput.format(date);
if (date != null) { if (Common.isNotNull(result)) {
java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat(pattern); return result;
return sdf.format(date); } else {
String trimmedValue = dateValue.trim();
try {
// 尝试解析为java.util.Date
date = parseDate(trimmedValue);
if (date != null) {
java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat(pattern);
return sdf.format(date);
}
} catch (Exception e) {
// 解析失败,返回原字符串
}
} }
} catch (Exception e) { } catch (ParseException e) {
// 解析失败,返回原字符串
} }
return dateValue; return dateValue;
} }
...@@ -564,8 +574,10 @@ public class FascUtil { ...@@ -564,8 +574,10 @@ public class FascUtil {
* 解析字符串为java.util.Date * 解析字符串为java.util.Date
*/ */
private static java.util.Date parseDate(String dateStr) { private static java.util.Date parseDate(String dateStr) {
// 常见日期格式模式 // 常见日期格式模式
String[] patterns = { String[] patterns = {
"EEE MMM dd HH:mm:ss z yyyy",
"yyyy-MM-dd", "yyyy-MM-dd",
"yyyy/MM/dd", "yyyy/MM/dd",
"yyyy年MM月dd日", "yyyy年MM月dd日",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment