diff --git a/src/main/java/org/ssssssss/script/functions/ObjectConvertExtension.java b/src/main/java/org/ssssssss/script/functions/ObjectConvertExtension.java index 68e35459835f5854a103c99a7ff2e44989930292..11f9603f0d30242e2ded5c09ecc5c4d36343c77a 100644 --- a/src/main/java/org/ssssssss/script/functions/ObjectConvertExtension.java +++ b/src/main/java/org/ssssssss/script/functions/ObjectConvertExtension.java @@ -104,32 +104,37 @@ public class ObjectConvertExtension { /** * 转Date + */ + /** + * 转Date */ @Comment("将对象转为Date类型,支持String、10位、13位时间戳") public static Date asDate(Object val, - @Comment(name = "format", value = "日期格式,如yyyy-MM-dd HH:mm:ss") String format) { + @Comment(name = "format", value = "日期格式,如yyyy-MM-dd HH:mm:ss") String... formats) { if (val == null) { return null; } if (val instanceof String) { - try { - return new SimpleDateFormat(format).parse(val.toString()); - } catch (ParseException e) { - long longVal = asLong(val, -1); - if (longVal > 0) { - return asDate(longVal, format); + for (String format : formats) { + try { + return new SimpleDateFormat(format).parse(val.toString()); + } catch (ParseException e) { + long longVal = asLong(val, -1); + if (longVal > 0) { + return asDate(longVal, format); + } } } } else if (val instanceof Date) { return (Date) val; } else if (val instanceof Number) { Number number = (Number) val; - if (val.toString().length() == 10) { //10位时间戳 + if (val.toString().length() == 10) { // 10位时间戳 return new Date(number.longValue() * 1000L); - } else if (val.toString().length() == 13) { //13位时间戳 + } else if (val.toString().length() == 13) { // 13位时间戳 return new Date(number.longValue()); } - } else if (val instanceof LocalDateTime) { //LocalDateTime类型 + } else if (val instanceof LocalDateTime) { // LocalDateTime类型 return Date.from(((LocalDateTime) val).atZone(ZoneId.systemDefault()).toInstant()); } return null;