From 8cd56e0d8686cd001c8f7f69a4a4179ea1c47994 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 19 八月 2022 18:29:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/hx/util/DateUtil.java | 256 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 251 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/hx/util/DateUtil.java b/src/main/java/com/hx/util/DateUtil.java
index f06d7eb..07f240a 100644
--- a/src/main/java/com/hx/util/DateUtil.java
+++ b/src/main/java/com/hx/util/DateUtil.java
@@ -26,6 +26,18 @@
private static SimpleDateFormat Format_16 = new SimpleDateFormat("yyyy/MM/dd HH:mm");
private static SimpleDateFormat Format_17 = new SimpleDateFormat("HH:mm");
+ /**鏃堕棿鏍煎紡杞寲iso8601
+ * @param date 鏃堕棿
+ * @return 杩斿洖鐨勬椂闂存牸寮忓瓧绗︿覆
+ */
+ public static String dateFormatISO8601(Date date) {
+ if(!SimpleTool.checkNotNull(date)){
+ return "";
+ }
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");//璁剧疆鏃ユ湡鏍煎紡
+ return df.format(date);
+ }
+
/**鏃堕棿鏍煎紡杞寲
* @param date 鏃堕棿
* @param format 鏃堕棿鏍煎紡
@@ -37,6 +49,17 @@
}
SimpleDateFormat df = new SimpleDateFormat(format);//璁剧疆鏃ユ湡鏍煎紡
return df.format(date);
+ }
+
+ /**鏃堕棿鎴宠浆鏃堕棿
+ * @param timestamp 鏃堕棿鎴�
+ * @param format 鏃堕棿鏍煎紡
+ * @return 杩斿洖鐨勬椂闂存牸寮忓瓧绗︿覆
+ */
+ public static Date timestampToDate(long timestamp, String format) {
+ SimpleDateFormat sdf= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String sd = sdf.format(new Date(timestamp)); // 鏃堕棿鎴宠浆鎹㈡垚鏃堕棿
+ return DateUtil.parseString(sd,"yyyy-MM-dd HH:mm:ss");
}
/**
@@ -179,6 +202,20 @@
return Format_14.format(date);
}
+
+ /**
+ * 褰撳墠鏃堕棿涔嬪墠鐨勬椂闂翠笌褰撳墠鏃堕棿鐩稿樊澶氬皯绉�
+ * @param startDate 褰撳墠鏃堕棿涔嬪墠鐨勬椂闂�
+ * @return
+ */
+ public static int calLastedTime(Date startDate) {
+ long nowDate = new Date().getTime();
+ long startDateTime = startDate.getTime();
+ int diffSeconds = (int) ((nowDate - startDateTime) / 1000);
+ return diffSeconds;
+ }
+
+
/**
* 杞崲鎴恲yyyMMddHHmmssSSS鏍煎紡鐨勬棩鏈熷瓧绗︿覆
*
@@ -216,8 +253,13 @@
* @return
* @throws Exception
*/
- public static Date parseString(String str) throws Exception {
- return Format_2.parse(str);
+ public static Date parseString(String str) {
+ try {
+ return Format_2.parse(str);
+ }catch (Exception e)
+ {
+ return null;
+ }
}
/**
@@ -228,9 +270,49 @@
* @return
* @throws Exception
*/
- public static Date parseString(String str, String format) throws Exception {
+ public static Date parseString(String str, String format) {
SimpleDateFormat sdf = new SimpleDateFormat(format);
- return sdf.parse(str);
+ try{
+ return sdf.parse(str);
+ }catch (Exception e)
+ {
+ return null;
+ }
+ }
+
+ /**瀛楃涓茶浆鎴愭椂闂磞yyy-MM-dd HH:mm:ss*/
+ public static Date parseString_1(String str)
+ {
+ try{
+ return Format_3.parse(str);
+ }catch (Exception e)
+ {
+ return null;
+ }
+ }
+
+ /**瀛楃涓茶浆鎴愭椂闂磞yyy-MM-dd*/
+ public static Date parseString_2(String str)
+ {
+ try{
+ return Format_4.parse(str);
+ }catch (Exception e)
+ {
+ return null;
+ }
+ }
+
+ /**鏃堕棿涓婄鍙犲姞
+ * @Author: ChenJiaHe
+ * @param dateTime 鏃堕棿
+ * @param second 绉�
+ * @return
+ */
+ public static Date addSecond(Date dateTime,int second){
+ Calendar c = Calendar.getInstance();
+ c.setTime(dateTime);
+ c.add(Calendar.SECOND, second);
+ return c.getTime();
}
/**鏃堕棿涓婂垎閽熷彔鍔�
@@ -269,6 +351,32 @@
Calendar c = Calendar.getInstance();
c.setTime(dateTime);
c.add(Calendar.DATE, dayNum);
+ return c.getTime();
+ }
+
+ /**鏃堕棿涓婃湀鏁板彔鍔�
+ * @Author: ChenJiaHe
+ * @param dateTime 鏃堕棿
+ * @param dayNum 澶╂暟
+ * @return
+ */
+ public static Date addMonth(Date dateTime,int dayNum){
+ Calendar c = Calendar.getInstance();
+ c.setTime(dateTime);
+ c.add(Calendar.MONTH, dayNum);
+ return c.getTime();
+ }
+
+ /**鏃堕棿涓婂勾鏁板彔鍔�
+ * @Author: ChenJiaHe
+ * @param dateTime 鏃堕棿
+ * @param dayNum 澶╂暟
+ * @return
+ */
+ public static Date addYear(Date dateTime,int dayNum){
+ Calendar c = Calendar.getInstance();
+ c.setTime(dateTime);
+ c.add(Calendar.YEAR, dayNum);
return c.getTime();
}
@@ -331,6 +439,42 @@
return weekDays[w];
}
+ /**
+ * endTime姣攕tartTime澶氱殑澶╂暟
+ * @param startTime 鏈�灏忔椂闂�
+ * @param endTime 鏈�澶ф椂闂�
+ * @return
+ */
+ public static Integer differDay(Date startTime,Date endTime){
+ Calendar cal1 = Calendar.getInstance();
+ cal1.setTime(startTime);
+
+ Calendar cal2 = Calendar.getInstance();
+ cal2.setTime(endTime);
+ 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 boolean timeEqual(Date startTime,Date endTime){
if(startTime == null || endTime==null){
@@ -338,9 +482,111 @@
}
boolean status = false;
if(formatDate(startTime,"yyyyMMdd").equals(formatDate(endTime,"yyyyMMdd"))){
- status = false;
+ status = true;
}
return status;
}
+ /**鎶婄杞崲鎴怷澶鏃禭鍒哫绉�*/
+ public static String getChineseStr(Integer second)
+ {
+ int day = 24 * 60 * 60;
+ int hour = 60 * 60;
+ int min = 60;
+
+ int dayNum = second / day;
+ int hourNum = second % day / hour;
+ int minNum = second % day % hour / min;
+ second = second % day % hour % min;
+
+ String str = dayNum > 0 ? dayNum + "澶�" : "";
+ str += hourNum > 0 ? hourNum + "鏃�" : "";
+ str += minNum > 0 ? minNum + "鍒�" : "";
+ str += second + "绉�";
+
+ return str;
+ }
+
+ /**
+ * 閽堝str鏍煎紡鐨勬椂闂村仛杞崲 鏍煎紡涓�"xx:xx"
+ * @param time 浼犲叆鐨勬椂闂�
+ * @return 杩斿洖鍒嗛挓濡傛灉10锛�25,鍒欒繑鍥�625
+ */
+ public static int getMinuteNum(String time){
+
+ if(!StringUtils.isEmpty(time))
+ {
+ String[] arr = time.split(":");
+ if(arr != null && arr.length == 2)
+ {
+ return Integer.parseInt(arr[0]) * 60 + Integer.parseInt(arr[1]);
+ }
+ }
+
+ return 0;
+
+
+ }
+
+ /**
+ * 鑾峰彇褰撳墠鏈堢殑寮�濮嬫椂闂�
+ *
+ * @param num 0鎷垮彇褰撴湀锛屾浠ｈ〃鍚庯紝璐熶唬琛ㄥ墠锛屽�间负鍑犱釜锛堟湀锛�
+ * @return 杩斿洖鏃堕棿 鏍煎紡yyyy-MM-dd 00:00:00
+ */
+ public static String getMonthStart(Integer num) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.MONTH, num);
+ calendar.set(Calendar.DAY_OF_MONTH, 1);
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.SECOND, 0);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
+ return sdf.format(calendar.getTime());
+ }
+
+ /**
+ * 鑾峰彇褰撳墠鏈堢殑缁撴潫鏃堕棿
+ *
+ * @param num 0鎷垮彇褰撴湀锛屾浠ｈ〃鍚庯紝璐熶唬琛ㄥ墠锛屽�间负鍑犱釜锛堟湀锛�
+ * @return 杩斿洖鏃堕棿 鏍煎紡yyyy-MM-dd 23:59:59
+ */
+ public static String getMonthEnd(Integer num) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.MONTH, num);
+ calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
+ calendar.set(Calendar.HOUR_OF_DAY, 23);
+ calendar.set(Calendar.MINUTE, 59);
+ calendar.set(Calendar.SECOND, 59);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
+ return sdf.format(calendar.getTime());
+ }
+
+
+ /**
+ * 鏃ユ湡2000-01-01鍙�2000-01-01 00:00:00
+ */
+ public static String dayToStart(Date date) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ calendar.set(Calendar.HOUR, 0);
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.SECOND, 0);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
+ return sdf.format(calendar.getTime());
+ }
+
+ /**
+ * 鏃ユ湡2000-01-01鍙�2000-01-01 23:59:59
+ */
+ public static String dayToEnd(Date date) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ calendar.set(Calendar.HOUR, 23);
+ calendar.set(Calendar.MINUTE, 59);
+ calendar.set(Calendar.SECOND, 59);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
+ return sdf.format(calendar.getTime());
+ }
+
}
--
Gitblit v1.8.0