|
@@ -216,7 +216,7 @@ public final class Period implements Serializable {
|
|
|
* @return 时间周期实例
|
|
|
*/
|
|
|
public static Period today() {
|
|
|
- return date(new Date());
|
|
|
+ return date(null);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -225,9 +225,28 @@ public final class Period implements Serializable {
|
|
|
* @param date 日期时间
|
|
|
* @return 时间周期实例
|
|
|
*/
|
|
|
- public static Period date(@NonNull Date date) {
|
|
|
+ public static Period date(Date date) {
|
|
|
Calendar calendar = Calendar.getInstance();
|
|
|
- calendar.setTime(date);
|
|
|
+ if (date != null) {
|
|
|
+ calendar.setTime(date);
|
|
|
+ }
|
|
|
+ DateUtils.clearTime(calendar);
|
|
|
+ Date begin = calendar.getTime();
|
|
|
+ calendar.set(Calendar.HOUR_OF_DAY, 23);
|
|
|
+ calendar.set(Calendar.MINUTE, 59);
|
|
|
+ calendar.set(Calendar.SECOND, 59);
|
|
|
+ Date end = calendar.getTime();
|
|
|
+ return of(begin, end);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 构建明天时间周期
|
|
|
+ *
|
|
|
+ * @return 时间周期实例
|
|
|
+ */
|
|
|
+ public static Period tomorrow() {
|
|
|
+ Calendar calendar = Calendar.getInstance();
|
|
|
+ calendar.add(Calendar.DATE, 1);
|
|
|
DateUtils.clearTime(calendar);
|
|
|
Date begin = calendar.getTime();
|
|
|
calendar.set(Calendar.HOUR_OF_DAY, 23);
|
|
@@ -257,7 +276,7 @@ public final class Period implements Serializable {
|
|
|
* @return 时间周期实例
|
|
|
*/
|
|
|
public static Period yesterday() {
|
|
|
- return yesterday(true);
|
|
|
+ return yesterday(false);
|
|
|
}
|
|
|
|
|
|
/**
|