Merge remote-tracking branch 'origin/master'

jiangping

2024-02-02 5eb40c731da8ccf235ba557f97a5e05a70a75308

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

@@ -1298,9 +1298,16 @@
        calo.setTime(oldDate);
        caln.setTime(newDate);
        if(type==0||type==1){
            return    calculateDaysBetweenDates(caln, calo) + 1;
            return    calculateDaysBetweenDates(caln, calo) ;
        }else if(type==2){
            return    calculateMonthsBetweenDates(caln, calo) + 1;

            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;
        }
@@ -2794,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();
        }
    }

    /**
     *
@@ -2904,6 +2904,7 @@
        String nowDateString = dateTypeToString(new Date(), fFormatStr);
        return nowDateString;
    }


    /**
     * @ author zhangyong @ 获取当月的第一天，2009-05-01
@@ -3056,4 +3057,124 @@
        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));
    }


}