From 08573af6ddab154c52a5741de059d88a74206500 Mon Sep 17 00:00:00 2001
From: ChenJiaHe <763432473@qq.com>
Date: 星期五, 27 八月 2021 15:55:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/hx/util/DateUtil.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/hx/util/DateUtil.java b/src/main/java/com/hx/util/DateUtil.java
index a2484b8..60e7d19 100644
--- a/src/main/java/com/hx/util/DateUtil.java
+++ b/src/main/java/com/hx/util/DateUtil.java
@@ -216,8 +216,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 +233,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*/
@@ -292,6 +302,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();
}
@@ -435,4 +458,25 @@
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;
+
+
+ }
+
}
--
Gitblit v1.8.0