git ch

k94314517

2024-04-12 e63e56a1b45bc2025147f7f91d248f93a43deb7a

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

@@ -1292,6 +1292,59 @@
        return days;
    }

    public static int calculateBetween(Date newDate, Date oldDate,Integer type){
        Calendar calo = Calendar.getInstance();
        Calendar caln = Calendar.getInstance();
        calo.setTime(oldDate);
        caln.setTime(newDate);
        if(type==0||type==1){
            return    calculateDaysBetweenDates(caln, calo)  + 1 ;
        }else if(type==2){

            int day = caln.get(Calendar.DATE);
            if(day == 1){
                return    calculateMonthsBetweenDates(caln, calo) + 1;
            }else{
                return    calculateMonthsBetweenDates(caln, calo);
            }

        }else if(type==3){
            return    calculateYearsBetweenDates(caln, calo) + 1;
        }
        return -1;
    }



    public static int calculateDaysBetweenDates(Calendar startDate, Calendar endDate) {
        long timeDiffInMillis = Math.abs(endDate.getTimeInMillis() - startDate.getTimeInMillis());
        return (int)(timeDiffInMillis / (24 * 60 * 60 * 1000));
    }

    public static int calculateMonthsBetweenDates(Calendar startDate, Calendar endDate) {
        int yearDiff = endDate.get(Calendar.YEAR) - startDate.get(Calendar.YEAR);
        int monthDiff = endDate.get(Calendar.MONTH) - startDate.get(Calendar.MONTH);
        if (monthDiff < 0 || (monthDiff == 0 && endDate.get(Calendar.DAY_OF_MONTH) < startDate.get(Calendar.DAY_OF_MONTH))) {
            yearDiff--;
            monthDiff += 12;
        }
        return yearDiff * 12 + monthDiff;
    }

    public static int calculateYearsBetweenDates(Calendar startDate, Calendar endDate) {
        int yearDiff = endDate.get(Calendar.YEAR) - startDate.get(Calendar.YEAR);
        if (yearDiff > 0 && (startDate.get(Calendar.MONTH) >= endDate.get(Calendar.MONTH) ||
                (startDate.get(Calendar.MONTH) == endDate.get(Calendar.MONTH) && startDate.get(Calendar.DAY_OF_MONTH) <= endDate.get(Calendar.DAY_OF_MONTH)))) {
            yearDiff--;
        } else if (yearDiff < 0 && (startDate.get(Calendar.MONTH) <= endDate.get(Calendar.MONTH) ||
                (startDate.get(Calendar.MONTH) == endDate.get(Calendar.MONTH) && startDate.get(Calendar.DAY_OF_MONTH) >= endDate.get(Calendar.DAY_OF_MONTH)))) {
            yearDiff++;
        }
        return yearDiff;
    }



    /**
     * 取得与原日期相差一定天数的日期，返回Date型日期
     *
@@ -2748,13 +2801,6 @@
        return sdfLongTimePlus.parse(sdfLongTimePlus.format(date));
    }

    public static void main(String[] args) {
        try {
            System.out.println(RandomStringUtils.randomNumeric(3));
        } catch (Exception ex) {
            ex.printStackTrace();
        }
    }

    /**
     *
@@ -2859,6 +2905,7 @@
        return nowDateString;
    }


    /**
     * @ author zhangyong @ 获取当月的第一天，2009-05-01
     */
