Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-11-29 701d5ca0fb3da20fb336d66e08f4aa3c6b85c731

 server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java

@@ -86,7 +86,7 @@
                date = date.substring(0,i);
            }
        }
        //TimeZone tz = TimeZone.getTimeZone("GMT-01");
        //TimeZone tz = TimeZone.getTimeZone("GMT-01");2024-10-21T10:40:04+08:00
        DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
//        DateFormat df = new SimpleDateFormat("2023-12-08 T 09:25:54.698+08:00");
        df.setTimeZone(tz);
@@ -345,6 +345,25 @@
    }




    public static List<String> getBeforDays(Date currentDate,Integer days){
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(currentDate);
        Date endDate = currentDate; // 获取当前日期
        calendar.add(Calendar.DAY_OF_YEAR, -days); // 往前推7天
        Date startDate = calendar.getTime(); // 获取推算后的日期
        List<String> list = new ArrayList<>();
        while (startDate.before(endDate)) {
            calendar.add(Calendar.DAY_OF_YEAR, 1); // 获取下一天日期
            startDate = calendar.getTime();
            list.add(DateUtil.dateToString(startDate,"yyyy-MM-dd"));
            System.out.println(DateUtil.dateToString(startDate,"yyyy-MM-dd"));
        }
        return list;
    }

    /**
     * Descrption:取得当前日期时间,格式为:YYYYMMDDHHMISS
     *
@@ -441,7 +460,7 @@
     * @return String
     * @throws Exception
     */
    public static String getPlusTime(Date date) throws Exception {
    public static String getPlusTime(Date date)  {
        if (date == null)
            return null;
        try {
@@ -1264,6 +1283,9 @@
     * @return
     */
    public static Date getXMinuteAfterDate(Date date, int minute) {
        if(date ==null){
            date = new Date();
        }
        Calendar now = Calendar.getInstance();
        now.setTime(date);
        now.set(Calendar.MINUTE, now.get(Calendar.MINUTE) + minute);
@@ -1612,6 +1634,13 @@
    public static String getFirstDayOfThisMonth() {
        try {
            return getNowShortDate().substring(0, 6) + "01";
        } catch (Exception e) {
            return "";
        }
    }
    public static String getFirstDayCurrentMonth() {
        try {
            return getDateLong(new Date()).substring(0, 7) + "-01";
        } catch (Exception e) {
            return "";
        }
@@ -2803,7 +2832,7 @@
//            System.out.println(DateUtil.afterMinutesDate(-5));


            DateUtil.getBeforMonth(new Date(),12);
            DateUtil.getBeforDays(new Date(),7);

//            Date startTime = DateUtil.StringToDate("2024-05-01 08:00:00" ,"yyyy-MM-dd HH:mm:ss");
//            Date endTime = DateUtil.StringToDate("2024-05-01 17:00:00" ,"yyyy-MM-dd HH:mm:ss");
@@ -3007,6 +3036,12 @@
        calendar.add(Calendar.DATE, days);//
        return calendar.getTime();
    }
    public static Date addMonthToDate(Date date, int month) {
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(date);
        calendar.add(Calendar.MONTH, month);//
        return calendar.getTime();
    }

    public static String afterDateToStr(Integer days){
        Date date = new Date();