Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-07-31 dde29a93461a81940dbef9a65c60fa2690f2097e

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java

@@ -795,12 +795,58 @@
        }
    }

    /**
     * 获取当前月第一天
     * @return
     */
    public static String getFirstDayOfMonthString() {
        Calendar calendar = Calendar.getInstance();

        calendar.add(Calendar.MONTH, 0);

        calendar.set(Calendar.DAY_OF_MONTH, 1);
        // 格式化日期
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        return sdf.format(calendar.getTime())+" 00:00:00";
    }

    /**
     * 获取当前月最后一天
     * @return
     */
    public static String getLastDayOfMonthString() {
        Calendar calendar = Calendar.getInstance();

        calendar.add(Calendar.MONTH, 1);

        calendar.set(Calendar.DAY_OF_MONTH, 0);
        // 格式化日期
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        return sdf.format(calendar.getTime())+" 23:59:59";
    }

    /**
     * 获取当前时间（年月日）
     * @return
     */
    public static String getDayOfMonthString() {
        Calendar today = Calendar.getInstance();
        today.set(Calendar.HOUR, 0);
        today.set(Calendar.MINUTE, 0);
        today.set(Calendar.SECOND, 0);
        today.set(Calendar.MILLISECOND, 0);
        // 格式化日期
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        return sdf.format(today.getTime());
    }



    public static void main(String[]args)throws Exception{
//        Date date= new Date();
//        Date after = new Date();
//        System.out.println(calTimeDifference(date,after));
//        System.out.println(getFirstDayOfMonthString());
//        System.out.println(getDayOfMonthString());

    }
}