item:双月报跨天统计频次bug修改

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

@@ -473,9 +473,10 @@ public class DateUtils {
      * @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);
+        Date dateStart = dateParse(dateFormat(startDate, DATE_TIME_PATTERN), DATE_TIME_PATTERN);
+        Date dateEnd = dateParse(dateFormat(endDate, DATE_TIME_PATTERN), DATE_TIME_PATTERN);
+        double ceil = Math.ceil((dateEnd.getTime() - dateStart.getTime()) * 1.0 / 1000 / 60 / 60);
+        return new Double(ceil).intValue() ;
     }
 
     /**
@@ -487,9 +488,10 @@ public class DateUtils {
      * @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);
+        Date dateStart = dateParse(dateFormat(startDate, DATE_TIME_PATTERN), DATE_TIME_PATTERN);
+        Date dateEnd = dateParse(dateFormat(endDate, DATE_TIME_PATTERN), DATE_TIME_PATTERN);
+        double ceil = Math.ceil((dateEnd.getTime() - dateStart.getTime()) * 1.0 / 1000 / 60 / 30);
+        return new Double(ceil).intValue() ;
     }
 
     /**
@@ -501,9 +503,10 @@ public class DateUtils {
      * @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);
+        Date dateStart = dateParse(dateFormat(startDate, DATE_TIME_PATTERN), DATE_TIME_PATTERN);
+        Date dateEnd = dateParse(dateFormat(endDate, DATE_TIME_PATTERN), DATE_TIME_PATTERN);
+        double ceil = Math.ceil((dateEnd.getTime() - dateStart.getTime()) * 1.0 / 1000 / 60 / 120);
+        return new Double(ceil).intValue() ;
     }
 
     /**
@@ -515,9 +518,10 @@ public class DateUtils {
      * @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);
+        Date dateStart = dateParse(dateFormat(startDate, DATE_TIME_PATTERN), DATE_TIME_PATTERN);
+        Date dateEnd = dateParse(dateFormat(endDate, DATE_TIME_PATTERN), DATE_TIME_PATTERN);
+        double ceil = Math.ceil((dateEnd.getTime() - dateStart.getTime()) * 1.0 / 1000 / 60 / 240);
+        return new Double(ceil).intValue() ;
     }
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmServiceImpl.java

@@ -812,13 +812,13 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
 
         // 计算平均每小时打压频率
         try {
-            int hour = DateUtils.dateBetweenNew(DateUtils.dateParse(startTime, null),DateUtils.dateParse(endTime, null));
+            int hour = DateUtils.dateBetweenNew(DateUtils.dateParse(startTime, DateUtils.DATE_TIME_PATTERN),DateUtils.dateParse(endTime, DateUtils.DATE_TIME_PATTERN));
 
-            int hafHour = DateUtils.dateBetweenNew1(DateUtils.dateParse(startTime, null),DateUtils.dateParse(endTime, null));
+            int hafHour = DateUtils.dateBetweenNew1(DateUtils.dateParse(startTime, DateUtils.DATE_TIME_PATTERN),DateUtils.dateParse(endTime, DateUtils.DATE_TIME_PATTERN));
 
-            int twoHour = DateUtils.dateBetweenNew2(DateUtils.dateParse(startTime, null),DateUtils.dateParse(endTime, null));
+            int twoHour = DateUtils.dateBetweenNew2(DateUtils.dateParse(startTime, DateUtils.DATE_TIME_PATTERN),DateUtils.dateParse(endTime, DateUtils.DATE_TIME_PATTERN));
 
-            int fourHour = DateUtils.dateBetweenNew3(DateUtils.dateParse(startTime, null),DateUtils.dateParse(endTime, null));
+            int fourHour = DateUtils.dateBetweenNew3(DateUtils.dateParse(startTime, DateUtils.DATE_TIME_PATTERN),DateUtils.dateParse(endTime, DateUtils.DATE_TIME_PATTERN));
             // 开始时间与结束时间为同一天时 给默认值
             if (hour == 0){
                 hour = DayHourEnum.hour.getNumber();