@@ -2910,9 +2957,14 @@
        return w;
    }

    public static Long twoDaysBetween(Date beginDate, Date endDate) throws ParseException {
    public static Long twoDaysBetween(Date beginDate, Date endDate) {
        long minute = (endDate.getTime() - beginDate.getTime()) / (60 * 1000);
        return minute;
    }

    public static Integer daysBetweenDay(Date beginDate, Date endDate) {
        long day = (endDate.getTime() - beginDate.getTime()) / (60 * 1000 * 60 * 24);
        return Math.toIntExact(day);
    }

    /**
@@ -2942,6 +2994,21 @@
        calendar.add(Calendar.DATE, days);//
        return calendar.getTime();
    }

    /**
     * 获取指定日期的下个月第一天
     * @param date
     * @return
     */
    public static Date getNextMonthFirst(Date date){
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(date);
        calendar.add(Calendar.MONTH, 1); // 将日历的月份增加1
        calendar.set(Calendar.DAY_OF_MONTH, 1); // 设置为下个月的第一天
        return calendar.getTime();
    }




    public static String afterDateToStr(Integer days){
@@ -3005,4 +3072,142 @@
        cal.add(Calendar.MINUTE,minutes);
        return cal.getTime();
    }


    /**
     * 计算多少自然年/月/日后的日期
     * @param startDate 开始日期
     * @param type  0=日；1=月；2=年；
     * @param cycle 周期  X月
     * @return
     */
    public static Date afterDateByType(Date startDate,Integer type,Integer cycle){
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(startDate);
        if(type==0){
            calendar.add(Calendar.DATE, cycle);
        }else if(type==1){
            calendar.add(Calendar.MONTH, cycle);
        }else if(type == 2) {
            calendar.add(Calendar.YEAR, cycle);
        }
        return calendar.getTime();
    }



    public static Integer monthDays(Date date){
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(date);
        // 获取当前年份、月份（注意月份从0开始计算）
        int year = calendar.get(Calendar.YEAR);
        int month = calendar.get(Calendar.MONTH) + 1;
        // 根据年份和月份判断闰年情况
        boolean isLeapYear = (year % 4 == 0 && year % 100 != 0) || (year % 400 == 0);

        // 根据不同月份设定每个月的天数
        switch (month) {
            case 2:
                if (isLeapYear) {
                    return 29;
                } else {
                    return 28;
                }
            case 4:
            case 6:
            case 9:
            case 11:
                 return 30;
            default:
                 return 31;
        }
    }


    /**
     * 拼接日期数据
     * @param date
     * @param optType   1:每日开始 2：每日结束 3:昨日结束
     * @return
     */
    public static Date getMontageDate(Date date ,Integer optType) {
        String strShortDate = DateUtil.dateToString(date,"yyyy-MM-dd");
        if(optType.equals(1)){
            return DateUtil.StringToDate(strShortDate +" 00:00:00");
        }else if(optType.equals(2)){
            return DateUtil.StringToDate(strShortDate +" 23:59:59");
        }else if(optType.equals(3)){
            strShortDate = DateUtil.dateToString(DateUtil.getDateBetween(date,-1),"yyyy-MM-dd");
            return DateUtil.StringToDate(strShortDate +" 23:59:59");
        }else{
            return null;
        }
    }


    public static void main(String[] args) {
//       System.out.println(DateUtil.DateToStr(DateUtil.afterDateByType(
//               DateUtil.stringToDate("2024-02-01","yyyy-MM-dd")
//               ,1,1),"yyyy-MM-dd HH:mm:ss"));

//        System.out.println( DateUtil.daysBetweenDates(DateUtil.stringToDate("2024-02-29","yyyy-MM-dd"),
//                DateUtil.stringToDate("2024-02-01","yyyy-MM-dd"))
//        );
//
//        System.out.println(DateUtil.calculateBetween(DateUtil.StringToDate("2024-02-29 23:59:59"),DateUtil.StringToDate("2024-02-01 00:00:00"),0));


//        System.out.println(
//                DateUtil.DateToStr(
//
//                DateUtil.getMontageDate(DateUtil.StringToDate("2024-02-29 21:59:59"),1) ,"yyyy-MM-dd HH:mm:ss"
//                )
//        );
//
//
//
//        System.out.println(
//
//                DateUtil.DateToStr(
//
//                        DateUtil.getMontageDate(DateUtil.StringToDate("2024-02-29 21:59:59"),2) ,"yyyy-MM-dd HH:mm:ss"
//                )
//
//        );
//
//        System.out.println(
//
//                DateUtil.DateToStr(
//
//                        DateUtil.getMontageDate(DateUtil.StringToDate("2024-02-29 21:59:59"),3) ,"yyyy-MM-dd HH:mm:ss"
//                )

//        );
//
//        Calendar calo = Calendar.getInstance();
//        Calendar caln = Calendar.getInstance(); // ,"yyyy-MM-dd HH:mm:ss"
//        caln.setTime(DateUtil.StringToDate("2024-02-29 23:59:59"));
//        calo.setTime(DateUtil.StringToDate("2024-02-01 00:00:00"));
//        System.out.println( DateUtil.calculateDaysBetweenDates(calo,caln));

        System.out.println(
                DateUtil.DateToStr(
                        DateUtil.getNextMonthFirst(new Date())
                        ,"yyyy-MM-dd HH:mm:ss")

        );
        System.out.println(
                DateUtil.DateToStr(
                        DateUtil.getNextMonthFirst(
                                DateUtil.StringToDate("2024-12-29 21:59:59")
                        )
                        ,"yyyy-MM-dd HH:mm:ss")

        );



    }


}