From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-utils/src/main/java/com/java110/utils/util/DateUtil.java | 130 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 122 insertions(+), 8 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 81932e8..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
@@ -5,10 +5,7 @@
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
/**
* Created by wuxw on 2017/7/24.
@@ -35,6 +32,9 @@
public static final String DATE_FORMATE_STRING_L = "MMdd";
public static final String DATE_FORMATE_STRING_M = "yyyyMM";
public static final String DATE_FORMATE_STRING_N = "HHmmss";
+ public static final String DATE_FORMATE_STRING_O = "yyyyMMddHHmm";
+ public static final String DATE_FORMATE_STRING_Q = "yyyy-MM";
+
static {
formats.put("yyyyMMddHHmmss", new SimpleDateFormat("yyyyMMddHHmmss"));
@@ -52,6 +52,9 @@
formats.put("MMdd", new SimpleDateFormat("MMdd"));
formats.put("yyyyMM", new SimpleDateFormat("yyyyMM"));
formats.put("HHmmss", new SimpleDateFormat("HHmmss"));
+ formats.put("yyyyMMddHHmm", new SimpleDateFormat("yyyyMMddHHmm"));
+ formats.put("yyyy-MM", new SimpleDateFormat("yyyy-MM"));
+
}
@@ -114,6 +117,22 @@
public static String getFormatTimeString(Date date, String pattern) {
SimpleDateFormat sDateFormat = getDateFormat(pattern);
+
+ synchronized (sDateFormat) {
+ return sDateFormat.format(date);
+ }
+ }
+
+ public static String getFormatTimeStringA(Date date) {
+ SimpleDateFormat sDateFormat = getDateFormat(DateUtil.DATE_FORMATE_STRING_A);
+
+ synchronized (sDateFormat) {
+ return sDateFormat.format(date);
+ }
+ }
+
+ public static String getFormatTimeStringB(Date date) {
+ SimpleDateFormat sDateFormat = getDateFormat(DateUtil.DATE_FORMATE_STRING_B);
synchronized (sDateFormat) {
return sDateFormat.format(date);
@@ -386,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);
@@ -394,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();
}
@@ -602,7 +655,6 @@
/**
* 銆�銆� *瀛楃涓茬殑鏃ユ湡鏍煎紡鐨勮绠�
- *
*/
public static int daysBetween(String smdate, String bdate) {
long between_days = 0;
@@ -678,14 +730,76 @@
/**
* 閫氳繃鏃堕棿绉掓绉掓暟鍒ゆ柇涓や釜鏃堕棿鐨勯棿闅�
+ *
* @param date1
* @param date2
* @return
*/
- public static int differentDaysUp(Date date1,Date date2)
- {
- double days = ((date2.getTime() - date1.getTime()) / (1000*3600*24*1.00));
+ public static int differentDaysUp(Date date1, Date date2) {
+ double days = ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24 * 1.00));
return new Double(Math.ceil(days)).intValue();
}
+ /**
+ * 鑾峰彇涓や釜鏃ユ湡涔嬮棿鐨勬墍鏈夋湀浠� (骞存湀)
+ *
+ * @param startTime
+ * @param endTime
+ * @return锛歭ist
+ */
+ public static List<String> getMonthBetweenDate(Date startTime, Date endTime) {
+ return getMonthBetweenDate(DateUtil.getFormatTimeStringA(startTime), DateUtil.getFormatTimeStringA(endTime));
+ }
+
+ /**
+ * 鑾峰彇涓や釜鏃ユ湡涔嬮棿鐨勬墍鏈夋湀浠� (骞存湀)
+ *
+ * @param startTime
+ * @param endTime
+ * @return锛歭ist
+ */
+ public static List<String> getMonthBetweenDate(String startTime, String endTime) {
+ SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMATE_STRING_Q);
+ // 澹版槑淇濆瓨鏃ユ湡闆嗗悎
+ List<String> list = new ArrayList<>();
+ try {
+ // 杞寲鎴愭棩鏈熺被鍨�
+ Date startDate = sdf.parse(startTime);
+ Date endDate = sdf.parse(endTime);
+
+ //鐢–alendar 杩涜鏃ユ湡姣旇緝鍒ゆ柇
+ Calendar calendar = Calendar.getInstance();
+ while (startDate.getTime() <= endDate.getTime()) {
+
+ // 鎶婃棩鏈熸坊鍔犲埌闆嗗悎
+ list.add(sdf.format(startDate));
+
+ // 璁剧疆鏃ユ湡
+ calendar.setTime(startDate);
+
+ //鎶婃湀鏁板鍔� 1
+ calendar.add(Calendar.MONTH, 1);
+
+ // 鑾峰彇澧炲姞鍚庣殑鏃ユ湡
+ startDate = calendar.getTime();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ 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