From 64b432916af9c9218ab3f3eca614e26c542142ae Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 07 十一月 2023 15:47:13 +0800 Subject: [PATCH] bug --- server/src/main/java/doumeemes/core/utils/DateUtil.java | 61 ++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 1 deletions(-) diff --git a/server/src/main/java/doumeemes/core/utils/DateUtil.java b/server/src/main/java/doumeemes/core/utils/DateUtil.java index eb0a9fa..93ffbee 100644 --- a/server/src/main/java/doumeemes/core/utils/DateUtil.java +++ b/server/src/main/java/doumeemes/core/utils/DateUtil.java @@ -10,6 +10,8 @@ import java.text.DateFormatSymbols; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.time.LocalDateTime; +import java.time.ZoneId; import java.util.Date; import java.util.*; @@ -975,6 +977,17 @@ Date dt1 = null; try { dt1 = df.parse(DATE1); + } catch (Exception exception) { + exception.printStackTrace(); + } + return dt1; + } + + public static Date StringToDateShort(String DATE) { + DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + Date dt1 = null; + try { + dt1 = df.parse(DATE); } catch (Exception exception) { exception.printStackTrace(); } @@ -2316,6 +2329,16 @@ return new Timestamp(System.currentTimeMillis()); } } + public static Date getSdfShortDateFromString(String strDate) { + if (StringUtils.isEmpty(strDate)) { + return new Date(System.currentTimeMillis()); + } + try { + return sdfShort.parse(strDate); + } catch (Exception ex) { + return new Timestamp(System.currentTimeMillis()); + } + } // ----------------------------------------------------------------------- @@ -3002,4 +3025,40 @@ cal.add(Calendar.MINUTE,minutes); return cal.getTime(); } -} \ No newline at end of file + + /** + * LocalDateTime to date + * @param now + * @return + */ + public static LocalDateTime toDateLocalDateTime(Date now){ + return LocalDateTime.ofInstant(now.toInstant(), ZoneId.systemDefault()); + } + + + /** + * LocalDateTime to date + * @param localDateTime + * @return + */ + public static Date toDate(LocalDateTime localDateTime){ + Date from = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant()); + return from; + } + + public static String afterDate(String date,int num){ + Date today = DateUtil.StringToDateShort(date); //褰撳墠鏃堕棿 + Calendar calendar = Calendar.getInstance(); //寰楀埌鏃ュ巻 + calendar.setTime(today);//鎶婂綋鍓嶆椂闂磋祴缁欐棩鍘� + calendar.add(Calendar.DAY_OF_MONTH, num); //璁剧疆涓哄墠涓�澶� + Date yesterday = calendar.getTime(); //寰楀埌鍓嶄竴澶╃殑鏃堕棿 + calendar.setTime(today); + calendar.add(Calendar.DAY_OF_MONTH, 1); //璁剧疆涓哄悗涓�澶� + Date tomorrow = calendar.getTime(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); //璁剧疆鏃堕棿鏍煎紡 + return sdf.format(calendar.getTime()); + } + + + +} -- Gitblit v1.9.3