From 2291fba3ed16336860050a4a18c6860cb2396b1b Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 27 二月 2024 17:04:43 +0800
Subject: [PATCH] 优化代码
---
service-user/src/test/java/com/java110/user/AppTest.java | 70 +++++++++++++++++++++++++++++++++-
1 files changed, 67 insertions(+), 3 deletions(-)
diff --git a/service-user/src/test/java/com/java110/user/AppTest.java b/service-user/src/test/java/com/java110/user/AppTest.java
index 1000086..7442886 100755
--- a/service-user/src/test/java/com/java110/user/AppTest.java
+++ b/service-user/src/test/java/com/java110/user/AppTest.java
@@ -56,13 +56,77 @@
*/
public void testApp()
{
- Date startTime = DateUtil.getDateFromStringA("2023-12-02 15:00:00");
+ Date startTime = DateUtil.getDateFromStringA("2023-12-02 22:00:00");
Date endTime = DateUtil.getDateFromStringB("2024-03-01");
double month = dayCompare(startTime,endTime);
- System.out.println(month* 309.912);
+ System.out.println(month * 129.13 * 2.4);
}
+ 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);
+ fromDateCal.set(Calendar.HOUR_OF_DAY,0);
+ fromDateCal.set(Calendar.MINUTE,0);
+ 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);
+ toDateCal.set(Calendar.HOUR_OF_DAY,0);
+ toDateCal.set(Calendar.MINUTE,0);
+
+ 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();
+
+ }
/**
* 璁＄畻 涓や釜鏃堕棿鐐规湀浠�
*
@@ -70,7 +134,7 @@
* @param toDate 缁撴潫鏃堕棿
* @return
*/
- public double dayCompare(Date fromDate, Date toDate) {
+ public double dayCompare1(Date fromDate, Date toDate) {
double resMonth = 0.0;
Calendar from = Calendar.getInstance();
from.setTime(fromDate);
--
Gitblit v1.8.0