From df0afdaa9be00fd6ffc767edb1d0dee4ccebff4f Mon Sep 17 00:00:00 2001
From: 喻健 <喻健@Admin>
Date: 星期一, 10 十二月 2018 14:12:27 +0800
Subject: [PATCH] 选品库+分享记录

---
 utils/src/main/java/org/yeshi/utils/DateUtil.java |   51 +++++++++++++++++++++++++++++++++++----------------
 1 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/utils/src/main/java/org/yeshi/utils/DateUtil.java b/utils/src/main/java/org/yeshi/utils/DateUtil.java
index fa36db5..b0718d9 100644
--- a/utils/src/main/java/org/yeshi/utils/DateUtil.java
+++ b/utils/src/main/java/org/yeshi/utils/DateUtil.java
@@ -2,9 +2,8 @@
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 
 
 public class DateUtil {
@@ -15,7 +14,6 @@
 		SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
 		
 		try {
-			long ns = 1000;// 涓�绉掗挓鐨勬绉掓暟
 			long nm = 1000 * 60;// 涓�鍒嗛挓鐨勬绉掓暟
 			long nh = 1000 * 60 * 60;// 涓�灏忔椂鐨勬绉掓暟
 			long nd = 1000 * 24 * 60 * 60;// 涓�澶╃殑姣鏁�
@@ -26,14 +24,10 @@
 			long day = diff / nd;// 璁$畻宸灏戝ぉ
 			long hour = diff % nd / nh;// 璁$畻宸灏戝皬鏃�
 			long min = diff % nd % nh / nm;// 璁$畻宸灏戝垎閽�
-			long sec = diff % nd % nh % nm / ns;// 璁$畻宸灏戠
-			
-			//System.out.println("鏃堕棿鐩稿樊锛�" + day + "澶�" + hour + "灏忔椂" + min + "鍒嗛挓" + sec + "绉�");
 			
 			datatime = day + "澶�" + hour + "灏忔椂" + min + "鍒嗛挓" ;
 			
 		} catch (ParseException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 		
@@ -45,7 +39,6 @@
 		
 		String datatime = 0 + "澶�" + 0 + "灏忔椂" + 0 + "鍒嗛挓" ;
 		
-		long ns = 1000;// 涓�绉掗挓鐨勬绉掓暟
 		long nm = 1000 * 60;// 涓�鍒嗛挓鐨勬绉掓暟
 		long nh = 1000 * 60 * 60;// 涓�灏忔椂鐨勬绉掓暟
 		long nd = 1000 * 24 * 60 * 60;// 涓�澶╃殑姣鏁�
@@ -70,12 +63,38 @@
         return sdf.format(date);
     }
 
-	 public static void main(String[] args) {  
-		 long a= 1529044851008L;
-		 Long l = new Long(a);
-		 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-	     Date date = new Date(l);
-	     System.out.println(sdf.format(date));
-		 new DateUtil().dateDiff(new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(new Date()), sdf.format(date));  
-	 }  
+	/**
+	 * 楠岃瘉鏄惁灞炰簬鍚屼竴澶�
+	 * 
+	 * @param date1
+	 * @param date2
+	 * @return
+	 */
+	public static boolean isSameDay(Date date1, Date date2) {
+		if (date1 != null && date2 != null) {
+			Calendar cal1 = Calendar.getInstance();
+			cal1.setTime(date1);
+			Calendar cal2 = Calendar.getInstance();
+			cal2.setTime(date2);
+			return isSameDay(cal1, cal2);
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * 楠岃瘉鏄惁灞炰簬鍚屼竴澶�
+	 * 
+	 * @param cal1
+	 * @param cal2
+	 * @return
+	 */
+	public static boolean isSameDay(Calendar cal1, Calendar cal2) {
+		if (cal1 != null && cal2 != null) {
+			return cal1.get(0) == cal2.get(0) && cal1.get(1) == cal2.get(1) && cal1.get(6) == cal2.get(6);
+		} else {
+			return false;
+		}
+	}
+
 }
\ No newline at end of file

--
Gitblit v1.8.0