任务 13500

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/DateUtils.java

@@ -465,6 +465,62 @@ public class DateUtils {
     }
 
     /**
+     * 获取两个日期（不含时分秒）相差的小时
+     *
+     * @param startDate
+     * @param endDate
+     * @return
+     * @throws ParseException
+     */
+    public static int dateBetweenNew(Date startDate, Date endDate) throws ParseException {
+        Date dateStart = dateParse(dateFormat(startDate, DATE_PATTERN), DATE_PATTERN);
+        Date dateEnd = dateParse(dateFormat(endDate, DATE_PATTERN), DATE_PATTERN);
+        return (int) ((dateEnd.getTime() - dateStart.getTime()) / 1000 / 60 / 60);
+    }
+
+    /**
+     * 获取两个日期（不含时分秒）相差的半小时
+     *
+     * @param startDate
+     * @param endDate
+     * @return
+     * @throws ParseException
+     */
+    public static int dateBetweenNew1(Date startDate, Date endDate) throws ParseException {
+        Date dateStart = dateParse(dateFormat(startDate, DATE_PATTERN), DATE_PATTERN);
+        Date dateEnd = dateParse(dateFormat(endDate, DATE_PATTERN), DATE_PATTERN);
+        return (int) ((dateEnd.getTime() - dateStart.getTime()) / 1000 / 60 / 30);
+    }
+
+    /**
+     * 获取两个日期（不含时分秒）相差的二小时
+     *
+     * @param startDate
+     * @param endDate
+     * @return
+     * @throws ParseException
+     */
+    public static int dateBetweenNew2(Date startDate, Date endDate) throws ParseException {
+        Date dateStart = dateParse(dateFormat(startDate, DATE_PATTERN), DATE_PATTERN);
+        Date dateEnd = dateParse(dateFormat(endDate, DATE_PATTERN), DATE_PATTERN);
+        return (int) ((dateEnd.getTime() - dateStart.getTime()) / 1000 / 60 / 120);
+    }
+
+    /**
+     * 获取两个日期（不含时分秒）相差的四小时
+     *
+     * @param startDate
+     * @param endDate
+     * @return
+     * @throws ParseException
+     */
+    public static int dateBetweenNew3(Date startDate, Date endDate) throws ParseException {
+        Date dateStart = dateParse(dateFormat(startDate, DATE_PATTERN), DATE_PATTERN);
+        Date dateEnd = dateParse(dateFormat(endDate, DATE_PATTERN), DATE_PATTERN);
+        return (int) ((dateEnd.getTime() - dateStart.getTime()) / 1000 / 60 / 240);
+    }
+
+    /**
      * 获取两个日期（不含时分秒）相差的天数，包含今天
      *
      * @param startDate