diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/model/RuleStorageController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/model/RuleStorageController.java index 7924078..02c8a79 100644 --- a/zhitan-admin/src/main/java/com/zhitan/web/controller/model/RuleStorageController.java +++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/model/RuleStorageController.java @@ -103,7 +103,6 @@ public class RuleStorageController extends BaseController { private List getDefaultIndexStorage() { List calcPeriods = new ArrayList<>(); getPeriod(calcPeriods, TimeType.HOUR); - getPeriod(calcPeriods, TimeType.SCHEDULING); getPeriod(calcPeriods, TimeType.DAY); getPeriod(calcPeriods, TimeType.MONTH); getPeriod(calcPeriods, TimeType.YEAR); diff --git a/zhitan-common/src/main/java/com/zhitan/common/enums/TimeType.java b/zhitan-common/src/main/java/com/zhitan/common/enums/TimeType.java index 0f1e0c5..7224155 100644 --- a/zhitan-common/src/main/java/com/zhitan/common/enums/TimeType.java +++ b/zhitan-common/src/main/java/com/zhitan/common/enums/TimeType.java @@ -25,9 +25,5 @@ public enum TimeType { /** * 季度 */ - QUARTER, - /** - * 排班 - */ - SCHEDULING + QUARTER } diff --git a/zhitan-common/src/main/java/com/zhitan/common/utils/time/TimeManager.java b/zhitan-common/src/main/java/com/zhitan/common/utils/time/TimeManager.java index 97ffa06..4f3a90f 100644 --- a/zhitan-common/src/main/java/com/zhitan/common/utils/time/TimeManager.java +++ b/zhitan-common/src/main/java/com/zhitan/common/utils/time/TimeManager.java @@ -10,7 +10,7 @@ import java.util.Date; public class TimeManager { public static final TimeType[] typeArray = {TimeType.LIVE, TimeType.DAY, TimeType.HOUR, - TimeType.MONTH, TimeType.SCHEDULING, TimeType.YEAR}; + TimeType.MONTH, TimeType.YEAR}; private static final DateTimeFormatter pastDataFormat = DateTimeFormat.forPattern ("yyyyMMddHHmmss"); private static final DateTimeFormatter hourFormat = DateTimeFormat.forPattern("yyyyMMddHH");