Merge remote-tracking branch 'origin/master'

jiangping

2024-10-12 37926bbc6a660245630cae0424c65cb1661c33df

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

@@ -317,6 +317,34 @@
        }
    }


    /**
     * 获取X月份之前的月份数
     * @param currentDate
     * @param month
     * @return
     */
    public static List<String> getBeforMonth(Date currentDate , Integer month) {
        SimpleDateFormat sdfYear = new SimpleDateFormat("yyyy");
        SimpleDateFormat sdfMonth = new SimpleDateFormat("MM");
        int currentYear = Integer.parseInt(sdfYear.format(currentDate));
        int currentMonth = Integer.parseInt(sdfMonth.format(currentDate));
        List<String> list = new ArrayList<>();

        for (int i = 0; i < month; i++) {
            int tempYear = currentYear;
            int tempMonth = currentMonth - i;

            if (tempMonth <= 0) {
                tempYear--;
                tempMonth += 12;
            }
            list.add(tempYear +"-" + StringUtils.leftPad(Integer.toString(tempMonth),2,"0"));
        }
        return list;
    }


    /**
     * Descrption:取得当前日期时间,格式为:YYYYMMDDHHMISS
     *
@@ -1226,6 +1254,20 @@
            }
        }
        return length;
    }

    /**
     * 得到X分钟后的时间(时间格式)
     *
     * @param date
     * @param minute
     * @return
     */
    public static Date getXMinuteAfterDate(Date date, int minute) {
        Calendar now = Calendar.getInstance();
        now.setTime(date);
        now.set(Calendar.MINUTE, now.get(Calendar.MINUTE) + minute);
        return now.getTime();
    }

    /**
@@ -2761,16 +2803,18 @@
//            System.out.println(DateUtil.afterMinutesDate(-5));


            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");
            Long intervalTime = 35L;
            DateUtil.getBeforMonth(new Date(),12);


            DateUtil.checkDateInterval( startTime.toInstant()
                    .atZone(ZoneId.systemDefault())
                    .toLocalDateTime(), endTime.toInstant()
                    .atZone(ZoneId.systemDefault())
                    .toLocalDateTime(),intervalTime);
//            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");
//            Long intervalTime = 35L;
//
//
//            DateUtil.checkDateInterval( startTime.toInstant()
//                    .atZone(ZoneId.systemDefault())
//                    .toLocalDateTime(), endTime.toInstant()
//                    .atZone(ZoneId.systemDefault())
//                    .toLocalDateTime(),intervalTime);

        } catch (Exception ex) {
            ex.printStackTrace();
@@ -2971,6 +3015,13 @@
        return DateToStr(date, "yyyyMMdd");
    }

    public static String afterDateHourToStr(Integer hour){
        Date date = new Date();
        Long l = date.getTime()+1000*60*60*hour;
        date.setTime(l);
        return DateToStr(date, "yyyyMMdd");
    }

    public static String beforeDateToStr(Integer days){
        Date date = new Date();
        Long l = date.getTime()-1000*60*60*24*days;