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 | 143 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 138 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/hx/util/DateUtil.java b/src/main/java/com/hx/util/DateUtil.java
index 875014b..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,14 @@
* @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*/
@@ -255,6 +302,18 @@
}
}
+ /**鏃堕棿涓婄鍙犲姞
+ * @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();
+ }
/**鏃堕棿涓婂垎閽熷彔鍔�
* @Author: ChenJiaHe
@@ -292,6 +351,19 @@
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();
}
@@ -410,7 +482,7 @@
}
boolean status = false;
if(formatDate(startTime,"yyyyMMdd").equals(formatDate(endTime,"yyyyMMdd"))){
- status = false;
+ status = true;
}
return status;
}
@@ -456,4 +528,65 @@
}
+ /**
+ * 鑾峰彇褰撳墠鏈堢殑寮�濮嬫椂闂�
+ *
+ * @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