解决冲突

src/main/java/com/diagbot/util/CoreUtil.java

@@ -1297,54 +1297,6 @@ public class CoreUtil {
         return flag;
     }
 
-    /**
-     * 时间差值（endDateStr - startDateStr）和指定分钟数进行比较
-     *
-     * @param startDateStr 开始时间
-     * @param endDateStr   结束时间
-     * @param minute       分钟
-     * @param hasEqual     是否包含等于
-     * @param abs          是否加绝对值
-     * @return 返回值：-1：无法比较或出错，0：时间差超出范围，1：时间差在范围内
-     */
-    public static int compareTime(String startDateStr, String endDateStr, Long minute, boolean hasEqual, boolean abs) {
-        int flag = -1;
-        if (StringUtil.isBlank(startDateStr) || StringUtil.isBlank(endDateStr)) {
-            return flag;
-        }
-        try {
-            Date startDate = CatalogueUtil.parseStringDate(startDateStr);
-            Date endDate = CatalogueUtil.parseStringDate(endDateStr);
-            Long timeStart = startDate.getTime();
-            Long timeEnd = endDate.getTime();
-            Long timeDiff = timeEnd - timeStart;// 时间差
-            // 是否加绝对值
-            if (abs) {
-                timeDiff = Math.abs(timeDiff);// 时间差绝对值
-            } else {
-                if (timeDiff < 0) {
-                    return flag;
-                }
-            }
-            if (hasEqual) {
-                if (timeDiff >= minute * 1000 * 60) {
-                    flag = 0;
-                } else {
-                    flag = 1;
-                }
-            } else {
-                if (timeDiff > minute * 1000 * 60) {
-                    flag = 0;
-                } else {
-                    flag = 1;
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return flag;
-    }
-
     /**
      * 比较时间，endDateStr >= startDateStr
      * @param startDateStr