From 5a37edc8cb5e4fb62e374d55b504843d2f5a4a6c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 01 七月 2020 11:14:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java |  139 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 137 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java
index 07ad57e..9e43747 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java
@@ -65,6 +65,12 @@
 		String date = sdf.format(new Date(time));
 		return date;
 	}
+	
+	public static String getGernalTime(Date date) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		return sdf.format(date);
+	}
+
 
 	public static String getGernalTime(long time, String format) {
 		SimpleDateFormat sdf = new SimpleDateFormat(format);
@@ -86,11 +92,82 @@
 			date = sdf.parse(st);
 			return date.getTime();
 		} catch (Exception e) {
-			// e.printStackTrace();
+			 e.printStackTrace();
 			return 0;
 		}
 	}
-
+	
+	public static Date parseYYYYMM(String st) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+		try {
+			return sdf.parse(st);
+		} catch (Exception e) {
+			 e.printStackTrace();
+			return null;
+		}
+	}
+	
+	public static Date parseYYYYMMDD_HHMMSS(String st) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		try {
+			return sdf.parse(st);
+		} catch (Exception e) {
+			 e.printStackTrace();
+			return null;
+		}
+	}
+	
+	
+	public static Date parseYYYYMMDD_HHMM(String st) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+		try {
+			return sdf.parse(st);
+		} catch (Exception e) {
+			 e.printStackTrace();
+			return null;
+		}
+	}
+	
+	public static Date parseYYYYMMDD(String st) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		try {
+			return sdf.parse(st);
+		} catch (Exception e) {
+			 e.printStackTrace();
+			return null;
+		}
+	}
+	
+	public static Date parseDotYYYYMMDD(String st) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
+		try {
+			return sdf.parse(st);
+		} catch (Exception e) {
+			 e.printStackTrace();
+			return null;
+		}
+	}
+	
+	public static Date parseDotCommon(String st) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss");
+		try {
+			return sdf.parse(st);
+		} catch (Exception e) {
+			 e.printStackTrace();
+			return null;
+		}
+	}
+	
+	public static Date parseDotCommon2(String st) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+		try {
+			return sdf.parse(st);
+		} catch (Exception e) {
+			 e.printStackTrace();
+			return null;
+		}
+	}
+	
 	public static long convertAllTimeToTemp(String st) {
 		Date date = new Date();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
@@ -102,7 +179,52 @@
 		}
 		return 0;
 	}
+	
+	public static String formatDate(long time) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+		String date = sdf.format(new Date(time));
+		return date;
+	}
+	
+	public static String formatDate(Date time) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+		String date = sdf.format(time);
+		return date;
+	}
 
+	public static String formatDateDot(Date time) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
+		String date = sdf.format(time);
+		return date;
+	}
+	
+	public static String formatHHMM_12H(Date time) {
+		SimpleDateFormat sdf = new SimpleDateFormat("hh:mm");
+		String date = sdf.format(time);
+		return date;
+	}
+	
+	public static String formatYMDHHMM(Date date) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+		try {
+			return sdf.format(date);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+	
+	
+	public static String formatDateAddT(Date date) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+		try {
+			return sdf.format(date);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+	
 	public static long convertToTimeTemp(String st, String format) {
 		Date date = new Date();
 		SimpleDateFormat sdf = new SimpleDateFormat(format);
@@ -126,6 +248,7 @@
 		}
 		return 0;
 	}
+	
 
 	public static long convertDateToTemp2(String st) {
 		Date date = new Date();
@@ -204,6 +327,18 @@
 		return format;
 	}
 
+	public static String getMonthOnlyMM(Date date) {
+		SimpleDateFormat sdf = new SimpleDateFormat("MM");
+		String format = sdf.format(date);
+		return format;
+	}
+	
+	public static String getYearOnlyYYYY(Date date) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
+		String format = sdf.format(date);
+		return format;
+	}
+	
 	public static int getDayOfMonth() {
 		Calendar aCalendar = Calendar.getInstance(Locale.CHINA);
 		int day = aCalendar.getActualMaximum(Calendar.DATE);

--
Gitblit v1.8.0