Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

k94314517

2024-06-19 7e01b349c769045abeeeb6cf98241c8d60d0aeb3

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

@@ -1,11 +1,16 @@
package com.doumee.core.utils;


import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.Timestamp;
import java.text.DateFormat;
import java.text.DateFormatSymbols;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.Period;
import java.time.ZoneId;
import java.util.Calendar;
import java.util.Date;
import java.util.Enumeration;
@@ -2995,6 +3000,21 @@
        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){
        Date date = new Date();
@@ -3131,50 +3151,28 @@


    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));
    }

    /**
     * 获取相差的月数
     * @param sDate
     * @param eDate
     * @return
     */
    public static Integer getDifferenceMonths(Date sDate ,Date eDate) {
        LocalDate startDate = sDate.toInstant()
                .atZone(ZoneId.systemDefault())
                .toLocalDate();
        LocalDate endDate = eDate.toInstant()
                .atZone(ZoneId.systemDefault())
                .toLocalDate();
//        LocalDate startDate= LocalDate.of(2021,2,28);
//        LocalDate endDate =LocalDate.of(2022,4,5);
        Period period = Period.between(endDate,startDate);
        int months = period.getYears()* 12 + period.getMonths();
        return months + 1;
    }



}