|
@@ -5,12 +5,10 @@ import cn.hutool.core.date.DateUnit;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
|
+import javax.xml.crypto.Data;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.time.Duration;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Calendar;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.List;
|
|
|
+import java.util.*;
|
|
|
|
|
|
public class Dateutils {
|
|
|
|
|
@@ -115,9 +113,22 @@ public class Dateutils {
|
|
|
public static String getDayDate(Date date) {
|
|
|
return new SimpleDateFormat("yyyy-MM-dd").format(date);
|
|
|
}
|
|
|
+
|
|
|
public static String getDayZeroDate(Date date) {
|
|
|
return new SimpleDateFormat("yyyy-MM-dd").format(date) +" 00:00:00";
|
|
|
}
|
|
|
+ public static String getDayEndDate(Date date) {
|
|
|
+ Date date1 = addDay(date,1);
|
|
|
+ return getDayZeroDate(date1);
|
|
|
+ }
|
|
|
+
|
|
|
+ private static Date addDay(Date date, Integer i) {
|
|
|
+ Calendar calendar = new GregorianCalendar();
|
|
|
+ calendar.setTime(date);
|
|
|
+ calendar.add(Calendar.DATE,i); //把日期往后增加一天,整数 往后推,负数往前移动
|
|
|
+ date=calendar.getTime(); //这个时间就是日期往后推一天的结果
|
|
|
+ return date;
|
|
|
+ }
|
|
|
|
|
|
|
|
|
public static String getHalfYearStr() {
|
|
@@ -149,28 +160,11 @@ public class Dateutils {
|
|
|
}
|
|
|
public static String formatEndTime(String endTime) {
|
|
|
if(StringUtils.isBlank(endTime)){
|
|
|
- endTime = Dateutils.getDate(new Date());
|
|
|
+ endTime = Dateutils.getDayEndDate(new Date());
|
|
|
}
|
|
|
return endTime;
|
|
|
}
|
|
|
|
|
|
- public static String formatStartTimeDay(String startTime) {
|
|
|
- if(StringUtils.isBlank(startTime)){
|
|
|
- return Dateutils.getHalfYearStrDay();
|
|
|
- }
|
|
|
- Date date = getDateTime(startTime);
|
|
|
-
|
|
|
- return Dateutils.getDateDay(date);
|
|
|
- }
|
|
|
- public static String formatEndTimeDay(String endTime) {
|
|
|
- if(StringUtils.isBlank(endTime)){
|
|
|
- return Dateutils.getDateDay(new Date());
|
|
|
- }
|
|
|
-
|
|
|
- Date date = getDateTime(endTime);
|
|
|
-
|
|
|
- return Dateutils.getDateDay(date);
|
|
|
- }
|
|
|
|
|
|
|
|
|
public static Long getLongTime(Date useStartTime, Date useEndTime,DateUnit dateUnit) {
|