From 5d19f731a7f3b9f55ebe66f6bcc2d1dae8870013 Mon Sep 17 00:00:00 2001
From: 颓废太子 <1098226878@qq.com>
Date: 星期三, 24 十一月 2021 10:26:07 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-utils/src/main/java/com/java110/utils/util/DateUtil.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 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 b5ff030..788b7b0 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
@@ -32,6 +32,7 @@
public static final String DATE_FORMATE_STRING_J = "yyyyMMddHHmmss.SSS";
public static final String DATE_FORMATE_STRING_K = "yyyyMMddHHmmssSSS";
public static final String DATE_FORMATE_STRING_L = "MMdd";
+ public static final String DATE_FORMATE_STRING_M = "yyyyMM";
static {
formats.put("yyyyMMddHHmmss", new SimpleDateFormat("yyyyMMddHHmmss"));
@@ -47,6 +48,7 @@
formats.put("yyyyMMddHHmmss.SSS", new SimpleDateFormat("yyyyMMddHHmmss.SSS"));
formats.put("yyyyMMddHHmmssSSS", new SimpleDateFormat("yyyyMMddHHmmssSSS"));
formats.put("MMdd", new SimpleDateFormat("MMdd"));
+ formats.put("yyyyMM", new SimpleDateFormat("yyyyMM"));
}
@@ -350,15 +352,23 @@
public static Date getNextMonthFirstDate() {
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 calendar = Calendar.getInstance();
- calendar.set(Calendar.DAY_OF_MONTH, 1);
- return calendar.getTime();
+ Calendar curDateCal = Calendar.getInstance();
+ curDateCal.set(Calendar.DAY_OF_MONTH, 1);
+ curDateCal.set(Calendar.HOUR_OF_DAY, 0);
+ curDateCal.set(Calendar.MINUTE, 0);
+ curDateCal.set(Calendar.SECOND, 0);
+ Date curDate = curDateCal.getTime();
+ return curDate;
}
+
public static String getNextMonthFirstDay(String fmt) {
String returndate = "";
@@ -405,6 +415,10 @@
return maxDate;
}
+ public static void main(String[] args) {
+ System.out.println(getCurrentMonthDay());
+ }
+
/**
* 鍦ㄧ粰瀹氱殑鏃ユ湡鍔犱笂鎴栧噺鍘绘寚瀹氭湀浠藉悗鐨勬棩鏈�
@@ -421,6 +435,20 @@
return c.getTime();
}
+ /**
+ * 鍦ㄧ粰瀹氱殑鏃ユ湡鍔犱笂鎴栧噺鍘绘寚瀹氬ぉ鏁板悗鐨勬棩鏈�
+ *
+ * @param sourceDate 鍘熷鏃堕棿
+ * @param day 瑕佽皟鏁寸殑鏈堜唤锛屽悜鍓嶄负璐熸暟锛屽悜鍚庝负姝ｆ暟
+ * @return
+ */
+ public static Date stepDay(Date sourceDate, int day) {
+ Calendar c = Calendar.getInstance();
+ c.setTime(sourceDate);
+ c.add(Calendar.DATE, day);
+ return c.getTime();
+ }
+
public static String dateTimeToDate(String dateTime) {
String dateStr = "";
try {
--
Gitblit v1.8.0