From c03932c8b4d3558e2c9b11ade3c9155a8dc7f2b5 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 25 十月 2023 01:16:17 +0800
Subject: [PATCH] 优化账单费用 加入账单生成期
---
java110-utils/src/main/java/com/java110/utils/util/DateUtil.java | 350 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 288 insertions(+), 62 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..8e7a3f7 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,28 @@
return calendar.getTime();
}
+ public static Date getNextMonthFirstDate(String curDate) {
+ Date date = DateUtil.getDateFromStringB(curDate);
+ return getNextMonthFirstDate(date);
+ }
+
+ public static Date getNextMonthFirstDate(Date curDate) {
+
+ return getNextMonthFirstDate(curDate,1);
+ }
+
+ public static Date getNextMonthFirstDate(Date curDate,int monthCount) {
+
+ 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);
+ curDateCal.add(Calendar.MONTH, monthCount);
+ return curDateCal.getTime();
+ }
+
public static Date getFirstDate() {
Calendar curDateCal = Calendar.getInstance();
curDateCal.set(Calendar.DAY_OF_MONTH, 1);
@@ -394,6 +435,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();
}
@@ -440,6 +502,12 @@
a.roll(Calendar.DATE, -1);
int maxDate = a.get(Calendar.DATE);
return maxDate;
+ }
+
+ public static int getMonthDay(Date date) {
+ Calendar a = Calendar.getInstance();
+ a.setTime(date);
+ return a.getActualMaximum(Calendar.DAY_OF_MONTH);
}
public static void main(String[] args) throws ParseException {
@@ -602,7 +670,6 @@
/**
* 銆�銆� *瀛楃涓茬殑鏃ユ湡鏍煎紡鐨勮绠�
- *
*/
public static int daysBetween(String smdate, String bdate) {
long between_days = 0;
@@ -621,71 +688,230 @@
return Integer.parseInt(String.valueOf(between_days));
}
- public static double dayCompare(Date fromDate, Date toDate) {
- double resMonth = 0.0;
- Calendar from = Calendar.getInstance();
- from.setTime(fromDate);
- Calendar to = Calendar.getInstance();
- to.setTime(toDate);
- //姣旇緝鏈堜唤宸� 鍙兘鏈夋暣鏁� 涔熶細璐熸暟
- int result = to.get(Calendar.MONTH) - from.get(Calendar.MONTH);
- //姣旇緝骞村樊
- int month = (to.get(Calendar.YEAR) - from.get(Calendar.YEAR)) * 12;
-
- //鐪熷疄 鐩稿樊鏈堜唤
- result = result + month;
-
- //寮�濮嬫椂闂� 2021-06-01 2021-08-05 result = 2 2021-08-01
- Calendar newFrom = Calendar.getInstance();
- newFrom.setTime(fromDate);
- newFrom.add(Calendar.MONTH, result);
- //濡傛灉鍔犳湀浠藉悗 澶т簬浜嗗綋鍓嶆椂闂� 榛樿鍔� 鏈堜唤 -1 鎯呭喌 12-19 21-01-10
- //杩欎釜鏄鐨勯�昏緫涓�瀹氬ソ濂界悊瑙�
- if (newFrom.getTime().getTime() > toDate.getTime()) {
- newFrom.setTime(fromDate);
- result = result - 1;
- newFrom.add(Calendar.MONTH, result);
- }
-
- // t1 2021-08-01 t2 2021-08-05
- long t1 = newFrom.getTime().getTime();
- long t2 = to.getTime().getTime();
- //鐩稿樊姣
- double days = (t2 - t1) * 1.00 / (24 * 60 * 60 * 1000);
- BigDecimal tmpDays = new BigDecimal(days); //鐩稿樊澶╂暟
- BigDecimal monthDay = null;
- Calendar newFromMaxDay = Calendar.getInstance();
- newFromMaxDay.set(newFrom.get(Calendar.YEAR), newFrom.get(Calendar.MONTH), 1, 0, 0, 0);
- newFromMaxDay.add(Calendar.MONTH, 1); //涓嬩釜鏈�1鍙�
- //鍦ㄥ綋鍓嶆湀涓� 杩欏潡鏈夐棶棰�
- if (toDate.getTime() < newFromMaxDay.getTime().getTime()) {
- monthDay = new BigDecimal(newFrom.getActualMaximum(Calendar.DAY_OF_MONTH));
- return tmpDays.divide(monthDay, 4, BigDecimal.ROUND_HALF_UP).add(new BigDecimal(result)).doubleValue();
- }
- // 涓婃湀澶╂暟
- days = (newFromMaxDay.getTimeInMillis() - t1) * 1.00 / (24 * 60 * 60 * 1000);
- tmpDays = new BigDecimal(days);
- monthDay = new BigDecimal(newFrom.getActualMaximum(Calendar.DAY_OF_MONTH));
- BigDecimal preRresMonth = tmpDays.divide(monthDay, 4, BigDecimal.ROUND_HALF_UP);
-
- //涓嬫湀澶╂暟
- days = (t2 - newFromMaxDay.getTimeInMillis()) * 1.00 / (24 * 60 * 60 * 1000);
- tmpDays = new BigDecimal(days);
- monthDay = new BigDecimal(newFromMaxDay.getActualMaximum(Calendar.DAY_OF_MONTH));
- resMonth = tmpDays.divide(monthDay, 4, BigDecimal.ROUND_HALF_UP).add(new BigDecimal(result)).add(preRresMonth).doubleValue();
- return resMonth;
- }
+// public static double dayCompare(Date fromDate, Date toDate) {
+// double resMonth = 0.0;
+// Calendar from = Calendar.getInstance();
+// from.setTime(fromDate);
+// Calendar to = Calendar.getInstance();
+// to.setTime(toDate);
+// //姣旇緝鏈堜唤宸� 鍙兘鏈夋暣鏁� 涔熶細璐熸暟
+// int result = to.get(Calendar.MONTH) - from.get(Calendar.MONTH);
+// //姣旇緝骞村樊
+// int month = (to.get(Calendar.YEAR) - from.get(Calendar.YEAR)) * 12;
+//
+// //鐪熷疄 鐩稿樊鏈堜唤
+// result = result + month;
+//
+// //寮�濮嬫椂闂� 2021-06-01 2021-08-05 result = 2 2021-08-01
+// Calendar newFrom = Calendar.getInstance();
+// newFrom.setTime(fromDate);
+// newFrom.add(Calendar.MONTH, result);
+// //濡傛灉鍔犳湀浠藉悗 澶т簬浜嗗綋鍓嶆椂闂� 榛樿鍔� 鏈堜唤 -1 鎯呭喌 12-19 21-01-10
+// //杩欎釜鏄鐨勯�昏緫涓�瀹氬ソ濂界悊瑙�
+// if (newFrom.getTime().getTime() > toDate.getTime()) {
+// newFrom.setTime(fromDate);
+// result = result - 1;
+// newFrom.add(Calendar.MONTH, result);
+// }
+//
+// // t1 2021-08-01 t2 2021-08-05
+// long t1 = newFrom.getTime().getTime();
+// long t2 = to.getTime().getTime();
+// //鐩稿樊姣
+// double days = (t2 - t1) * 1.00 / (24 * 60 * 60 * 1000);
+// BigDecimal tmpDays = new BigDecimal(days); //鐩稿樊澶╂暟
+// BigDecimal monthDay = null;
+// Calendar newFromMaxDay = Calendar.getInstance();
+// newFromMaxDay.set(newFrom.get(Calendar.YEAR), newFrom.get(Calendar.MONTH), 1, 0, 0, 0);
+// newFromMaxDay.add(Calendar.MONTH, 1); //涓嬩釜鏈�1鍙�
+// //鍦ㄥ綋鍓嶆湀涓� 杩欏潡鏈夐棶棰�
+// if (toDate.getTime() < newFromMaxDay.getTime().getTime()) {
+// monthDay = new BigDecimal(newFrom.getActualMaximum(Calendar.DAY_OF_MONTH));
+// return tmpDays.divide(monthDay, 4, BigDecimal.ROUND_HALF_UP).add(new BigDecimal(result)).doubleValue();
+// }
+// // 涓婃湀澶╂暟
+// days = (newFromMaxDay.getTimeInMillis() - t1) * 1.00 / (24 * 60 * 60 * 1000);
+// tmpDays = new BigDecimal(days);
+// monthDay = new BigDecimal(newFrom.getActualMaximum(Calendar.DAY_OF_MONTH));
+// BigDecimal preRresMonth = tmpDays.divide(monthDay, 4, BigDecimal.ROUND_HALF_UP);
+//
+// //涓嬫湀澶╂暟
+// days = (t2 - newFromMaxDay.getTimeInMillis()) * 1.00 / (24 * 60 * 60 * 1000);
+// tmpDays = new BigDecimal(days);
+// monthDay = new BigDecimal(newFromMaxDay.getActualMaximum(Calendar.DAY_OF_MONTH));
+// resMonth = tmpDays.divide(monthDay, 4, BigDecimal.ROUND_HALF_UP).add(new BigDecimal(result)).add(preRresMonth).doubleValue();
+// return resMonth;
+// }
/**
* 閫氳繃鏃堕棿绉掓绉掓暟鍒ゆ柇涓や釜鏃堕棿鐨勯棿闅�
+ *
* @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();
+ }
+
+ public static boolean sameMonthDay(Date startDate, Date endDate) {
+ Calendar startCalendar = Calendar.getInstance();
+ startCalendar.setTime(startDate);
+ Calendar endCalender = Calendar.getInstance();
+ endCalender.setTime(endDate);
+ if (startCalendar.get(Calendar.DAY_OF_MONTH) == endCalender.get(Calendar.DAY_OF_MONTH)) {
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * 璁＄畻 fromDate 2023-01-12 toDate 2023-09-15
+ * 2023-01-12--->2023-01-01 ---> 2023-09-01 ------> 2023-09-15
+ * fromDate ---> fromDateFirstDate ---> toDateFirstDate ----> toDate
+ *
+ * @param fromDate
+ * @param toDate
+ * @return
+ */
+ public static double dayCompare(Date fromDate, Date toDate) {
+
+
+ //todo 闇�瑕佽绠椾笁绔椂闂� 鐩稿姞鍗冲彲
+ Date fromDateFirstDate = fromDate; // 绗竴涓�1鏃�
+
+ Date toDateFirstDate = toDate; // 鏈�鍚庝竴涓�1鏃�
+
+ boolean firstDay = true;
+
+ //todo 1.0 璁＄畻 fromDateFirstDate
+ Calendar fromDateCal = Calendar.getInstance();
+ fromDateCal.setTime(fromDate);
+ fromDateCal.set(Calendar.DAY_OF_MONTH, 1);
+ if (fromDate.getTime() > fromDateCal.getTime().getTime()) {
+ fromDateCal.add(Calendar.MONTH, 1);
+ firstDay = false;
+ fromDateFirstDate = fromDateCal.getTime();
+ }
+
+ //todo 2.0 璁＄畻 toDateFirstDate
+ Calendar toDateCal = Calendar.getInstance();
+ toDateCal.setTime(toDate);
+ toDateCal.set(Calendar.DAY_OF_MONTH, 1);
+ if (toDate.getTime() > toDateCal.getTime().getTime()) {
+ toDateFirstDate = toDateCal.getTime();
+ }
+
+ // todo 3.0 璁＄畻鏁存暟鏈� fromDateFirstDate ---> toDateFirstDate
+ Calendar from = Calendar.getInstance();
+ from.setTime(fromDateFirstDate);
+ Calendar to = Calendar.getInstance();
+ to.setTime(toDateFirstDate);
+ //姣旇緝鏈堜唤宸� 鍙兘鏈夋暣鏁� 涔熶細璐熸暟
+ int result = to.get(Calendar.MONTH) - from.get(Calendar.MONTH);
+ //姣旇緝骞村樊
+ int month = (to.get(Calendar.YEAR) - from.get(Calendar.YEAR)) * 12;
+ //鐪熷疄 鐩稿樊鏈堜唤
+ result = result + month;
+
+ //todo 3.1 濡傛灉 fromDate 鍜宼oDate 鏄悓涓�澶� 鍒欑洿鎺ヨ繑鍥炴暣鏈堬紝涓嶅啀璁＄畻 4.0 鍜�5.0
+ if (DateUtil.sameMonthDay(fromDate, toDate)) {
+ return firstDay ? result : result + 1;
+ }
+
+ // todo 4.0 璁＄畻 fromDate ---> fromDateFirstDate 鐨勬湀浠�
+ double days = (fromDateFirstDate.getTime() - fromDate.getTime()) * 1.00 / (24 * 60 * 60 * 1000);
+ BigDecimal tmpDays = new BigDecimal(days); //鐩稿樊澶╂暟
+ BigDecimal monthDay = new BigDecimal(DateUtil.getMonthDay(fromDate));
+ BigDecimal resMonth = tmpDays.divide(monthDay, 4, BigDecimal.ROUND_HALF_UP).add(new BigDecimal(result));
+
+ // todo 5.0 璁＄畻 toDateFirstDate ----> toDate 鏈堜唤
+ days = (toDate.getTime() - toDateFirstDate.getTime()) * 1.00 / (24 * 60 * 60 * 1000);
+ tmpDays = new BigDecimal(days); //鐩稿樊澶╂暟
+ monthDay = new BigDecimal(DateUtil.getMonthDay(toDate));
+ resMonth = tmpDays.divide(monthDay, 4, BigDecimal.ROUND_HALF_UP).add(resMonth);
+
+ return resMonth.doubleValue();
+
+ }
+
+ public static Date getTargetEndTime(double month, Date startDate) {
+ Calendar endDate = Calendar.getInstance();
+ endDate.setTime(startDate);
+
+ Double intMonth = Math.floor(month);
+ endDate.add(Calendar.MONTH, intMonth.intValue());
+ double doubleMonth = month - intMonth;
+ if (doubleMonth <= 0) {
+ return endDate.getTime();
+ }
+ int futureDay = endDate.getActualMaximum(Calendar.DAY_OF_MONTH);
+ Double hour = doubleMonth * futureDay * 24;
+ endDate.add(Calendar.HOUR_OF_DAY, hour.intValue());
+ return endDate.getTime();
+ }
}
--
Gitblit v1.8.0