|
@@ -9,6 +9,7 @@ import lombok.Getter;
|
|
import lombok.Setter;
|
|
import lombok.Setter;
|
|
|
|
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
|
|
+import java.util.Calendar;
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
@@ -120,6 +121,7 @@ public class CatalogueUtil {
|
|
|
|
|
|
/**
|
|
/**
|
|
* 对比两个String类型的Date是否一致
|
|
* 对比两个String类型的Date是否一致
|
|
|
|
+ *
|
|
* @param firstDateStr
|
|
* @param firstDateStr
|
|
* @param secondDateStr
|
|
* @param secondDateStr
|
|
* @param datePattren
|
|
* @param datePattren
|
|
@@ -139,19 +141,20 @@ public class CatalogueUtil {
|
|
|
|
|
|
/**
|
|
/**
|
|
* 对比两个String类型的Date先后
|
|
* 对比两个String类型的Date先后
|
|
|
|
+ *
|
|
* @param firstDateStr
|
|
* @param firstDateStr
|
|
* @param secondDateStr
|
|
* @param secondDateStr
|
|
- * @param symbol =1 -> firstDateStr比secondDateStr时间早
|
|
|
|
- * @param symbol =-1 -> firstDateStr比secondDateStr时间晚
|
|
|
|
|
|
+ * @param symbol =1 -> firstDateStr比secondDateStr时间早
|
|
|
|
+ * @param symbol =-1 -> firstDateStr比secondDateStr时间晚
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- public static boolean compareDate(String firstDateStr, String secondDateStr,int symbol) {
|
|
|
|
|
|
+ public static boolean compareDate(String firstDateStr, String secondDateStr, int symbol) {
|
|
if (!isEmpty(firstDateStr) && !isEmpty(secondDateStr)) {
|
|
if (!isEmpty(firstDateStr) && !isEmpty(secondDateStr)) {
|
|
Date firstDate = StringUtil.parseDateTime(firstDateStr);
|
|
Date firstDate = StringUtil.parseDateTime(firstDateStr);
|
|
Date secondDate = StringUtil.parseDateTime(secondDateStr);
|
|
Date secondDate = StringUtil.parseDateTime(secondDateStr);
|
|
- if (symbol == 1){
|
|
|
|
|
|
+ if (symbol == 1) {
|
|
return firstDate != null && secondDate != null && firstDate.before(secondDate);
|
|
return firstDate != null && secondDate != null && firstDate.before(secondDate);
|
|
- } else if (symbol == -1){
|
|
|
|
|
|
+ } else if (symbol == -1) {
|
|
return firstDate != null && secondDate != null && firstDate.after(secondDate);
|
|
return firstDate != null && secondDate != null && firstDate.after(secondDate);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -160,6 +163,7 @@ public class CatalogueUtil {
|
|
|
|
|
|
/**
|
|
/**
|
|
* 对比两个去除了特殊字符的字符串是否一致
|
|
* 对比两个去除了特殊字符的字符串是否一致
|
|
|
|
+ *
|
|
* @param firstStr
|
|
* @param firstStr
|
|
* @param secondStr
|
|
* @param secondStr
|
|
* @return
|
|
* @return
|
|
@@ -173,4 +177,37 @@ public class CatalogueUtil {
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 比较时间,以分钟为单位
|
|
|
|
+ * endDate比startDate多diff分钟则返回true
|
|
|
|
+ *
|
|
|
|
+ * @param startDate
|
|
|
|
+ * @param endDate
|
|
|
|
+ * @param diff
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ public static boolean compareTime(Date startDate, Date endDate, Long diff) {
|
|
|
|
+ boolean overtime = false;
|
|
|
|
+ if (startDate == null || endDate == null) {
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
+ Calendar calendar_s = Calendar.getInstance();
|
|
|
|
+ Calendar calendar_e = Calendar.getInstance();
|
|
|
|
+ Long time_s, time_e, time_diff;
|
|
|
|
+ try {
|
|
|
|
+ calendar_s.setTime(startDate);
|
|
|
|
+ calendar_e.setTime(endDate);
|
|
|
|
+
|
|
|
|
+ time_s = calendar_s.getTimeInMillis();
|
|
|
|
+ time_e = calendar_e.getTimeInMillis();
|
|
|
|
+
|
|
|
|
+ time_diff = (time_e - time_s) / (1000 * 60);
|
|
|
|
+ if (time_diff >= diff) {
|
|
|
|
+ overtime = true;
|
|
|
|
+ }
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ e.printStackTrace();
|
|
|
|
+ }
|
|
|
|
+ return overtime;
|
|
|
|
+ }
|
|
}
|
|
}
|