From 1a054c486c9037b7cb0bca5c4472c628d1d1c36c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 28 六月 2021 16:54:06 +0800
Subject: [PATCH] 解决代码被合并后删除问题
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
index 87c7c57..a07fde5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
@@ -127,6 +127,13 @@
}
/**
+ * 返回当前事件的时间戳
+ * @return
+ */
+ public static Long getCurrentDateTimeStamp(){
+ return LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+ }
+ /**
* 获取当前时间字符串，格式为yyyy-MM-dd HH:mm:ss
* @return
*/
@@ -744,15 +751,54 @@
return date1.before(date2);
}
+ /**
+ * date2比date1多的天数
+ * @param date1
+ * @param date2
+ * @return
+ */
+ public static int differentDays(Date date1,Date date2)
+ {
+ Calendar cal1 = Calendar.getInstance();
+ cal1.setTime(date1);
+
+ Calendar cal2 = Calendar.getInstance();
+ cal2.setTime(date2);
+ int day1= cal1.get(Calendar.DAY_OF_YEAR);
+ int day2 = cal2.get(Calendar.DAY_OF_YEAR);
+
+ int year1 = cal1.get(Calendar.YEAR);
+ int year2 = cal2.get(Calendar.YEAR);
+ if(year1 != year2) //同一年
+ {
+ int timeDistance = 0 ;
+ for(int i = year1 ; i < year2 ; i ++)
+ {
+ if(i%4==0 && i%100!=0 || i%400==0) //闰年
+ {
+ timeDistance += 366;
+ }
+ else //不是闰年
+ {
+ timeDistance += 365;
+ }
+ }
+
+ return timeDistance + (day2-day1) ;
+ }
+ else //不同年
+ {
+// System.out.println("判断day2 - day1 : " + (day2-day1));
+ return day2-day1;
+ }
+ }
public static void main(String[]args)throws Exception{
- isValidDate("2020/12/4");
// Date date= new Date();
// Date after = new Date();
// System.out.println(calTimeDifference(date,after));
- System.out.println(getYearMonthStart(2021,2));
}
}
--
Gitblit v1.7.1