修改预警规则

src/main/java/com/unissoft/job/ToBeDoneJob.java

@@ -125,7 +125,7 @@ public class ToBeDoneJob implements Job, Serializable {
             startDate = DateUtil.getCurrMinute();
         } else if(timeType.equals(GrainConstant.STR_HOUR)) {
             startDate = DateUtil.getCurrHour();
-        } else if(timeType.equals(GrainConstant.STR_DAY)) {
+        } else if(timeType.equals(GrainConstant.STR_DAY) || timeType.equals(GrainConstant.STR_WEEKDAY)) {
             startDate = DateUtil.getCurrDate();
         } else if(timeType.equals(GrainConstant.STR_WEEK)) {
             startDate = DateUtil.getCurrDate();
@@ -152,7 +152,7 @@ public class ToBeDoneJob implements Job, Serializable {
             date = DateUtils.addMinutes(baseDate, timeNum);
         } else if(timeType.equals(GrainConstant.STR_HOUR)) {
             date = DateUtils.addHours(baseDate, timeNum);
-        } else if(timeType.equals(GrainConstant.STR_DAY)) {
+        } else if(timeType.equals(GrainConstant.STR_DAY) || timeType.equals(GrainConstant.STR_WEEKDAY)) {
             date = DateUtils.addDays(baseDate, timeNum);
         } else if(timeType.equals(GrainConstant.STR_WEEK)) {
             date = DateUtils.addWeeks(baseDate, timeNum);
@@ -172,8 +172,8 @@ public class ToBeDoneJob implements Job, Serializable {
         Date warnDate = computeDate(endDate, timeType, 0 - timeNum);
 
         //
-        if(timeType.equals(GrainConstant.STR_DAY) || timeType.equals(GrainConstant.STR_WEEK) || timeType.equals(GrainConstant.STR_MONTH)
-                || timeType.equals(GrainConstant.STR_SEASON) || timeType.equals(GrainConstant.STR_YEAR)) {
+        if(timeType.equals(GrainConstant.STR_DAY) || timeType.equals(GrainConstant.STR_WEEKDAY) || timeType.equals(GrainConstant.STR_WEEK)
+                || timeType.equals(GrainConstant.STR_MONTH) || timeType.equals(GrainConstant.STR_SEASON) || timeType.equals(GrainConstant.STR_YEAR)) {
             //如果检查周期是 天、星期、月、季、年为单位，则计算为当天的工作时间8点整
             warnDate = DateUtil.getSpecificDate(warnDate,8, 0, 0);
         }

src/main/java/com/unissoft/service/impl/QuartzServiceImpl.java

@@ -13,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.json.JSONObject;
 import org.quartz.*;
+import org.quartz.impl.calendar.WeeklyCalendar;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -37,6 +38,9 @@ public class QuartzServiceImpl implements QuartzService {
     public void startScheduler() {
         try {
             scheduler.start();
+            //
+            WeeklyCalendar weeklyCalendar = new WeeklyCalendar();
+            scheduler.addCalendar("weekly", weeklyCalendar, false, false);
         } catch (SchedulerException e) {
             e.printStackTrace();
         }

src/main/java/com/unissoft/service/impl/SysEarlyWarningServiceImpl.java

@@ -343,10 +343,15 @@ public class SysEarlyWarningServiceImpl extends ServiceImpl<SysEarlyWarningMappe
 
         CalendarIntervalScheduleBuilder calendarIntervalScheduleBuilder = getCalendarIntervalScheduleBuilder(timePeriodParam[1], Integer.parseInt(timePeriodParam[0]));
         //
-        CalendarIntervalTrigger toBeDoneCalendarTrigger = newTrigger().withIdentity(triggerName, group)
+        TriggerBuilder<CalendarIntervalTrigger> calendarIntervalTriggerBuilder = newTrigger().withIdentity(triggerName, group)
                 .startAt(startAt)//设置开始调度时间
-                .withSchedule(calendarIntervalScheduleBuilder)//设置调度频率
-                .build();
+                .withSchedule(calendarIntervalScheduleBuilder);//设置调度频率
+
+        if(timePeriodParam[1].equals(GrainConstant.STR_WEEKDAY)) {
+            calendarIntervalTriggerBuilder.modifiedByCalendar("weekly");//weekly在Scheduler初始化时，已注册
+        }
+
+        CalendarIntervalTrigger toBeDoneCalendarTrigger = calendarIntervalTriggerBuilder.build();
 
         return toBeDoneCalendarTrigger;
     }
@@ -377,9 +382,9 @@ public class SysEarlyWarningServiceImpl extends ServiceImpl<SysEarlyWarningMappe
         String periodType = value[1];
 
         if(! periodType.equals(GrainConstant.STR_SECOND) && ! periodType.equals(GrainConstant.STR_MINUTE) && ! periodType.equals(GrainConstant.STR_HOUR) &&
-                ! periodType.equals(GrainConstant.STR_DAY) && ! periodType.equals(GrainConstant.STR_WEEK) && ! periodType.equals(GrainConstant.STR_MONTH) &&
-                ! periodType.equals(GrainConstant.STR_SEASON) && ! periodType.equals(GrainConstant.STR_YEAR) ) {
-            throw new IllegalArgumentException(paramDesc + "值'_'后的值必须为second、minute、hour、day、week、month、season、year中的一种");
+                ! periodType.equals(GrainConstant.STR_DAY) && ! periodType.equals(GrainConstant.STR_WEEKDAY) && ! periodType.equals(GrainConstant.STR_WEEK) &&
+                ! periodType.equals(GrainConstant.STR_MONTH) && ! periodType.equals(GrainConstant.STR_SEASON) && ! periodType.equals(GrainConstant.STR_YEAR) ) {
+            throw new IllegalArgumentException(paramDesc + "值'_'后的值必须为second、minute、hour、day、weekday、week、month、season、year中的一种");
         }
 
     }
@@ -400,7 +405,7 @@ public class SysEarlyWarningServiceImpl extends ServiceImpl<SysEarlyWarningMappe
             startAt = DateUtil.getCurrMinute();
         } else if(periodType.equals(GrainConstant.STR_HOUR)) {
             startAt = DateUtil.getCurrHour();
-        } else if(periodType.equals(GrainConstant.STR_DAY)) {
+        } else if(periodType.equals(GrainConstant.STR_DAY) || periodType.equals(GrainConstant.STR_WEEKDAY)) {
             startAt = DateUtil.getCurrDate();
         } else if(periodType.equals(GrainConstant.STR_WEEK)) {
             startAt = DateUtil.getFirstDateOfCurrWeek();
@@ -486,7 +491,7 @@ public class SysEarlyWarningServiceImpl extends ServiceImpl<SysEarlyWarningMappe
             return calendarIntervalSchedule().withIntervalInMonths(periodNum);
         } else if(periodType.equals(GrainConstant.STR_WEEK)) {
             return calendarIntervalSchedule().withIntervalInWeeks(periodNum);
-        } else if(periodType.equals(GrainConstant.STR_DAY)) {
+        } else if(periodType.equals(GrainConstant.STR_DAY) || periodType.equals(GrainConstant.STR_WEEKDAY)) {
             return calendarIntervalSchedule().withIntervalInDays(periodNum);
         } else if(periodType.equals(GrainConstant.STR_HOUR)) {
             return calendarIntervalSchedule().withIntervalInHours(periodNum);