From a38aea70f60dd634515ffb89f8e0b79346f9b74c Mon Sep 17 00:00:00 2001 From: majiang Date: Sat, 4 Jun 2022 11:31:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E5=88=AB?= =?UTF-8?q?=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hutool/core/date/LocalDateTimeUtil.java | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/date/LocalDateTimeUtil.java b/hutool-core/src/main/java/cn/hutool/core/date/LocalDateTimeUtil.java index d2f3a25ab..708880749 100755 --- a/hutool-core/src/main/java/cn/hutool/core/date/LocalDateTimeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/date/LocalDateTimeUtil.java @@ -5,24 +5,11 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ReUtil; import cn.hutool.core.util.StrUtil; -import java.time.DayOfWeek; -import java.time.Duration; -import java.time.Instant; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.Period; -import java.time.ZoneId; -import java.time.ZonedDateTime; +import java.time.*; import java.time.chrono.ChronoLocalDateTime; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatterBuilder; -import java.time.temporal.ChronoField; -import java.time.temporal.ChronoUnit; -import java.time.temporal.Temporal; -import java.time.temporal.TemporalAccessor; -import java.time.temporal.TemporalUnit; -import java.time.temporal.WeekFields; +import java.time.temporal.*; import java.util.Date; import java.util.TimeZone; @@ -30,7 +17,7 @@ import java.util.TimeZone; * JDK8+中的{@link LocalDateTime} 工具类封装 * * @author looly - * @see DateUtil java7和一下版本,使用Date工具类 + * @see DateUtil java7和以下版本,使用Date工具类 * @see DatePattern 常用格式工具类 * @since 5.3.9 */ From 106361abd9a8b670586db215569ac6677ad6892f Mon Sep 17 00:00:00 2001 From: majiang Date: Sat, 4 Jun 2022 11:31:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E6=97=B6=E5=8C=BA=E7=9A=84=E7=9B=B8=E5=85=B3=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/hutool/core/date/DateUtil.java | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java b/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java index 6fd4c4230..553fe869c 100755 --- a/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java @@ -18,6 +18,7 @@ import java.text.SimpleDateFormat; import java.time.Instant; import java.time.LocalDateTime; import java.time.Year; +import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAccessor; import java.util.*; @@ -2100,6 +2101,45 @@ public class DateUtil extends CalendarUtil { return LocalDateTimeUtil.of(date); } + /** + * {@link Date} 转换时区 + * + * @param date {@link Date} + * @param zoneId{@link zoneId} + * @return {@link DateTime} + * @see DateTime(Date,ZoneId) + * @since 5.0.5 + */ + public static DateTime convertTimeZone(Date date, String zoneId) { + return new DateTime(date, ZoneUtil.toTimeZone(ZoneId.of(zoneId))); + } + + /** + * {@link Date} 转换时区 + * + * @param date {@link Date} + * @param zoneId{@link zoneId} + * @return {@link DateTime} + * @see DateTime(Date, ZoneId ) + * @since 5.0.5 + */ + public static DateTime convertTimeZone(Date date, ZoneId zoneId) { + return new DateTime(date, ZoneUtil.toTimeZone(zoneId)); + } + + /** + * {@link Date} 转换时区 + * + * @param date {@link Date} + * @param timeZone{@link timeZone} + * @return {@link DateTime} + * @see DateTime(Date,ZoneId) + * @since 5.0.5 + */ + public static DateTime convertTimeZone(Date date, TimeZone timeZone) { + return new DateTime(date, timeZone); + } + /** * 获得指定年份的总天数 *