ソースを参照

toLocalDateTime、toLocalDate、toLocalTime 支持 java.sql.Date

James 5 年 前
コミット
7659da909e
1 ファイル変更12 行追加0 行削除
  1. 12 0
      src/main/java/com/jfinal/kit/TimeKit.java

+ 12 - 0
src/main/java/com/jfinal/kit/TimeKit.java

@@ -166,6 +166,10 @@ public class TimeKit {
 	 * java.util.Date --> java.time.LocalDateTime
 	 */
 	public static LocalDateTime toLocalDateTime(Date date) {
+		if (date instanceof java.sql.Date) {
+			date = new Date(date.getTime());
+		}
+		
 		Instant instant = date.toInstant();
 		ZoneId zone = ZoneId.systemDefault();
 		return LocalDateTime.ofInstant(instant, zone);
@@ -175,6 +179,10 @@ public class TimeKit {
 	 * java.util.Date --> java.time.LocalDate
 	 */
 	public static LocalDate toLocalDate(Date date) {
+		if (date instanceof java.sql.Date) {
+			date = new Date(date.getTime());
+		}
+		
 		Instant instant = date.toInstant();
 		ZoneId zone = ZoneId.systemDefault();
 		LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, zone);
@@ -185,6 +193,10 @@ public class TimeKit {
 	 * java.util.Date --> java.time.LocalTime
 	 */
 	public static LocalTime toLocalTime(Date date) {
+		if (date instanceof java.sql.Date) {
+			date = new Date(date.getTime());
+		}
+		
 		Instant instant = date.toInstant();
 		ZoneId zone = ZoneId.systemDefault();
 		LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, zone);