From fb9d7d116f7d38a265adce6629414835d4b5f4ac Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Fri, 26 Jul 2024 13:27:19 +0800 Subject: [PATCH] =?UTF-8?q?:rocket:=20feat(=E6=96=B0=E5=A2=9E):=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ResumeDto.java => QuartzOperationDto.java} | 2 +- .../entity/system/quartz/BlobTriggers.java | 40 ----------- .../bunny/entity/system/quartz/Calendars.java | 41 ----------- .../entity/system/quartz/CronTriggers.java | 46 ------------- .../entity/system/quartz/FiredTriggers.java | 61 ----------------- .../entity/system/quartz/JobDetails.java | 56 --------------- .../cn/bunny/entity/system/quartz/Locks.java | 39 ----------- .../system/quartz/PausedTriggerGrps.java | 39 ----------- .../entity/system/quartz/SchedulerState.java | 43 ------------ .../entity/system/quartz/SimpleTriggers.java | 48 ------------- .../entity/system/quartz/SimpropTriggers.java | 65 ------------------ .../bunny/entity/system/quartz/Triggers.java | 68 ------------------- .../controller/{web => }/IndexController.java | 2 +- .../{quartz => }/JobController.java | 17 +++-- .../controller/{web => }/LoginController.java | 4 +- .../mapper/{web => }/AdminPowerMapper.java | 2 +- .../mapper/{web => }/AdminRoleMapper.java | 2 +- .../mapper/{web => }/EmailUsersMapper.java | 2 +- .../mapper/{web => }/SystemLogMapper.java | 2 +- .../service/mapper/{web => }/UserMapper.java | 2 +- .../mapper/quartz/BlobTriggersMapper.java | 18 ----- .../mapper/quartz/CalendarsMapper.java | 18 ----- .../mapper/quartz/CronTriggersMapper.java | 18 ----- .../mapper/quartz/FiredTriggersMapper.java | 18 ----- .../mapper/quartz/JobDetailsMapper.java | 18 ----- .../service/mapper/quartz/LocksMapper.java | 18 ----- .../quartz/PausedTriggerGrpsMapper.java | 18 ----- .../mapper/quartz/SchedulerStateMapper.java | 18 ----- .../mapper/quartz/SimpleTriggersMapper.java | 18 ----- .../mapper/quartz/SimpropTriggersMapper.java | 18 ----- .../service/mapper/quartz/TriggersMapper.java | 18 ----- ...CustomAuthorizationManagerServiceImpl.java | 2 +- .../security/CustomUserDetailsService.java | 6 +- .../cn/bunny/service/service/JobService.java | 35 ++++++++++ .../service/{web => }/UserService.java | 2 +- .../{quartz => }/impl/JobServiceImpl.java | 36 +++++++--- .../{web => }/impl/UserServiceImpl.java | 12 ++-- .../service/service/quartz/JobService.java | 30 -------- service/src/main/resources/application.yml | 2 +- .../mapper/{web => }/AdminPowerMapper.xml | 2 +- .../mapper/{web => }/AdminRoleMapper.xml | 2 +- .../mapper/{web => }/EmailUsersMapper.xml | 2 +- .../mapper/{web => }/SystemLogMapper.xml | 2 +- .../resources/mapper/{web => }/UserMapper.xml | 2 +- .../mapper/quartz/BlobTriggersMapper.xml | 18 ----- .../mapper/quartz/CalendarsMapper.xml | 17 ----- .../mapper/quartz/CronTriggersMapper.xml | 19 ------ .../mapper/quartz/FiredTriggersMapper.xml | 27 -------- .../mapper/quartz/JobDetailsMapper.xml | 24 ------- .../resources/mapper/quartz/LocksMapper.xml | 16 ----- .../mapper/quartz/PausedTriggerGrpsMapper.xml | 16 ----- .../mapper/quartz/SchedulerStateMapper.xml | 18 ----- .../mapper/quartz/SimpleTriggersMapper.xml | 20 ------ .../mapper/quartz/SimpropTriggersMapper.xml | 28 -------- .../mapper/quartz/TriggersMapper.xml | 30 -------- 55 files changed, 100 insertions(+), 1047 deletions(-) rename dao/src/main/java/cn/bunny/dto/quartz/{QuartzPauseOrResumeDto.java => QuartzOperationDto.java} (88%) delete mode 100644 dao/src/main/java/cn/bunny/entity/system/quartz/BlobTriggers.java delete mode 100644 dao/src/main/java/cn/bunny/entity/system/quartz/Calendars.java delete mode 100644 dao/src/main/java/cn/bunny/entity/system/quartz/CronTriggers.java delete mode 100644 dao/src/main/java/cn/bunny/entity/system/quartz/FiredTriggers.java delete mode 100644 dao/src/main/java/cn/bunny/entity/system/quartz/JobDetails.java delete mode 100644 dao/src/main/java/cn/bunny/entity/system/quartz/Locks.java delete mode 100644 dao/src/main/java/cn/bunny/entity/system/quartz/PausedTriggerGrps.java delete mode 100644 dao/src/main/java/cn/bunny/entity/system/quartz/SchedulerState.java delete mode 100644 dao/src/main/java/cn/bunny/entity/system/quartz/SimpleTriggers.java delete mode 100644 dao/src/main/java/cn/bunny/entity/system/quartz/SimpropTriggers.java delete mode 100644 dao/src/main/java/cn/bunny/entity/system/quartz/Triggers.java rename service/src/main/java/cn/bunny/service/controller/{web => }/IndexController.java (93%) rename service/src/main/java/cn/bunny/service/controller/{quartz => }/JobController.java (66%) rename service/src/main/java/cn/bunny/service/controller/{web => }/LoginController.java (93%) rename service/src/main/java/cn/bunny/service/mapper/{web => }/AdminPowerMapper.java (95%) rename service/src/main/java/cn/bunny/service/mapper/{web => }/AdminRoleMapper.java (93%) rename service/src/main/java/cn/bunny/service/mapper/{web => }/EmailUsersMapper.java (92%) rename service/src/main/java/cn/bunny/service/mapper/{web => }/SystemLogMapper.java (89%) rename service/src/main/java/cn/bunny/service/mapper/{web => }/UserMapper.java (93%) delete mode 100644 service/src/main/java/cn/bunny/service/mapper/quartz/BlobTriggersMapper.java delete mode 100644 service/src/main/java/cn/bunny/service/mapper/quartz/CalendarsMapper.java delete mode 100644 service/src/main/java/cn/bunny/service/mapper/quartz/CronTriggersMapper.java delete mode 100644 service/src/main/java/cn/bunny/service/mapper/quartz/FiredTriggersMapper.java delete mode 100644 service/src/main/java/cn/bunny/service/mapper/quartz/JobDetailsMapper.java delete mode 100644 service/src/main/java/cn/bunny/service/mapper/quartz/LocksMapper.java delete mode 100644 service/src/main/java/cn/bunny/service/mapper/quartz/PausedTriggerGrpsMapper.java delete mode 100644 service/src/main/java/cn/bunny/service/mapper/quartz/SchedulerStateMapper.java delete mode 100644 service/src/main/java/cn/bunny/service/mapper/quartz/SimpleTriggersMapper.java delete mode 100644 service/src/main/java/cn/bunny/service/mapper/quartz/SimpropTriggersMapper.java delete mode 100644 service/src/main/java/cn/bunny/service/mapper/quartz/TriggersMapper.java create mode 100644 service/src/main/java/cn/bunny/service/service/JobService.java rename service/src/main/java/cn/bunny/service/service/{web => }/UserService.java (94%) rename service/src/main/java/cn/bunny/service/service/{quartz => }/impl/JobServiceImpl.java (72%) rename service/src/main/java/cn/bunny/service/service/{web => }/impl/UserServiceImpl.java (94%) delete mode 100644 service/src/main/java/cn/bunny/service/service/quartz/JobService.java rename service/src/main/resources/mapper/{web => }/AdminPowerMapper.xml (96%) rename service/src/main/resources/mapper/{web => }/AdminRoleMapper.xml (95%) rename service/src/main/resources/mapper/{web => }/EmailUsersMapper.xml (94%) rename service/src/main/resources/mapper/{web => }/SystemLogMapper.xml (95%) rename service/src/main/resources/mapper/{web => }/UserMapper.xml (97%) delete mode 100644 service/src/main/resources/mapper/quartz/BlobTriggersMapper.xml delete mode 100644 service/src/main/resources/mapper/quartz/CalendarsMapper.xml delete mode 100644 service/src/main/resources/mapper/quartz/CronTriggersMapper.xml delete mode 100644 service/src/main/resources/mapper/quartz/FiredTriggersMapper.xml delete mode 100644 service/src/main/resources/mapper/quartz/JobDetailsMapper.xml delete mode 100644 service/src/main/resources/mapper/quartz/LocksMapper.xml delete mode 100644 service/src/main/resources/mapper/quartz/PausedTriggerGrpsMapper.xml delete mode 100644 service/src/main/resources/mapper/quartz/SchedulerStateMapper.xml delete mode 100644 service/src/main/resources/mapper/quartz/SimpleTriggersMapper.xml delete mode 100644 service/src/main/resources/mapper/quartz/SimpropTriggersMapper.xml delete mode 100644 service/src/main/resources/mapper/quartz/TriggersMapper.xml diff --git a/dao/src/main/java/cn/bunny/dto/quartz/QuartzPauseOrResumeDto.java b/dao/src/main/java/cn/bunny/dto/quartz/QuartzOperationDto.java similarity index 88% rename from dao/src/main/java/cn/bunny/dto/quartz/QuartzPauseOrResumeDto.java rename to dao/src/main/java/cn/bunny/dto/quartz/QuartzOperationDto.java index bb0a6d9..6ea40ee 100644 --- a/dao/src/main/java/cn/bunny/dto/quartz/QuartzPauseOrResumeDto.java +++ b/dao/src/main/java/cn/bunny/dto/quartz/QuartzOperationDto.java @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @Builder -public class QuartzPauseOrResumeDto { +public class QuartzOperationDto { private String jobName;// 任务名称 private String jobGroup;// 任务分组 } diff --git a/dao/src/main/java/cn/bunny/entity/system/quartz/BlobTriggers.java b/dao/src/main/java/cn/bunny/entity/system/quartz/BlobTriggers.java deleted file mode 100644 index 12d0901..0000000 --- a/dao/src/main/java/cn/bunny/entity/system/quartz/BlobTriggers.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.bunny.entity.system.quartz; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - *

- * - *

- * - * @author Bunny - * @since 2024-07-25 - */ -@Getter -@Setter -@Accessors(chain = true) -@TableName("QRTZ_BLOB_TRIGGERS") -@ApiModel(value = "BlobTriggers对象", description = "") -public class BlobTriggers implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - @TableId(value = "SCHED_NAME", type = IdType.AUTO) - private String schedName; - - private String triggerName; - - private String triggerGroup; - - private byte[] blobData; -} diff --git a/dao/src/main/java/cn/bunny/entity/system/quartz/Calendars.java b/dao/src/main/java/cn/bunny/entity/system/quartz/Calendars.java deleted file mode 100644 index ecd335b..0000000 --- a/dao/src/main/java/cn/bunny/entity/system/quartz/Calendars.java +++ /dev/null @@ -1,41 +0,0 @@ -package cn.bunny.entity.system.quartz; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serial; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.Accessors; - -/** - *

- * - *

- * - * @author Bunny - * @since 2024-07-25 - */ -@Getter -@Setter -@Accessors(chain = true) -@TableName("QRTZ_CALENDARS") -@ApiModel(value = "Calendars对象", description = "") -public class Calendars implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - @TableField(value = "SCHED_NAME") - private String schedName; - - @TableField(value = "CALENDAR_NAME") - private String calendarName; - - private byte[] calendar; -} diff --git a/dao/src/main/java/cn/bunny/entity/system/quartz/CronTriggers.java b/dao/src/main/java/cn/bunny/entity/system/quartz/CronTriggers.java deleted file mode 100644 index 65bc503..0000000 --- a/dao/src/main/java/cn/bunny/entity/system/quartz/CronTriggers.java +++ /dev/null @@ -1,46 +0,0 @@ -package cn.bunny.entity.system.quartz; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serial; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.Accessors; - -/** - *

- * - *

- * - * @author Bunny - * @since 2024-07-25 - */ -@Getter -@Setter -@Accessors(chain = true) -@TableName("QRTZ_CRON_TRIGGERS") -@ApiModel(value = "CronTriggers对象", description = "") -public class CronTriggers implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - @TableField(value = "SCHED_NAME") - private String schedName; - - @TableField(value = "TRIGGER_NAME") - private String triggerName; - - @TableField(value = "TRIGGER_GROUP") - private String triggerGroup; - - private String cronExpression; - - private String timeZoneId; -} diff --git a/dao/src/main/java/cn/bunny/entity/system/quartz/FiredTriggers.java b/dao/src/main/java/cn/bunny/entity/system/quartz/FiredTriggers.java deleted file mode 100644 index 25657a4..0000000 --- a/dao/src/main/java/cn/bunny/entity/system/quartz/FiredTriggers.java +++ /dev/null @@ -1,61 +0,0 @@ -package cn.bunny.entity.system.quartz; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serial; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.Accessors; - -/** - *

- * - *

- * - * @author Bunny - * @since 2024-07-25 - */ -@Getter -@Setter -@Accessors(chain = true) -@TableName("QRTZ_FIRED_TRIGGERS") -@ApiModel(value = "FiredTriggers对象", description = "") -public class FiredTriggers implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - @TableField(value = "SCHED_NAME") - private String schedName; - - @TableField(value = "ENTRY_ID") - private String entryId; - - private String triggerName; - - private String triggerGroup; - - private String instanceName; - - private Long firedTime; - - private Long schedTime; - - private Integer priority; - - private String state; - - private String jobName; - - private String jobGroup; - - private String isNonconcurrent; - - private String requestsRecovery; -} diff --git a/dao/src/main/java/cn/bunny/entity/system/quartz/JobDetails.java b/dao/src/main/java/cn/bunny/entity/system/quartz/JobDetails.java deleted file mode 100644 index 2661882..0000000 --- a/dao/src/main/java/cn/bunny/entity/system/quartz/JobDetails.java +++ /dev/null @@ -1,56 +0,0 @@ -package cn.bunny.entity.system.quartz; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serial; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.Accessors; - -/** - *

- * - *

- * - * @author Bunny - * @since 2024-07-25 - */ -@Getter -@Setter -@Accessors(chain = true) -@TableName("QRTZ_JOB_DETAILS") -@ApiModel(value = "JobDetails对象", description = "") -public class JobDetails implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - @TableField(value = "SCHED_NAME") - private String schedName; - - @TableField(value = "JOB_NAME") - private String jobName; - - @TableField(value = "JOB_GROUP") - private String jobGroup; - - private String description; - - private String jobClassName; - - private String isDurable; - - private String isNonconcurrent; - - private String isUpdateData; - - private String requestsRecovery; - - private byte[] jobData; -} diff --git a/dao/src/main/java/cn/bunny/entity/system/quartz/Locks.java b/dao/src/main/java/cn/bunny/entity/system/quartz/Locks.java deleted file mode 100644 index d50192b..0000000 --- a/dao/src/main/java/cn/bunny/entity/system/quartz/Locks.java +++ /dev/null @@ -1,39 +0,0 @@ -package cn.bunny.entity.system.quartz; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serial; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.Accessors; - -/** - *

- * - *

- * - * @author Bunny - * @since 2024-07-25 - */ -@Getter -@Setter -@Accessors(chain = true) -@TableName("QRTZ_LOCKS") -@ApiModel(value = "Locks对象", description = "") -public class Locks implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - @TableField(value = "SCHED_NAME") - private String schedName; - - @TableField(value = "LOCK_NAME") - private String lockName; -} diff --git a/dao/src/main/java/cn/bunny/entity/system/quartz/PausedTriggerGrps.java b/dao/src/main/java/cn/bunny/entity/system/quartz/PausedTriggerGrps.java deleted file mode 100644 index ac1ef53..0000000 --- a/dao/src/main/java/cn/bunny/entity/system/quartz/PausedTriggerGrps.java +++ /dev/null @@ -1,39 +0,0 @@ -package cn.bunny.entity.system.quartz; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serial; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.Accessors; - -/** - *

- * - *

- * - * @author Bunny - * @since 2024-07-25 - */ -@Getter -@Setter -@Accessors(chain = true) -@TableName("QRTZ_PAUSED_TRIGGER_GRPS") -@ApiModel(value = "PausedTriggerGrps对象", description = "") -public class PausedTriggerGrps implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - @TableId(value = "SCHED_NAME") - private String schedName; - - @TableField(value = "TRIGGER_GROUP") - private String triggerGroup; -} diff --git a/dao/src/main/java/cn/bunny/entity/system/quartz/SchedulerState.java b/dao/src/main/java/cn/bunny/entity/system/quartz/SchedulerState.java deleted file mode 100644 index 3da7af7..0000000 --- a/dao/src/main/java/cn/bunny/entity/system/quartz/SchedulerState.java +++ /dev/null @@ -1,43 +0,0 @@ -package cn.bunny.entity.system.quartz; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serial; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.Accessors; - -/** - *

- * - *

- * - * @author Bunny - * @since 2024-07-25 - */ -@Getter -@Setter -@Accessors(chain = true) -@TableName("QRTZ_SCHEDULER_STATE") -@ApiModel(value = "SchedulerState对象", description = "") -public class SchedulerState implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - @TableField(value = "SCHED_NAME") - private String schedName; - - @TableField(value = "INSTANCE_NAME") - private String instanceName; - - private Long lastCheckinTime; - - private Long checkinInterval; -} diff --git a/dao/src/main/java/cn/bunny/entity/system/quartz/SimpleTriggers.java b/dao/src/main/java/cn/bunny/entity/system/quartz/SimpleTriggers.java deleted file mode 100644 index 488d884..0000000 --- a/dao/src/main/java/cn/bunny/entity/system/quartz/SimpleTriggers.java +++ /dev/null @@ -1,48 +0,0 @@ -package cn.bunny.entity.system.quartz; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serial; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.Accessors; - -/** - *

- * - *

- * - * @author Bunny - * @since 2024-07-25 - */ -@Getter -@Setter -@Accessors(chain = true) -@TableName("QRTZ_SIMPLE_TRIGGERS") -@ApiModel(value = "SimpleTriggers对象", description = "") -public class SimpleTriggers implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - @TableField(value = "SCHED_NAME") - private String schedName; - - @TableField(value = "TRIGGER_NAME") - private String triggerName; - - @TableField(value = "TRIGGER_GROUP") - private String triggerGroup; - - private Long repeatCount; - - private Long repeatInterval; - - private Long timesTriggered; -} diff --git a/dao/src/main/java/cn/bunny/entity/system/quartz/SimpropTriggers.java b/dao/src/main/java/cn/bunny/entity/system/quartz/SimpropTriggers.java deleted file mode 100644 index 34a5f1b..0000000 --- a/dao/src/main/java/cn/bunny/entity/system/quartz/SimpropTriggers.java +++ /dev/null @@ -1,65 +0,0 @@ -package cn.bunny.entity.system.quartz; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serial; -import java.io.Serializable; -import java.math.BigDecimal; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.Accessors; - -/** - *

- * - *

- * - * @author Bunny - * @since 2024-07-25 - */ -@Getter -@Setter -@Accessors(chain = true) -@TableName("QRTZ_SIMPROP_TRIGGERS") -@ApiModel(value = "SimpropTriggers对象", description = "") -public class SimpropTriggers implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - @TableField(value = "SCHED_NAME") - private String schedName; - - @TableField(value = "TRIGGER_NAME") - private String triggerName; - - @TableField(value = "TRIGGER_GROUP") - private String triggerGroup; - - private String strProp1; - - private String strProp2; - - private String strProp3; - - private Integer intProp1; - - private Integer intProp2; - - private Long longProp1; - - private Long longProp2; - - private BigDecimal decProp1; - - private BigDecimal decProp2; - - private String boolProp1; - - private String boolProp2; -} diff --git a/dao/src/main/java/cn/bunny/entity/system/quartz/Triggers.java b/dao/src/main/java/cn/bunny/entity/system/quartz/Triggers.java deleted file mode 100644 index 30cf21f..0000000 --- a/dao/src/main/java/cn/bunny/entity/system/quartz/Triggers.java +++ /dev/null @@ -1,68 +0,0 @@ -package cn.bunny.entity.system.quartz; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serial; -import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.Accessors; - -/** - *

- * - *

- * - * @author Bunny - * @since 2024-07-25 - */ -@Getter -@Setter -@Accessors(chain = true) -@TableName("QRTZ_TRIGGERS") -@ApiModel(value = "Triggers对象", description = "") -public class Triggers implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - @TableField(value = "SCHED_NAME") - private String schedName; - - @TableField(value = "TRIGGER_NAME") - private String triggerName; - - @TableField(value = "TRIGGER_GROUP") - private String triggerGroup; - - private String jobName; - - private String jobGroup; - - private String description; - - private Long nextFireTime; - - private Long prevFireTime; - - private Integer priority; - - private String triggerState; - - private String triggerType; - - private Long startTime; - - private Long endTime; - - private String calendarName; - - private Short misfireInstr; - - private byte[] jobData; -} diff --git a/service/src/main/java/cn/bunny/service/controller/web/IndexController.java b/service/src/main/java/cn/bunny/service/controller/IndexController.java similarity index 93% rename from service/src/main/java/cn/bunny/service/controller/web/IndexController.java rename to service/src/main/java/cn/bunny/service/controller/IndexController.java index 35962f8..d645557 100644 --- a/service/src/main/java/cn/bunny/service/controller/web/IndexController.java +++ b/service/src/main/java/cn/bunny/service/controller/IndexController.java @@ -1,4 +1,4 @@ -package cn.bunny.service.controller.web; +package cn.bunny.service.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/service/src/main/java/cn/bunny/service/controller/quartz/JobController.java b/service/src/main/java/cn/bunny/service/controller/JobController.java similarity index 66% rename from service/src/main/java/cn/bunny/service/controller/quartz/JobController.java rename to service/src/main/java/cn/bunny/service/controller/JobController.java index dc6d6a3..3fb7888 100644 --- a/service/src/main/java/cn/bunny/service/controller/quartz/JobController.java +++ b/service/src/main/java/cn/bunny/service/controller/JobController.java @@ -1,9 +1,9 @@ -package cn.bunny.service.controller.quartz; +package cn.bunny.service.controller; import cn.bunny.dto.quartz.QuartzAddDto; -import cn.bunny.dto.quartz.QuartzPauseOrResumeDto; +import cn.bunny.dto.quartz.QuartzOperationDto; import cn.bunny.pojo.result.Result; -import cn.bunny.service.service.quartz.JobService; +import cn.bunny.service.service.JobService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; @@ -26,15 +26,22 @@ public class JobController { @Operation(summary = "暂停任务", description = "暂停任务") @PutMapping("/pause") - public Result pause(@RequestBody QuartzPauseOrResumeDto dto) { + public Result pause(@RequestBody QuartzOperationDto dto) { jobService.pause(dto); return Result.success(); } @Operation(summary = "恢复任务", description = "恢复任务") @PutMapping("/resume") - public Result resume(@RequestBody QuartzPauseOrResumeDto dto) { + public Result resume(@RequestBody QuartzOperationDto dto) { jobService.resume(dto); return Result.success(); } + + @Operation(summary = "移出任务", description = "移出任务") + @DeleteMapping("/remove") + public Result remove(@RequestBody QuartzOperationDto dto) { + jobService.remove(dto); + return Result.success(); + } } \ No newline at end of file diff --git a/service/src/main/java/cn/bunny/service/controller/web/LoginController.java b/service/src/main/java/cn/bunny/service/controller/LoginController.java similarity index 93% rename from service/src/main/java/cn/bunny/service/controller/web/LoginController.java rename to service/src/main/java/cn/bunny/service/controller/LoginController.java index a966272..6d4aa81 100644 --- a/service/src/main/java/cn/bunny/service/controller/web/LoginController.java +++ b/service/src/main/java/cn/bunny/service/controller/LoginController.java @@ -1,9 +1,9 @@ -package cn.bunny.service.controller.web; +package cn.bunny.service.controller; import cn.bunny.dto.user.LoginDto; import cn.bunny.pojo.result.Result; -import cn.bunny.service.service.web.UserService; +import cn.bunny.service.service.UserService; import cn.bunny.vo.system.login.LoginVo; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/service/src/main/java/cn/bunny/service/mapper/web/AdminPowerMapper.java b/service/src/main/java/cn/bunny/service/mapper/AdminPowerMapper.java similarity index 95% rename from service/src/main/java/cn/bunny/service/mapper/web/AdminPowerMapper.java rename to service/src/main/java/cn/bunny/service/mapper/AdminPowerMapper.java index 2e6c3d2..0fc1686 100644 --- a/service/src/main/java/cn/bunny/service/mapper/web/AdminPowerMapper.java +++ b/service/src/main/java/cn/bunny/service/mapper/AdminPowerMapper.java @@ -1,4 +1,4 @@ -package cn.bunny.service.mapper.web; +package cn.bunny.service.mapper; import cn.bunny.entity.system.admin.AdminPower; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/service/src/main/java/cn/bunny/service/mapper/web/AdminRoleMapper.java b/service/src/main/java/cn/bunny/service/mapper/AdminRoleMapper.java similarity index 93% rename from service/src/main/java/cn/bunny/service/mapper/web/AdminRoleMapper.java rename to service/src/main/java/cn/bunny/service/mapper/AdminRoleMapper.java index ddd153d..6616caf 100644 --- a/service/src/main/java/cn/bunny/service/mapper/web/AdminRoleMapper.java +++ b/service/src/main/java/cn/bunny/service/mapper/AdminRoleMapper.java @@ -1,4 +1,4 @@ -package cn.bunny.service.mapper.web; +package cn.bunny.service.mapper; import cn.bunny.entity.system.admin.AdminRole; import cn.bunny.entity.system.admin.auth.AuthUserRole; diff --git a/service/src/main/java/cn/bunny/service/mapper/web/EmailUsersMapper.java b/service/src/main/java/cn/bunny/service/mapper/EmailUsersMapper.java similarity index 92% rename from service/src/main/java/cn/bunny/service/mapper/web/EmailUsersMapper.java rename to service/src/main/java/cn/bunny/service/mapper/EmailUsersMapper.java index 15a4692..ab8b865 100644 --- a/service/src/main/java/cn/bunny/service/mapper/web/EmailUsersMapper.java +++ b/service/src/main/java/cn/bunny/service/mapper/EmailUsersMapper.java @@ -1,4 +1,4 @@ -package cn.bunny.service.mapper.web; +package cn.bunny.service.mapper; import cn.bunny.entity.system.email.EmailUsers; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/service/src/main/java/cn/bunny/service/mapper/web/SystemLogMapper.java b/service/src/main/java/cn/bunny/service/mapper/SystemLogMapper.java similarity index 89% rename from service/src/main/java/cn/bunny/service/mapper/web/SystemLogMapper.java rename to service/src/main/java/cn/bunny/service/mapper/SystemLogMapper.java index f6f5ccb..2741252 100644 --- a/service/src/main/java/cn/bunny/service/mapper/web/SystemLogMapper.java +++ b/service/src/main/java/cn/bunny/service/mapper/SystemLogMapper.java @@ -1,4 +1,4 @@ -package cn.bunny.service.mapper.web; +package cn.bunny.service.mapper; import cn.bunny.entity.system.log.SystemLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/service/src/main/java/cn/bunny/service/mapper/web/UserMapper.java b/service/src/main/java/cn/bunny/service/mapper/UserMapper.java similarity index 93% rename from service/src/main/java/cn/bunny/service/mapper/web/UserMapper.java rename to service/src/main/java/cn/bunny/service/mapper/UserMapper.java index 4286500..83ac911 100644 --- a/service/src/main/java/cn/bunny/service/mapper/web/UserMapper.java +++ b/service/src/main/java/cn/bunny/service/mapper/UserMapper.java @@ -1,4 +1,4 @@ -package cn.bunny.service.mapper.web; +package cn.bunny.service.mapper; import cn.bunny.entity.system.user.User; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/service/src/main/java/cn/bunny/service/mapper/quartz/BlobTriggersMapper.java b/service/src/main/java/cn/bunny/service/mapper/quartz/BlobTriggersMapper.java deleted file mode 100644 index 7f61d35..0000000 --- a/service/src/main/java/cn/bunny/service/mapper/quartz/BlobTriggersMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bunny.service.mapper.quartz; - -import cn.bunny.entity.system.quartz.BlobTriggers; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * Mapper 接口 - *

- * - * @author Bunny - * @since 2024-07-25 - */ -@Mapper -public interface BlobTriggersMapper extends BaseMapper { - -} diff --git a/service/src/main/java/cn/bunny/service/mapper/quartz/CalendarsMapper.java b/service/src/main/java/cn/bunny/service/mapper/quartz/CalendarsMapper.java deleted file mode 100644 index 4177e33..0000000 --- a/service/src/main/java/cn/bunny/service/mapper/quartz/CalendarsMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bunny.service.mapper.quartz; - -import cn.bunny.entity.system.quartz.Calendars; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * Mapper 接口 - *

- * - * @author Bunny - * @since 2024-07-25 - */ -@Mapper -public interface CalendarsMapper extends BaseMapper { - -} diff --git a/service/src/main/java/cn/bunny/service/mapper/quartz/CronTriggersMapper.java b/service/src/main/java/cn/bunny/service/mapper/quartz/CronTriggersMapper.java deleted file mode 100644 index fd2ae88..0000000 --- a/service/src/main/java/cn/bunny/service/mapper/quartz/CronTriggersMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bunny.service.mapper.quartz; - -import cn.bunny.entity.system.quartz.CronTriggers; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * Mapper 接口 - *

- * - * @author Bunny - * @since 2024-07-25 - */ -@Mapper -public interface CronTriggersMapper extends BaseMapper { - -} diff --git a/service/src/main/java/cn/bunny/service/mapper/quartz/FiredTriggersMapper.java b/service/src/main/java/cn/bunny/service/mapper/quartz/FiredTriggersMapper.java deleted file mode 100644 index 91b5faa..0000000 --- a/service/src/main/java/cn/bunny/service/mapper/quartz/FiredTriggersMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bunny.service.mapper.quartz; - -import cn.bunny.entity.system.quartz.FiredTriggers; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * Mapper 接口 - *

- * - * @author Bunny - * @since 2024-07-25 - */ -@Mapper -public interface FiredTriggersMapper extends BaseMapper { - -} diff --git a/service/src/main/java/cn/bunny/service/mapper/quartz/JobDetailsMapper.java b/service/src/main/java/cn/bunny/service/mapper/quartz/JobDetailsMapper.java deleted file mode 100644 index 8c8927f..0000000 --- a/service/src/main/java/cn/bunny/service/mapper/quartz/JobDetailsMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bunny.service.mapper.quartz; - -import cn.bunny.entity.system.quartz.JobDetails; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * Mapper 接口 - *

- * - * @author Bunny - * @since 2024-07-25 - */ -@Mapper -public interface JobDetailsMapper extends BaseMapper { - -} diff --git a/service/src/main/java/cn/bunny/service/mapper/quartz/LocksMapper.java b/service/src/main/java/cn/bunny/service/mapper/quartz/LocksMapper.java deleted file mode 100644 index 866af3f..0000000 --- a/service/src/main/java/cn/bunny/service/mapper/quartz/LocksMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bunny.service.mapper.quartz; - -import cn.bunny.entity.system.quartz.Locks; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * Mapper 接口 - *

- * - * @author Bunny - * @since 2024-07-25 - */ -@Mapper -public interface LocksMapper extends BaseMapper { - -} diff --git a/service/src/main/java/cn/bunny/service/mapper/quartz/PausedTriggerGrpsMapper.java b/service/src/main/java/cn/bunny/service/mapper/quartz/PausedTriggerGrpsMapper.java deleted file mode 100644 index 90506a9..0000000 --- a/service/src/main/java/cn/bunny/service/mapper/quartz/PausedTriggerGrpsMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bunny.service.mapper.quartz; - -import cn.bunny.entity.system.quartz.PausedTriggerGrps; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * Mapper 接口 - *

- * - * @author Bunny - * @since 2024-07-25 - */ -@Mapper -public interface PausedTriggerGrpsMapper extends BaseMapper { - -} diff --git a/service/src/main/java/cn/bunny/service/mapper/quartz/SchedulerStateMapper.java b/service/src/main/java/cn/bunny/service/mapper/quartz/SchedulerStateMapper.java deleted file mode 100644 index e2b731d..0000000 --- a/service/src/main/java/cn/bunny/service/mapper/quartz/SchedulerStateMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bunny.service.mapper.quartz; - -import cn.bunny.entity.system.quartz.SchedulerState; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * Mapper 接口 - *

- * - * @author Bunny - * @since 2024-07-25 - */ -@Mapper -public interface SchedulerStateMapper extends BaseMapper { - -} diff --git a/service/src/main/java/cn/bunny/service/mapper/quartz/SimpleTriggersMapper.java b/service/src/main/java/cn/bunny/service/mapper/quartz/SimpleTriggersMapper.java deleted file mode 100644 index 6f4e51d..0000000 --- a/service/src/main/java/cn/bunny/service/mapper/quartz/SimpleTriggersMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bunny.service.mapper.quartz; - -import cn.bunny.entity.system.quartz.SimpleTriggers; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * Mapper 接口 - *

- * - * @author Bunny - * @since 2024-07-25 - */ -@Mapper -public interface SimpleTriggersMapper extends BaseMapper { - -} diff --git a/service/src/main/java/cn/bunny/service/mapper/quartz/SimpropTriggersMapper.java b/service/src/main/java/cn/bunny/service/mapper/quartz/SimpropTriggersMapper.java deleted file mode 100644 index 7cc2054..0000000 --- a/service/src/main/java/cn/bunny/service/mapper/quartz/SimpropTriggersMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bunny.service.mapper.quartz; - -import cn.bunny.entity.system.quartz.SimpropTriggers; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * Mapper 接口 - *

- * - * @author Bunny - * @since 2024-07-25 - */ -@Mapper -public interface SimpropTriggersMapper extends BaseMapper { - -} diff --git a/service/src/main/java/cn/bunny/service/mapper/quartz/TriggersMapper.java b/service/src/main/java/cn/bunny/service/mapper/quartz/TriggersMapper.java deleted file mode 100644 index 8f74116..0000000 --- a/service/src/main/java/cn/bunny/service/mapper/quartz/TriggersMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bunny.service.mapper.quartz; - -import cn.bunny.entity.system.quartz.Triggers; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * Mapper 接口 - *

- * - * @author Bunny - * @since 2024-07-25 - */ -@Mapper -public interface TriggersMapper extends BaseMapper { - -} diff --git a/service/src/main/java/cn/bunny/service/security/CustomAuthorizationManagerServiceImpl.java b/service/src/main/java/cn/bunny/service/security/CustomAuthorizationManagerServiceImpl.java index 09b3543..c26adbd 100644 --- a/service/src/main/java/cn/bunny/service/security/CustomAuthorizationManagerServiceImpl.java +++ b/service/src/main/java/cn/bunny/service/security/CustomAuthorizationManagerServiceImpl.java @@ -3,7 +3,7 @@ package cn.bunny.service.security; import cn.bunny.common.service.utils.JwtHelper; import cn.bunny.entity.system.admin.AdminPower; import cn.bunny.security.service.CustomAuthorizationManagerService; -import cn.bunny.service.mapper.web.AdminPowerMapper; +import cn.bunny.service.mapper.AdminPowerMapper; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service/src/main/java/cn/bunny/service/security/CustomUserDetailsService.java b/service/src/main/java/cn/bunny/service/security/CustomUserDetailsService.java index 6b795d8..ebc6310 100644 --- a/service/src/main/java/cn/bunny/service/security/CustomUserDetailsService.java +++ b/service/src/main/java/cn/bunny/service/security/CustomUserDetailsService.java @@ -4,9 +4,9 @@ import cn.bunny.dto.user.LoginDto; import cn.bunny.entity.system.admin.AdminRole; import cn.bunny.entity.system.user.User; import cn.bunny.security.custom.CustomUser; -import cn.bunny.service.mapper.web.AdminRoleMapper; -import cn.bunny.service.mapper.web.UserMapper; -import cn.bunny.service.service.web.UserService; +import cn.bunny.service.mapper.AdminRoleMapper; +import cn.bunny.service.mapper.UserMapper; +import cn.bunny.service.service.UserService; import cn.bunny.vo.system.login.LoginVo; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service/src/main/java/cn/bunny/service/service/JobService.java b/service/src/main/java/cn/bunny/service/service/JobService.java new file mode 100644 index 0000000..6bb3428 --- /dev/null +++ b/service/src/main/java/cn/bunny/service/service/JobService.java @@ -0,0 +1,35 @@ +package cn.bunny.service.service; + +import cn.bunny.dto.quartz.QuartzAddDto; +import cn.bunny.dto.quartz.QuartzOperationDto; + +public interface JobService { + + /** + * * 添加任务 + * + * @param dto 添加任务 + */ + void addJob(QuartzAddDto dto); + + /** + * * 暂停任务 + * + * @param dto 暂停任务 + */ + void pause(QuartzOperationDto dto); + + /** + * * 恢复任务 + * + * @param dto 恢复任务 + */ + void resume(QuartzOperationDto dto); + + /** + * * 移出任务 + * + * @param dto 移出任务 + */ + void remove(QuartzOperationDto dto); +} diff --git a/service/src/main/java/cn/bunny/service/service/web/UserService.java b/service/src/main/java/cn/bunny/service/service/UserService.java similarity index 94% rename from service/src/main/java/cn/bunny/service/service/web/UserService.java rename to service/src/main/java/cn/bunny/service/service/UserService.java index a04c447..aad4b8e 100644 --- a/service/src/main/java/cn/bunny/service/service/web/UserService.java +++ b/service/src/main/java/cn/bunny/service/service/UserService.java @@ -1,4 +1,4 @@ -package cn.bunny.service.service.web; +package cn.bunny.service.service; import cn.bunny.dto.user.LoginDto; import cn.bunny.entity.system.user.User; diff --git a/service/src/main/java/cn/bunny/service/service/quartz/impl/JobServiceImpl.java b/service/src/main/java/cn/bunny/service/service/impl/JobServiceImpl.java similarity index 72% rename from service/src/main/java/cn/bunny/service/service/quartz/impl/JobServiceImpl.java rename to service/src/main/java/cn/bunny/service/service/impl/JobServiceImpl.java index d101b52..2841de0 100644 --- a/service/src/main/java/cn/bunny/service/service/quartz/impl/JobServiceImpl.java +++ b/service/src/main/java/cn/bunny/service/service/impl/JobServiceImpl.java @@ -1,13 +1,11 @@ -package cn.bunny.service.service.quartz.impl; +package cn.bunny.service.service.impl; import cn.bunny.dto.quartz.QuartzAddDto; -import cn.bunny.dto.quartz.QuartzPauseOrResumeDto; -import cn.bunny.entity.system.quartz.JobDetails; -import cn.bunny.service.mapper.quartz.JobDetailsMapper; -import cn.bunny.service.service.quartz.JobService; +import cn.bunny.dto.quartz.QuartzOperationDto; +import cn.bunny.service.service.JobService; import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; import org.quartz.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -17,7 +15,8 @@ import java.lang.reflect.Constructor; @SuppressWarnings("unchecked") @Service @DS("quartz") -public class JobServiceImpl extends ServiceImpl implements JobService { +@Slf4j +public class JobServiceImpl implements JobService { @Autowired private Scheduler scheduler; @@ -62,7 +61,7 @@ public class JobServiceImpl extends ServiceImpl im */ @SneakyThrows @Override - public void pause(QuartzPauseOrResumeDto dto) { + public void pause(QuartzOperationDto dto) { JobKey key = new JobKey(dto.getJobName(), dto.getJobGroup()); scheduler.pauseJob(key); } @@ -74,8 +73,27 @@ public class JobServiceImpl extends ServiceImpl im */ @SneakyThrows @Override - public void resume(QuartzPauseOrResumeDto dto) { + public void resume(QuartzOperationDto dto) { JobKey key = new JobKey(dto.getJobName(), dto.getJobGroup()); scheduler.resumeJob(key); } + + /** + * * 移出任务 + * + * @param dto 移出任务 + */ + @SneakyThrows + @Override + public void remove(QuartzOperationDto dto) { + String jobGroup = dto.getJobGroup(); + String jobName = dto.getJobName(); + + TriggerKey triggerKey = TriggerKey.triggerKey(jobName, jobGroup); + scheduler.pauseTrigger(triggerKey); + scheduler.unscheduleJob(triggerKey); + scheduler.deleteJob(JobKey.jobKey(jobName, jobGroup)); + + log.warn("删除成功"); + } } diff --git a/service/src/main/java/cn/bunny/service/service/web/impl/UserServiceImpl.java b/service/src/main/java/cn/bunny/service/service/impl/UserServiceImpl.java similarity index 94% rename from service/src/main/java/cn/bunny/service/service/web/impl/UserServiceImpl.java rename to service/src/main/java/cn/bunny/service/service/impl/UserServiceImpl.java index ebc43f2..2102767 100644 --- a/service/src/main/java/cn/bunny/service/service/web/impl/UserServiceImpl.java +++ b/service/src/main/java/cn/bunny/service/service/impl/UserServiceImpl.java @@ -1,4 +1,4 @@ -package cn.bunny.service.service.web.impl; +package cn.bunny.service.service.impl; import cn.bunny.common.service.utils.EmptyUtil; import cn.bunny.common.service.utils.JwtHelper; @@ -13,11 +13,11 @@ import cn.bunny.pojo.email.EmailSendInit; import cn.bunny.pojo.result.constant.ExceptionConstant; import cn.bunny.pojo.result.constant.MailMessageConstant; import cn.bunny.pojo.result.constant.RedisUserConstant; -import cn.bunny.service.mapper.web.AdminPowerMapper; -import cn.bunny.service.mapper.web.AdminRoleMapper; -import cn.bunny.service.mapper.web.EmailUsersMapper; -import cn.bunny.service.mapper.web.UserMapper; -import cn.bunny.service.service.web.UserService; +import cn.bunny.service.mapper.AdminPowerMapper; +import cn.bunny.service.mapper.AdminRoleMapper; +import cn.bunny.service.mapper.EmailUsersMapper; +import cn.bunny.service.mapper.UserMapper; +import cn.bunny.service.service.UserService; import cn.bunny.vo.system.login.LoginVo; import cn.hutool.captcha.CaptchaUtil; import cn.hutool.captcha.CircleCaptcha; diff --git a/service/src/main/java/cn/bunny/service/service/quartz/JobService.java b/service/src/main/java/cn/bunny/service/service/quartz/JobService.java deleted file mode 100644 index 47f9013..0000000 --- a/service/src/main/java/cn/bunny/service/service/quartz/JobService.java +++ /dev/null @@ -1,30 +0,0 @@ -package cn.bunny.service.service.quartz; - -import cn.bunny.dto.quartz.QuartzAddDto; -import cn.bunny.dto.quartz.QuartzPauseOrResumeDto; -import cn.bunny.entity.system.quartz.JobDetails; -import com.baomidou.mybatisplus.extension.service.IService; - -public interface JobService extends IService { - - /** - * * 添加任务 - * - * @param dto 添加任务 - */ - void addJob(QuartzAddDto dto); - - /** - * * 暂停任务 - * - * @param dto 暂停任务 - */ - void pause(QuartzPauseOrResumeDto dto); - - /** - * * 恢复任务 - * - * @param dto 恢复任务 - */ - void resume(QuartzPauseOrResumeDto dto); -} diff --git a/service/src/main/resources/application.yml b/service/src/main/resources/application.yml index aa8ec9a..926a0d7 100644 --- a/service/src/main/resources/application.yml +++ b/service/src/main/resources/application.yml @@ -51,7 +51,7 @@ spring: overwrite-existing-jobs: false mybatis-plus: - mapper-locations: classpath:mapper/*/*.xml + mapper-locations: classpath:mapper/*.xml global-config: db-config: logic-delete-field: isDelete diff --git a/service/src/main/resources/mapper/web/AdminPowerMapper.xml b/service/src/main/resources/mapper/AdminPowerMapper.xml similarity index 96% rename from service/src/main/resources/mapper/web/AdminPowerMapper.xml rename to service/src/main/resources/mapper/AdminPowerMapper.xml index 8fbbbee..842029f 100644 --- a/service/src/main/resources/mapper/web/AdminPowerMapper.xml +++ b/service/src/main/resources/mapper/AdminPowerMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service/src/main/resources/mapper/web/AdminRoleMapper.xml b/service/src/main/resources/mapper/AdminRoleMapper.xml similarity index 95% rename from service/src/main/resources/mapper/web/AdminRoleMapper.xml rename to service/src/main/resources/mapper/AdminRoleMapper.xml index 5ae4003..8e11472 100644 --- a/service/src/main/resources/mapper/web/AdminRoleMapper.xml +++ b/service/src/main/resources/mapper/AdminRoleMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service/src/main/resources/mapper/web/EmailUsersMapper.xml b/service/src/main/resources/mapper/EmailUsersMapper.xml similarity index 94% rename from service/src/main/resources/mapper/web/EmailUsersMapper.xml rename to service/src/main/resources/mapper/EmailUsersMapper.xml index 2c3a514..29b04db 100644 --- a/service/src/main/resources/mapper/web/EmailUsersMapper.xml +++ b/service/src/main/resources/mapper/EmailUsersMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service/src/main/resources/mapper/web/SystemLogMapper.xml b/service/src/main/resources/mapper/SystemLogMapper.xml similarity index 95% rename from service/src/main/resources/mapper/web/SystemLogMapper.xml rename to service/src/main/resources/mapper/SystemLogMapper.xml index 682cb68..c7c0feb 100644 --- a/service/src/main/resources/mapper/web/SystemLogMapper.xml +++ b/service/src/main/resources/mapper/SystemLogMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service/src/main/resources/mapper/web/UserMapper.xml b/service/src/main/resources/mapper/UserMapper.xml similarity index 97% rename from service/src/main/resources/mapper/web/UserMapper.xml rename to service/src/main/resources/mapper/UserMapper.xml index ce3c71f..6ee63e7 100644 --- a/service/src/main/resources/mapper/web/UserMapper.xml +++ b/service/src/main/resources/mapper/UserMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service/src/main/resources/mapper/quartz/BlobTriggersMapper.xml b/service/src/main/resources/mapper/quartz/BlobTriggersMapper.xml deleted file mode 100644 index d7c43ba..0000000 --- a/service/src/main/resources/mapper/quartz/BlobTriggersMapper.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - SCHED_NAME, TRIGGER_NAME, TRIGGER_GROUP, BLOB_DATA - - - diff --git a/service/src/main/resources/mapper/quartz/CalendarsMapper.xml b/service/src/main/resources/mapper/quartz/CalendarsMapper.xml deleted file mode 100644 index 89e2547..0000000 --- a/service/src/main/resources/mapper/quartz/CalendarsMapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - SCHED_NAME, CALENDAR_NAME, CALENDAR - - - diff --git a/service/src/main/resources/mapper/quartz/CronTriggersMapper.xml b/service/src/main/resources/mapper/quartz/CronTriggersMapper.xml deleted file mode 100644 index 6c1e495..0000000 --- a/service/src/main/resources/mapper/quartz/CronTriggersMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - SCHED_NAME, TRIGGER_NAME, TRIGGER_GROUP, CRON_EXPRESSION, TIME_ZONE_ID - - - diff --git a/service/src/main/resources/mapper/quartz/FiredTriggersMapper.xml b/service/src/main/resources/mapper/quartz/FiredTriggersMapper.xml deleted file mode 100644 index 467ade7..0000000 --- a/service/src/main/resources/mapper/quartz/FiredTriggersMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - SCHED_NAME, ENTRY_ID, TRIGGER_NAME, TRIGGER_GROUP, INSTANCE_NAME, FIRED_TIME, SCHED_TIME, PRIORITY, STATE, JOB_NAME, JOB_GROUP, IS_NONCONCURRENT, REQUESTS_RECOVERY - - - diff --git a/service/src/main/resources/mapper/quartz/JobDetailsMapper.xml b/service/src/main/resources/mapper/quartz/JobDetailsMapper.xml deleted file mode 100644 index f43012c..0000000 --- a/service/src/main/resources/mapper/quartz/JobDetailsMapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - SCHED_NAME, JOB_NAME, JOB_GROUP, DESCRIPTION, JOB_CLASS_NAME, IS_DURABLE, IS_NONCONCURRENT, IS_UPDATE_DATA, REQUESTS_RECOVERY, JOB_DATA - - - diff --git a/service/src/main/resources/mapper/quartz/LocksMapper.xml b/service/src/main/resources/mapper/quartz/LocksMapper.xml deleted file mode 100644 index 2ea1671..0000000 --- a/service/src/main/resources/mapper/quartz/LocksMapper.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - SCHED_NAME, LOCK_NAME - - - diff --git a/service/src/main/resources/mapper/quartz/PausedTriggerGrpsMapper.xml b/service/src/main/resources/mapper/quartz/PausedTriggerGrpsMapper.xml deleted file mode 100644 index 82a95e9..0000000 --- a/service/src/main/resources/mapper/quartz/PausedTriggerGrpsMapper.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - SCHED_NAME, TRIGGER_GROUP - - - diff --git a/service/src/main/resources/mapper/quartz/SchedulerStateMapper.xml b/service/src/main/resources/mapper/quartz/SchedulerStateMapper.xml deleted file mode 100644 index a9ebadf..0000000 --- a/service/src/main/resources/mapper/quartz/SchedulerStateMapper.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - SCHED_NAME, INSTANCE_NAME, LAST_CHECKIN_TIME, CHECKIN_INTERVAL - - - diff --git a/service/src/main/resources/mapper/quartz/SimpleTriggersMapper.xml b/service/src/main/resources/mapper/quartz/SimpleTriggersMapper.xml deleted file mode 100644 index f9ae069..0000000 --- a/service/src/main/resources/mapper/quartz/SimpleTriggersMapper.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - SCHED_NAME, TRIGGER_NAME, TRIGGER_GROUP, REPEAT_COUNT, REPEAT_INTERVAL, TIMES_TRIGGERED - - - diff --git a/service/src/main/resources/mapper/quartz/SimpropTriggersMapper.xml b/service/src/main/resources/mapper/quartz/SimpropTriggersMapper.xml deleted file mode 100644 index 10dace1..0000000 --- a/service/src/main/resources/mapper/quartz/SimpropTriggersMapper.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - SCHED_NAME, TRIGGER_NAME, TRIGGER_GROUP, STR_PROP_1, STR_PROP_2, STR_PROP_3, INT_PROP_1, INT_PROP_2, LONG_PROP_1, LONG_PROP_2, DEC_PROP_1, DEC_PROP_2, BOOL_PROP_1, BOOL_PROP_2 - - - diff --git a/service/src/main/resources/mapper/quartz/TriggersMapper.xml b/service/src/main/resources/mapper/quartz/TriggersMapper.xml deleted file mode 100644 index 3d5d548..0000000 --- a/service/src/main/resources/mapper/quartz/TriggersMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - SCHED_NAME, TRIGGER_NAME, TRIGGER_GROUP, JOB_NAME, JOB_GROUP, DESCRIPTION, NEXT_FIRE_TIME, PREV_FIRE_TIME, PRIORITY, TRIGGER_STATE, TRIGGER_TYPE, START_TIME, END_TIME, CALENDAR_NAME, MISFIRE_INSTR, JOB_DATA - - -