From 0fea532b07be89978343cb4aede3693af99f5656 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 25 七月 2023 23:04:41 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-utils/src/main/java/com/java110/utils/util/DateUtil.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java b/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
index a2345bb..14ab647 100755
--- a/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
@@ -36,7 +36,6 @@
public static final String DATE_FORMATE_STRING_Q = "yyyy-MM";
-
static {
formats.put("yyyyMMddHHmmss", new SimpleDateFormat("yyyyMMddHHmmss"));
formats.put("yyyy-MM-dd HH:mm:ss", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
@@ -406,6 +405,19 @@
return calendar.getTime();
}
+ public static Date getNextMonthFirstDate(String curDate) {
+ Date date = DateUtil.getDateFromStringB(curDate);
+ Calendar curDateCal = Calendar.getInstance();
+ curDateCal.setTime(date);
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.DAY_OF_MONTH, 1);
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.SECOND, 0);
+ calendar.add(Calendar.MONTH, 1);
+ return calendar.getTime();
+ }
+
public static Date getFirstDate() {
Calendar curDateCal = Calendar.getInstance();
curDateCal.set(Calendar.DAY_OF_MONTH, 1);
@@ -414,6 +426,27 @@
curDateCal.set(Calendar.SECOND, 0);
Date curDate = curDateCal.getTime();
return curDate;
+ }
+
+ public static Date getFirstDate(Date curDate) {
+ Calendar curDateCal = Calendar.getInstance();
+ curDateCal.setTime(curDate);
+ curDateCal.set(Calendar.DAY_OF_MONTH, 1);
+ curDateCal.set(Calendar.HOUR_OF_DAY, 0);
+ curDateCal.set(Calendar.MINUTE, 0);
+ curDateCal.set(Calendar.SECOND, 0);
+ return curDateCal.getTime();
+ }
+
+ public static Date getFirstDate(String curDate) {
+ Date date = DateUtil.getDateFromStringB(curDate);
+ Calendar curDateCal = Calendar.getInstance();
+ curDateCal.setTime(date);
+ curDateCal.set(Calendar.DAY_OF_MONTH, 1);
+ curDateCal.set(Calendar.HOUR_OF_DAY, 0);
+ curDateCal.set(Calendar.MINUTE, 0);
+ curDateCal.set(Calendar.SECOND, 0);
+ return curDateCal.getTime();
}
@@ -756,4 +789,17 @@
return list;
}
+ /**
+ * 闄ゅ幓 灏忔椂 鍒� 绉�
+ *
+ * @param time
+ * @return
+ */
+ public static Date timeToDate(Date time) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(time);
+ setTimeToMidnight(calendar);
+ return calendar.getTime();
+ }
+
}
--
Gitblit v1.8.0