若依 3.0

ruoyi-quartz/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ruoyi</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>3.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-quartz</artifactId>
+
+    <description>
+        quartz定时任务
+    </description>
+
+    <dependencies>
+
+        <!-- 定时任务 -->
+        <dependency>
+            <groupId>org.quartz-scheduler</groupId>
+            <artifactId>quartz</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.mchange</groupId>
+                    <artifactId>c3p0</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
\ No newline at end of file

ruoyi/src/main/java/com/ruoyi/framework/config/ScheduleConfig.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java

-package com.ruoyi.framework.config;
+package com.ruoyi.quartz.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java

-package com.ruoyi.project.monitor.controller;
+package com.ruoyi.quartz.controller;
 
 import java.util.List;
 import org.quartz.SchedulerException;
@@ -12,17 +12,17 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.job.TaskException;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.job.CronUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.monitor.domain.SysJob;
-import com.ruoyi.project.monitor.service.ISysJobService;
+import com.ruoyi.quartz.domain.SysJob;
+import com.ruoyi.quartz.service.ISysJobService;
+import com.ruoyi.quartz.util.CronUtils;
 
 /**
  * 调度任务信息操作处理

ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java

-package com.ruoyi.project.monitor.controller;
+package com.ruoyi.quartz.controller;
 
 import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.monitor.domain.SysJobLog;
-import com.ruoyi.project.monitor.service.ISysJobLogService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.quartz.domain.SysJobLog;
+import com.ruoyi.quartz.service.ISysJobLogService;
 
 /**
  * 调度日志操作处理

ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysJob.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java

-package com.ruoyi.project.monitor.domain;
+package com.ruoyi.quartz.domain;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -7,12 +7,12 @@ import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.ColumnType;
 import com.ruoyi.common.constant.ScheduleConstants;
+import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.job.CronUtils;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
-import com.ruoyi.framework.web.domain.BaseEntity;
+import com.ruoyi.quartz.util.CronUtils;
 
 /**
  * 定时任务调度表 sys_job

ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysJobLog.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java

-package com.ruoyi.project.monitor.domain;
+package com.ruoyi.quartz.domain;
 
 import java.util.Date;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.framework.web.domain.BaseEntity;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 定时任务调度日志表 sys_job_log

ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysJobLogMapper.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java

-package com.ruoyi.project.monitor.mapper;
+package com.ruoyi.quartz.mapper;
 
 import java.util.List;
-import com.ruoyi.project.monitor.domain.SysJobLog;
+import com.ruoyi.quartz.domain.SysJobLog;
 
 /**
  * 调度任务日志信息 数据层

ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysJobMapper.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java

-package com.ruoyi.project.monitor.mapper;
+package com.ruoyi.quartz.mapper;
 
 import java.util.List;
-import com.ruoyi.project.monitor.domain.SysJob;
+import com.ruoyi.quartz.domain.SysJob;
 
 /**
  * 调度任务信息 数据层

ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysJobLogService.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java

-package com.ruoyi.project.monitor.service;
+package com.ruoyi.quartz.service;
 
 import java.util.List;
-import com.ruoyi.project.monitor.domain.SysJobLog;
+import com.ruoyi.quartz.domain.SysJobLog;
 
 /**
  * 定时任务调度日志信息信息 服务层

ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysJobService.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java

-package com.ruoyi.project.monitor.service;
+package com.ruoyi.quartz.service;
 
 import java.util.List;
 import org.quartz.SchedulerException;
 import com.ruoyi.common.exception.job.TaskException;
-import com.ruoyi.project.monitor.domain.SysJob;
+import com.ruoyi.quartz.domain.SysJob;
 
 /**
  * 定时任务调度信息信息 服务层

ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobLogServiceImpl.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java

-package com.ruoyi.project.monitor.service.impl;
+package com.ruoyi.quartz.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.project.monitor.domain.SysJobLog;
-import com.ruoyi.project.monitor.mapper.SysJobLogMapper;
-import com.ruoyi.project.monitor.service.ISysJobLogService;
+import com.ruoyi.quartz.domain.SysJobLog;
+import com.ruoyi.quartz.mapper.SysJobLogMapper;
+import com.ruoyi.quartz.service.ISysJobLogService;
 
 /**
  * 定时任务调度日志信息 服务层

ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java

-package com.ruoyi.project.monitor.service.impl;
+package com.ruoyi.quartz.service.impl;
 
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -11,11 +11,11 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.ruoyi.common.constant.ScheduleConstants;
 import com.ruoyi.common.exception.job.TaskException;
-import com.ruoyi.common.utils.job.CronUtils;
-import com.ruoyi.common.utils.job.ScheduleUtils;
-import com.ruoyi.project.monitor.domain.SysJob;
-import com.ruoyi.project.monitor.mapper.SysJobMapper;
-import com.ruoyi.project.monitor.service.ISysJobService;
+import com.ruoyi.quartz.domain.SysJob;
+import com.ruoyi.quartz.mapper.SysJobMapper;
+import com.ruoyi.quartz.service.ISysJobService;
+import com.ruoyi.quartz.util.CronUtils;
+import com.ruoyi.quartz.util.ScheduleUtils;
 
 /**
  * 定时任务调度信息 服务层

ruoyi/src/main/java/com/ruoyi/framework/task/RyTask.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

-package com.ruoyi.framework.task;
+package com.ruoyi.quartz.task;
 
 import org.springframework.stereotype.Component;
 import com.ruoyi.common.utils.StringUtils;

ruoyi/src/main/java/com/ruoyi/common/utils/job/AbstractQuartzJob.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java

-package com.ruoyi.common.utils.job;
+package com.ruoyi.quartz.util;
 
 import java.util.Date;
 import org.quartz.Job;
@@ -12,9 +12,9 @@ import com.ruoyi.common.utils.ExceptionUtil;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.project.monitor.domain.SysJob;
-import com.ruoyi.project.monitor.domain.SysJobLog;
-import com.ruoyi.project.monitor.service.ISysJobLogService;
+import com.ruoyi.quartz.domain.SysJob;
+import com.ruoyi.quartz.domain.SysJobLog;
+import com.ruoyi.quartz.service.ISysJobLogService;
 
 /**
  * 抽象quartz调用

ruoyi/src/main/java/com/ruoyi/common/utils/job/CronUtils.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java

-package com.ruoyi.common.utils.job;
+package com.ruoyi.quartz.util;
 
 import java.text.ParseException;
 import java.util.Date;