From 402d54b051a96b61a5bab774437e98705b64708d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 17 五月 2023 18:30:50 +0800
Subject: [PATCH] optimize pay fee detail to month
---
java110-utils/src/main/java/com/java110/utils/util/DateUtil.java | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 150 insertions(+), 5 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 29fb6ee..78dcb97 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
@@ -1,13 +1,11 @@
package com.java110.utils.util;
+import java.math.BigDecimal;
import java.sql.Timestamp;
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.
@@ -33,6 +31,9 @@
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";
+ public static final String DATE_FORMATE_STRING_N = "HHmmss";
+ public static final String DATE_FORMATE_STRING_O = "yyyyMMddHHmm";
+
static {
formats.put("yyyyMMddHHmmss", new SimpleDateFormat("yyyyMMddHHmmss"));
@@ -49,6 +50,8 @@
formats.put("yyyyMMddHHmmssSSS", new SimpleDateFormat("yyyyMMddHHmmssSSS"));
formats.put("MMdd", new SimpleDateFormat("MMdd"));
formats.put("yyyyMM", new SimpleDateFormat("yyyyMM"));
+ formats.put("HHmmss", new SimpleDateFormat("HHmmss"));
+ formats.put("yyyyMMddHHmm", new SimpleDateFormat("yyyyMMddHHmm"));
}
@@ -117,6 +120,22 @@
}
}
+ 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);
+ }
+ }
+
public static String getDefaultFormateTimeString(Date date) {
return getFormatTimeString(date, "yyyyMMddHHmmss");
}
@@ -157,6 +176,7 @@
return sDateFormat.parse(date);
}
} catch (Exception e) {
+ e.printStackTrace();
throw new IllegalArgumentException(e);
}
}
@@ -473,6 +493,15 @@
}
+ public static String getAddHoursStringA(Date date, int hours) {
+ SimpleDateFormat sf = new SimpleDateFormat(DATE_FORMATE_STRING_A);
+ Calendar c = Calendar.getInstance();
+ c.setTime(date);
+ c.add(Calendar.HOUR_OF_DAY, hours);
+ return sf.format(c.getTime());
+ }
+
+
public static String getAddMonthStringA(Date date, int month) {
SimpleDateFormat sf = new SimpleDateFormat(DATE_FORMATE_STRING_A);
Calendar c = Calendar.getInstance();
@@ -589,7 +618,6 @@
/**
* 銆�銆� *瀛楃涓茬殑鏃ユ湡鏍煎紡鐨勮绠�
- *
*/
public static int daysBetween(String smdate, String bdate) {
long between_days = 0;
@@ -607,4 +635,121 @@
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;
+ }
+
+ /**
+ * 閫氳繃鏃堕棿绉掓绉掓暟鍒ゆ柇涓や釜鏃堕棿鐨勯棿闅�
+ *
+ * @param date1
+ * @param date2
+ * @return
+ */
+ 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_M);
+ // 澹版槑淇濆瓨鏃ユ湡闆嗗悎
+ 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;
+ }
+
}
--
Gitblit v1.8.0