hhyykk/RuoYi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改菜单权限显示问题

Browse Source
This commit is contained in:
RuoYi
2019-06-17 13:29:40 +08:00
parent 91dd624048
commit ff67062c7f
7 changed files with 99 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java
View File

@ -2,7 +2,6 @@ package com.ruoyi.quartz.service.impl;
import java.util.List;
import javax.annotation.PostConstruct;
import org.quartz.CronTrigger;
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired;
@ -40,16 +39,7 @@ public class SysJobServiceImpl implements ISysJobService
List<SysJob> jobList = jobMapper.selectJobAll();
for (SysJob job : jobList)
{
CronTrigger cronTrigger = ScheduleUtils.getCronTrigger(scheduler, job.getJobId());
// 如果不存在，则创建
if (cronTrigger == null)
{
ScheduleUtils.createScheduleJob(scheduler, job);
}
else
{
ScheduleUtils.updateScheduleJob(scheduler, job);
}
ScheduleUtils.updateScheduleJob(scheduler, job);
}
}

22
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
View File

@ -92,6 +92,13 @@ public class ScheduleUtils
// 放入参数，运行时的方法可以获取
jobDetail.getJobDataMap().put(ScheduleConstants.TASK_PROPERTIES, job);
// 判断是否存在
if (scheduler.checkExists(getJobKey(job.getJobId())))
{
// 防止创建时存在数据问题 先移除，然后在执行创建操作
scheduler.deleteJob(getJobKey(job.getJobId()));
}
scheduler.scheduleJob(jobDetail, trigger);
// 暂停任务
@ -106,22 +113,7 @@ public class ScheduleUtils
*/
public static void updateScheduleJob(Scheduler scheduler, SysJob job) throws SchedulerException, TaskException
{
JobKey jobKey = getJobKey(job.getJobId());
// 判断是否存在
if (scheduler.checkExists(jobKey))
{
// 先移除，然后做更新操作
scheduler.deleteJob(jobKey);
}
createScheduleJob(scheduler, job);
// 暂停任务
if (job.getStatus().equals(ScheduleConstants.Status.PAUSE.getValue()))
{
pauseJob(scheduler, job.getJobId());
}
}
/**