Merge remote-tracking branch 'origin/master'

jiangping

2025-03-11 bdad06349901c13f8ce2c9381a3ace2b7f80c652

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

@@ -672,6 +672,27 @@
            throw e;
        }
    }
    public static String getTimeStrBySecond(Long seconds)  {
        String returnTime ="0时0分0秒";
        long longHour = 0;
        long longMinu = 0;
        long longSec =seconds ==null?0:seconds;
        try {
            if (longSec == 0) {
                returnTime = "0时0分0秒";
                return returnTime;
            }
            longHour = longSec / 3600; // 取得小时数
            longSec = longSec % 3600; // 取得余下的秒
            longMinu = longSec / 60; // 取得分数
            longSec = longSec % 60; // 取得余下的秒
            returnTime = longHour + "时" + longMinu + "分" + longSec + "秒";
            return returnTime;
        } catch (Exception e) {
              e.printStackTrace();
        }
        return returnTime;
    }

    /**
     * Descrption:取得当前日期,格式为:yyyy-MM-dd HH:mm:ss
@@ -2911,8 +2932,8 @@
//            System.out.println(DateUtil.afterMinutesDate(-5));


            System.out.println(DateUtil.getBeforMonthStr(new Date(),1));
            System.out.println(DateUtil.getBeforMonthStr(new Date(),12));
            System.out.println(getPlusTime2(DateUtil.addMonthToDate(new Date(),-1)));
//            System.out.println(DateUtil.getBeforMonthStr(new Date(),12));

//            List<Date> list =getThisMonthDateList();
//            for(Date d :list){