|
@@ -15,31 +15,36 @@ import java.util.Date;
|
|
|
* @date 2019-06-23 00:53
|
|
|
* @version V1.0
|
|
|
*/
|
|
|
-public class DateUtils extends org.apache.commons.lang3.time.DateUtils{
|
|
|
- /** 时间格式(yyyy-MM-dd) */
|
|
|
- public final static String DATE_PATTERN = "yyyy-MM-dd";
|
|
|
- /** 时间格式(yyyy-MM-dd HH:mm:ss) */
|
|
|
- public final static String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
|
|
|
-
|
|
|
- public static String format(Date date) {
|
|
|
+public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
|
|
|
+ /**
|
|
|
+ * 时间格式(yyyy-MM-dd)
|
|
|
+ */
|
|
|
+ public final static String DATE_PATTERN = "yyyy-MM-dd";
|
|
|
+ /**
|
|
|
+ * 时间格式(yyyy-MM-dd HH:mm:ss)
|
|
|
+ */
|
|
|
+ public final static String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
|
|
|
+
|
|
|
+ public static String format(Date date) {
|
|
|
return format(date, DATE_PATTERN);
|
|
|
}
|
|
|
- /**
|
|
|
- * 时间转换
|
|
|
- * @param date
|
|
|
- * @param pattern
|
|
|
- * @return
|
|
|
- */
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 时间转换
|
|
|
+ *
|
|
|
+ * @param date
|
|
|
+ * @param pattern
|
|
|
+ * @return
|
|
|
+ */
|
|
|
public static String format(Date date, String pattern) {
|
|
|
- if(date != null){
|
|
|
+ if (date != null) {
|
|
|
SimpleDateFormat df = new SimpleDateFormat(pattern);
|
|
|
return df.format(date);
|
|
|
}
|
|
|
return null;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
public static String YYYY = "yyyy";
|
|
|
|
|
|
public static String YYYY_MM = "yyyy-MM";
|
|
@@ -51,63 +56,52 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils{
|
|
|
public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
|
|
|
|
|
|
private static String[] parsePatterns = {
|
|
|
- "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
|
|
|
+ "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
|
|
|
"yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
|
|
|
"yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
|
|
|
|
|
|
/**
|
|
|
* 获取当前Date型日期
|
|
|
- *
|
|
|
+ *
|
|
|
* @return Date() 当前日期
|
|
|
*/
|
|
|
- public static Date getNowDate()
|
|
|
- {
|
|
|
+ public static Date getNowDate() {
|
|
|
return new Date();
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 获取当前日期, 默认格式为yyyy-MM-dd
|
|
|
- *
|
|
|
+ *
|
|
|
* @return String
|
|
|
*/
|
|
|
- public static String getDate()
|
|
|
- {
|
|
|
+ public static String getDate() {
|
|
|
return dateTimeNow(YYYY_MM_DD);
|
|
|
}
|
|
|
|
|
|
- public static final String getTime()
|
|
|
- {
|
|
|
+ public static final String getTime() {
|
|
|
return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
|
|
|
}
|
|
|
|
|
|
- public static final String dateTimeNow()
|
|
|
- {
|
|
|
+ public static final String dateTimeNow() {
|
|
|
return dateTimeNow(YYYYMMDDHHMMSS);
|
|
|
}
|
|
|
|
|
|
- public static final String dateTimeNow(final String format)
|
|
|
- {
|
|
|
+ public static final String dateTimeNow(final String format) {
|
|
|
return parseDateToStr(format, new Date());
|
|
|
}
|
|
|
|
|
|
- public static final String dateTime(final Date date)
|
|
|
- {
|
|
|
+ public static final String dateTime(final Date date) {
|
|
|
return parseDateToStr(YYYY_MM_DD, date);
|
|
|
}
|
|
|
|
|
|
- public static final String parseDateToStr(final String format, final Date date)
|
|
|
- {
|
|
|
+ public static final String parseDateToStr(final String format, final Date date) {
|
|
|
return new SimpleDateFormat(format).format(date);
|
|
|
}
|
|
|
|
|
|
- public static final Date dateTime(final String format, final String ts)
|
|
|
- {
|
|
|
- try
|
|
|
- {
|
|
|
+ public static final Date dateTime(final String format, final String ts) {
|
|
|
+ try {
|
|
|
return new SimpleDateFormat(format).parse(ts);
|
|
|
- }
|
|
|
- catch (ParseException e)
|
|
|
- {
|
|
|
+ } catch (ParseException e) {
|
|
|
throw new RuntimeException(e);
|
|
|
}
|
|
|
}
|
|
@@ -115,8 +109,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils{
|
|
|
/**
|
|
|
* 日期路径 即年/月/日 如2018/08/08
|
|
|
*/
|
|
|
- public static final String datePath()
|
|
|
- {
|
|
|
+ public static final String datePath() {
|
|
|
Date now = new Date();
|
|
|
return DateFormatUtils.format(now, "yyyy/MM/dd");
|
|
|
}
|
|
@@ -124,8 +117,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils{
|
|
|
/**
|
|
|
* 日期路径 即年/月/日 如20180808
|
|
|
*/
|
|
|
- public static final String dateTime()
|
|
|
- {
|
|
|
+ public static final String dateTime() {
|
|
|
Date now = new Date();
|
|
|
return DateFormatUtils.format(now, "yyyyMMdd");
|
|
|
}
|
|
@@ -133,18 +125,13 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils{
|
|
|
/**
|
|
|
* 日期型字符串转化为日期 格式
|
|
|
*/
|
|
|
- public static Date parseDate(Object str)
|
|
|
- {
|
|
|
- if (str == null)
|
|
|
- {
|
|
|
+ public static Date parseDate(Object str) {
|
|
|
+ if (str == null) {
|
|
|
return null;
|
|
|
}
|
|
|
- try
|
|
|
- {
|
|
|
+ try {
|
|
|
return parseDate(str.toString(), parsePatterns);
|
|
|
- }
|
|
|
- catch (ParseException e)
|
|
|
- {
|
|
|
+ } catch (ParseException e) {
|
|
|
return null;
|
|
|
}
|
|
|
}
|
|
@@ -152,8 +139,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils{
|
|
|
/**
|
|
|
* 获取服务器启动时间
|
|
|
*/
|
|
|
- public static Date getServerStartDate()
|
|
|
- {
|
|
|
+ public static Date getServerStartDate() {
|
|
|
long time = ManagementFactory.getRuntimeMXBean().getStartTime();
|
|
|
return new Date(time);
|
|
|
}
|
|
@@ -161,8 +147,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils{
|
|
|
/**
|
|
|
* 计算两个时间差
|
|
|
*/
|
|
|
- public static String getDatePoor(Date endDate, Date nowDate)
|
|
|
- {
|
|
|
+ public static String getDatePoor(Date endDate, Date nowDate) {
|
|
|
long nd = 1000 * 24 * 60 * 60;
|
|
|
long nh = 1000 * 60 * 60;
|
|
|
long nm = 1000 * 60;
|
|
@@ -206,4 +191,23 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils{
|
|
|
public static int daysDiff(Date d1, Date d2) {
|
|
|
return (int) Math.floor(Math.abs((d1.getTime() - d2.getTime())) / (60 * 60 * 24 * 1000));
|
|
|
}
|
|
|
-}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 将字符串日期转换成日期类型
|
|
|
+ *
|
|
|
+ * @param time
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ public static Date parseStrtoDate(String time) {
|
|
|
+
|
|
|
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
+ Date dateTime = null;
|
|
|
+ try {
|
|
|
+ dateTime = sdf.parse(time);
|
|
|
+ } catch (ParseException e) {
|
|
|
+ e.printStackTrace();
|
|
|
+
|
|
|
+ }
|
|
|
+ return dateTime;
|
|
|
+ }
|
|
|
+}
|