From 08d8b029b10706b135713424e9b2a1b6e3839372 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 23 八月 2020 22:40:01 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
java110-utils/src/main/java/com/java110/utils/util/DateUtil.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java b/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
index 8b3a68e..4047a11 100644
--- a/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
@@ -16,6 +16,8 @@
private static DateFormat dateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
+ public static final String LAST_TIME = "2038-01-01 00:00:00";
+
private static Map<String, SimpleDateFormat> formats = new HashMap();
public static final String DATE_FORMATE_STRING_DEFAULT = "yyyyMMddHHmmss";
public static final String DATE_FORMATE_STRING_A = "yyyy-MM-dd HH:mm:ss";
@@ -29,6 +31,7 @@
public static final String DATE_FORMATE_STRING_I = "yyyy-MM-dd HH:mm:ss.SSS";
public static final String DATE_FORMATE_STRING_J = "yyyyMMddHHmmss.SSS";
public static final String DATE_FORMATE_STRING_K = "yyyyMMddHHmmssSSS";
+ public static final String DATE_FORMATE_STRING_L = "MMdd";
static {
formats.put("yyyyMMddHHmmss", new SimpleDateFormat("yyyyMMddHHmmss"));
@@ -43,6 +46,7 @@
formats.put("yyyy-MM-dd HH:mm:ss.SSS", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"));
formats.put("yyyyMMddHHmmss.SSS", new SimpleDateFormat("yyyyMMddHHmmss.SSS"));
formats.put("yyyyMMddHHmmssSSS", new SimpleDateFormat("yyyyMMddHHmmssSSS"));
+ formats.put("MMdd", new SimpleDateFormat("MMdd"));
}
@@ -77,7 +81,7 @@
}
public static Date getLastDate() throws ParseException {
- return getDateFromString("3000-01-01", DATE_FORMATE_STRING_B);
+ return getDateFromString("2037-12-01", DATE_FORMATE_STRING_B);
}
/**
@@ -144,6 +148,10 @@
public static String getNow(String pattern) {
return getFormatTimeString(new Date(), pattern);
+ }
+
+ public static String getLastTime() {
+ return LAST_TIME;
}
public static String getNowII() {
@@ -381,4 +389,29 @@
}
return true;
}
+
+
+ public static int getCurrentMonthDay() {
+ Calendar a = Calendar.getInstance();
+ a.set(Calendar.DATE, 1);
+ a.roll(Calendar.DATE, -1);
+ int maxDate = a.get(Calendar.DATE);
+ return maxDate;
+ }
+
+
+ /**
+ * 鍦ㄧ粰瀹氱殑鏃ユ湡鍔犱笂鎴栧噺鍘绘寚瀹氭湀浠藉悗鐨勬棩鏈�
+ *
+ * @param sourceDate 鍘熷鏃堕棿
+ * @param month 瑕佽皟鏁寸殑鏈堜唤锛屽悜鍓嶄负璐熸暟锛屽悜鍚庝负姝ｆ暟
+ * @return
+ */
+ public static Date stepMonth(Date sourceDate, int month) {
+ Calendar c = Calendar.getInstance();
+ c.setTime(sourceDate);
+ c.add(Calendar.MONTH, month);
+
+ return c.getTime();
+ }
}
--
Gitblit v1.8.0