From 4fa67c8de0fe4c3726a0b84db38316568768506c Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 25 十二月 2018 14:46:00 +0800
Subject: [PATCH] Merge branch 'dev1'
---
utils/src/main/java/org/yeshi/utils/DateUtil.java | 74 ++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 29 deletions(-)
diff --git a/utils/src/main/java/org/yeshi/utils/DateUtil.java b/utils/src/main/java/org/yeshi/utils/DateUtil.java
index b0718d9..10e3174 100644
--- a/utils/src/main/java/org/yeshi/utils/DateUtil.java
+++ b/utils/src/main/java/org/yeshi/utils/DateUtil.java
@@ -5,63 +5,59 @@
import java.util.Calendar;
import java.util.Date;
-
public class DateUtil {
-
+
public static String dateDiff(String startTime, String endTime) {
-
- String datatime = 0 + "澶�" + 0 + "灏忔椂" + 0 + "鍒嗛挓" ;
+
+ String datatime = 0 + "澶�" + 0 + "灏忔椂" + 0 + "鍒嗛挓";
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-
+
try {
long nm = 1000 * 60;// 涓�鍒嗛挓鐨勬绉掓暟
long nh = 1000 * 60 * 60;// 涓�灏忔椂鐨勬绉掓暟
long nd = 1000 * 24 * 60 * 60;// 涓�澶╃殑姣鏁�
-
+
// 鑾峰緱涓や釜鏃堕棿鐨勬绉掓椂闂村樊寮�
long diff = sd.parse(endTime).getTime() - sd.parse(startTime).getTime();
-
+
long day = diff / nd;// 璁＄畻宸灏戝ぉ
long hour = diff % nd / nh;// 璁＄畻宸灏戝皬鏃�
long min = diff % nd % nh / nm;// 璁＄畻宸灏戝垎閽�
-
- datatime = day + "澶�" + hour + "灏忔椂" + min + "鍒嗛挓" ;
-
+
+ datatime = day + "澶�" + hour + "灏忔椂" + min + "鍒嗛挓";
+
} catch (ParseException e) {
e.printStackTrace();
}
-
+
return datatime;
}
-
-
- public static String dateDiff2(Date startTime, Date endTime) throws Exception{
-
- String datatime = 0 + "澶�" + 0 + "灏忔椂" + 0 + "鍒嗛挓" ;
-
+
+ public static String dateDiff2(Date startTime, Date endTime) throws Exception {
+
+ String datatime = 0 + "澶�" + 0 + "灏忔椂" + 0 + "鍒嗛挓";
+
long nm = 1000 * 60;// 涓�鍒嗛挓鐨勬绉掓暟
long nh = 1000 * 60 * 60;// 涓�灏忔椂鐨勬绉掓暟
long nd = 1000 * 24 * 60 * 60;// 涓�澶╃殑姣鏁�
-
+
// 鑾峰緱涓や釜鏃堕棿鐨勬绉掓椂闂村樊寮�
long diff = endTime.getTime() - startTime.getTime();
-
+
long day = diff / nd;// 璁＄畻宸灏戝ぉ
long hour = diff % nd / nh;// 璁＄畻宸灏戝皬鏃�
long min = diff % nd % nh / nm;// 璁＄畻宸灏戝垎閽�
-
-
- datatime = day + "澶�" + hour + "灏忔椂" + min + "鍒嗛挓" ;
-
-
+
+ datatime = day + "澶�" + hour + "灏忔椂" + min + "鍒嗛挓";
+
return datatime;
}
-
+
public String transferLongToDate(String dateFormat, Long millSec) {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- Date date = new Date(millSec);
- return sdf.format(date);
- }
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date date = new Date(millSec);
+ return sdf.format(date);
+ }
/**
* 楠岃瘉鏄惁灞炰簬鍚屼竴澶�
@@ -97,4 +93,24 @@
}
}
+ /**
+ * 鎸囧畾鏃ユ湡鍔犱笂澶╂暟鍚庣殑鏃ユ湡
+ *
+ * @param num
+ * 涓哄鍔犵殑澶╂暟
+ * @param nowDate
+ * 鍒涘缓鏃堕棿
+ * @return
+ * @throws ParseException
+ */
+ public static String plusDay(int num, String nowDate) throws ParseException {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ Date currdate = format.parse(nowDate);
+
+ Calendar ca = Calendar.getInstance();
+ ca.setTime(currdate);
+ ca.add(Calendar.DATE, num);
+
+ return format.format(ca.getTime());
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0