From a9e3948c9b9af14a373dacb1cb7babdbe9fd0b07 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 16 七月 2021 14:20:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java | 82 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 78 insertions(+), 4 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 d22cbce..edf56f3 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
@@ -32,7 +32,11 @@
public static SimpleDateFormat ymdhms_format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ public static SimpleDateFormat ymdhm_format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
public static DateTimeFormatter format_ymd_String = DateTimeFormatter.ofPattern("yyMMdd");
+
+ public static SimpleDateFormat yyyyMM_format = new SimpleDateFormat("yyyy-MM");
@@ -124,6 +128,13 @@
return now;
}
+ /**
+ * 返回当前事件的时间戳
+ * @return
+ */
+ public static Long getCurrentDateTimeStamp(){
+ return LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+ }
/**
* 获取当前时间字符串，格式为yyyy-MM-dd HH:mm:ss
* @return
@@ -714,19 +725,82 @@
public static Date getDateM(Date start, int min) {
Calendar date1 = Calendar.getInstance();
date1.setTime(start);
- date1.add(12, min);
+ date1.add(Calendar.MONTH, min);
return date1.getTime();
+ }
+
+ public static Date parseDateYM(String str) {
+ try {
+ return yyyyMM_format.parse(str);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+
+ public static int getMonth(Date date){
+ Calendar instance = Calendar.getInstance();
+ instance.setTime(date);
+ return instance.get(Calendar.MONTH);
+ }
+
+ public static boolean before(Date start, Date end){
+ Calendar date1 = Calendar.getInstance();
+ date1.setTime(start);
+ Calendar date2 = Calendar.getInstance();
+ date2.setTime(end);
+ 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