|
@@ -8,8 +8,13 @@ import java.time.LocalDateTime;
|
|
|
import java.time.LocalTime;
|
|
|
import java.time.ZoneId;
|
|
|
import java.time.ZonedDateTime;
|
|
|
+import java.util.Calendar;
|
|
|
import java.util.Date;
|
|
|
+import java.util.HashMap;
|
|
|
+import java.util.Map;
|
|
|
+
|
|
|
import org.apache.commons.lang3.time.DateFormatUtils;
|
|
|
+import org.springframework.security.config.web.servlet.headers.HttpPublicKeyPinningDsl;
|
|
|
|
|
|
/**
|
|
|
* 时间工具类
|
|
@@ -196,4 +201,71 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
|
|
|
|
|
|
return Long.getLong(date.replaceAll("-",""));
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
+ *
|
|
|
+ * @description: 获取当前周的开始和截至时间
|
|
|
+ * @param
|
|
|
+ * @return: java.util.Map
|
|
|
+ * @author: zianY
|
|
|
+ * @time: 2022/6/1
|
|
|
+ */
|
|
|
+ public static Map getWeekBeginAndEnd(){
|
|
|
+ Map<String,String> timeMap = new HashMap<>();
|
|
|
+ String begin = parseDateToStr(YYYY_MM_DD,getBeginDayOfWeek());
|
|
|
+ String end = parseDateToStr(YYYY_MM_DD,getEendDayOfWeek());
|
|
|
+ timeMap.put("begin",begin+" 00:00:00");
|
|
|
+ timeMap.put("end",end+" 23:59:59");
|
|
|
+ return timeMap;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
+ *
|
|
|
+ * @description: 获取本周开始时间
|
|
|
+ *
|
|
|
+ * @param
|
|
|
+ * @return: java.util.Date
|
|
|
+ * @author: zianY
|
|
|
+ * @time: 2022/6/1
|
|
|
+ */
|
|
|
+ public static Date getBeginDayOfWeek(){
|
|
|
+ Date date = new Date();
|
|
|
+ Calendar cal = Calendar.getInstance();
|
|
|
+ cal.setTime(date);
|
|
|
+ int dayOfWeek = cal.get(Calendar.DAY_OF_WEEK);
|
|
|
+ if (dayOfWeek == 1){
|
|
|
+ dayOfWeek +=7;
|
|
|
+ }
|
|
|
+ cal.add(Calendar.DATE,2-dayOfWeek);
|
|
|
+ return cal.getTime();
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ *
|
|
|
+ * @description: 获取本周结束时间
|
|
|
+ *
|
|
|
+ * @param
|
|
|
+ * @return: java.util.Date
|
|
|
+ * @author: zianY
|
|
|
+ * @time: 2022/6/1
|
|
|
+ */
|
|
|
+ public static Date getEendDayOfWeek(){
|
|
|
+
|
|
|
+ Calendar cal = Calendar.getInstance();
|
|
|
+ cal.setTime(getBeginDayOfWeek());
|
|
|
+ cal.add(Calendar.DAY_OF_WEEK,6);
|
|
|
+ return cal.getTime();
|
|
|
+ }
|
|
|
+
|
|
|
+ public static void main(String[] args) {
|
|
|
+ System.out.println(parseDateToStr(YYYY_MM_DD,getBeginDayOfWeek()));
|
|
|
+ System.out.println(parseDateToStr(YYYY_MM_DD,getEendDayOfWeek()));
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
}
|