diff --git a/auth-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java b/auth-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java index d0be795..43f87d8 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java @@ -2,21 +2,20 @@ package cn.bunny.services.controller.schedule; import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.services.aop.scanner.QuartzSchedulersScanner; +import cn.bunny.services.domain.common.ValidationGroups; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.quartz.dto.SchedulersAddDto; -import cn.bunny.services.domain.quartz.dto.SchedulersDto; -import cn.bunny.services.domain.quartz.dto.SchedulersUpdateDto; -import cn.bunny.services.domain.quartz.entity.Schedulers; -import cn.bunny.services.domain.quartz.vo.SchedulersVo; +import cn.bunny.services.domain.schedule.dto.SchedulersDto; +import cn.bunny.services.domain.schedule.entity.Schedulers; +import cn.bunny.services.domain.schedule.vo.SchedulersVo; import cn.bunny.services.service.schedule.SchedulersService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -56,15 +55,15 @@ public class SchedulersController { @Operation(summary = "添加任务调度", description = "添加任务") @PermissionTag(permission = "schedulers:add") @PostMapping() - public Result addSchedulers(@Valid @RequestBody SchedulersAddDto dto) { - schedulersService.addSchedulers(dto); + public Result createSchedulers(@Validated(ValidationGroups.Add.class) @RequestBody SchedulersDto dto) { + schedulersService.createSchedulers(dto); return Result.success(ResultCodeEnum.CREATE_SUCCESS); } @Operation(summary = "更新任务调度", description = "更新任务") @PermissionTag(permission = "schedulers:update") @PutMapping() - public Result updateSchedulers(@Valid @RequestBody SchedulersUpdateDto dto) { + public Result updateSchedulers(@Validated(ValidationGroups.Update.class) @RequestBody SchedulersDto dto) { schedulersService.updateSchedulers(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } @@ -72,7 +71,7 @@ public class SchedulersController { @Operation(summary = "暂停任务调度", description = "暂停任务") @PermissionTag(permission = "schedulers:update") @PutMapping("pause") - public Result pause(@RequestBody SchedulersUpdateDto dto) { + public Result pause(@RequestBody SchedulersDto dto) { schedulersService.pauseScheduler(dto); return Result.success(); } @@ -80,7 +79,7 @@ public class SchedulersController { @Operation(summary = "恢复任务调度", description = "恢复任务") @PermissionTag(permission = "schedulers:update") @PutMapping("resume") - public Result resume(@RequestBody SchedulersUpdateDto dto) { + public Result resume(@RequestBody SchedulersDto dto) { schedulersService.resumeScheduler(dto); return Result.success(); } @@ -88,7 +87,7 @@ public class SchedulersController { @Operation(summary = "删除任务调度", description = "删除任务") @PermissionTag(permission = "schedulers:delete") @DeleteMapping() - public Result deleteSchedulers(@RequestBody SchedulersUpdateDto dto) { + public Result deleteSchedulers(@RequestBody SchedulersDto dto) { schedulersService.deleteSchedulers(dto); return Result.success(ResultCodeEnum.DELETE_SUCCESS); } diff --git a/auth-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java b/auth-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java index 9bd2e40..c6f4711 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java @@ -1,21 +1,20 @@ package cn.bunny.services.controller.schedule; import cn.bunny.services.aop.annotation.PermissionTag; +import cn.bunny.services.domain.common.ValidationGroups; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.quartz.dto.SchedulersGroupAddDto; -import cn.bunny.services.domain.quartz.dto.SchedulersGroupDto; -import cn.bunny.services.domain.quartz.dto.SchedulersGroupUpdateDto; -import cn.bunny.services.domain.quartz.entity.SchedulersGroup; -import cn.bunny.services.domain.quartz.vo.SchedulersGroupVo; +import cn.bunny.services.domain.schedule.dto.SchedulersGroupDto; +import cn.bunny.services.domain.schedule.entity.SchedulersGroup; +import cn.bunny.services.domain.schedule.vo.SchedulersGroupVo; import cn.bunny.services.service.schedule.SchedulersGroupService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -54,15 +53,15 @@ public class SchedulersGroupController { @Operation(summary = "添加任务调度分组", description = "添加任务调度分组") @PermissionTag(permission = "schedulersGroup:add") @PostMapping() - public Result addSchedulersGroup(@Valid @RequestBody SchedulersGroupAddDto dto) { - schedulersGroupService.addSchedulersGroup(dto); + public Result createSchedulersGroup(@Validated(ValidationGroups.Add.class) @RequestBody SchedulersGroupDto dto) { + schedulersGroupService.createSchedulersGroup(dto); return Result.success(ResultCodeEnum.CREATE_SUCCESS); } @Operation(summary = "更新任务调度分组", description = "更新任务调度分组") @PermissionTag(permission = "schedulersGroup:update") @PutMapping() - public Result updateSchedulersGroup(@Valid @RequestBody SchedulersGroupUpdateDto dto) { + public Result updateSchedulersGroup(@Validated(ValidationGroups.Update.class) @RequestBody SchedulersGroupDto dto) { schedulersGroupService.updateSchedulersGroup(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } diff --git a/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersAddDto.java b/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersAddDto.java deleted file mode 100644 index 78c0082..0000000 --- a/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersAddDto.java +++ /dev/null @@ -1,39 +0,0 @@ -package cn.bunny.services.domain.quartz.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Schema(name = "SchedulersAddDto对象", title = "添加Schedulers", description = "添加Schedulers") -public class SchedulersAddDto { - - @Schema(name = "jobName", title = "任务名称") - @NotBlank(message = "任务名称不能为空") - private String jobName; - - @Schema(name = "jobGroup", title = "任务分组") - @NotBlank(message = "任务分组不能为空") - private String jobGroup; - - @Schema(name = "description", title = "任务详情") - private String description; - - @Schema(name = "jobClassName", title = "任务类名称") - @NotBlank(message = "corn表达式不能为空") - private String jobClassName; - - @Schema(name = "cronExpression", title = "corn表达式") - @NotBlank(message = "corn表达式不能为空") - private String cronExpression; - -} - - - diff --git a/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersGroupAddDto.java b/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersGroupAddDto.java deleted file mode 100644 index dae4133..0000000 --- a/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersGroupAddDto.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.bunny.services.domain.quartz.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Schema(name = "SchedulersGroupAddDto对象", title = "添加任务调度分组", description = "添加任务调度分组") -public class SchedulersGroupAddDto { - - @Schema(name = "groupName", title = "分组名称") - @NotBlank(message = "分组名称不能为空") - private String groupName; - - @Schema(name = "description", title = "分组详情") - private String description; - -} diff --git a/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersGroupUpdateDto.java b/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersGroupUpdateDto.java deleted file mode 100644 index 1dcb2ed..0000000 --- a/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersGroupUpdateDto.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.bunny.services.domain.quartz.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Schema(name = "SchedulersGroupUpdateDto对象", title = "更新任务调度分组", description = "更新任务调度分组") -public class SchedulersGroupUpdateDto { - - @Schema(name = "id", title = "主键") - @NotNull(message = "id不能为空") - private Long id; - - @Schema(name = "groupName", title = "分组名称") - @NotBlank(message = "分组名称不能为空") - private String groupName; - - @Schema(name = "description", title = "分组详情") - private String description; - -} \ No newline at end of file diff --git a/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersUpdateDto.java b/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersUpdateDto.java deleted file mode 100644 index 181d2f7..0000000 --- a/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersUpdateDto.java +++ /dev/null @@ -1,43 +0,0 @@ -package cn.bunny.services.domain.quartz.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Schema(name = "SchedulersUpdateDto对象", title = "更新Schedulers", description = "更新Schedulers") -public class SchedulersUpdateDto { - - @Schema(name = "jobName", title = "任务名称") - @NotBlank(message = "任务名称不能为空") - private String jobName; - - @Schema(name = "jobGroup", title = "任务分组") - @NotBlank(message = "任务分组不能为空") - private String jobGroup; - - @Schema(name = "description", title = "任务详情") - @NotBlank(message = "任务详情不能为空") - private String description; - - // @Schema(name = "jobClassName", title = "任务类名称") - // @NotBlank(message = "corn表达式不能为空") - // @NotNull(message = "corn表达式不能为空") - // private String jobClassName; - - @Schema(name = "cronExpression", title = "corn表达式") - @NotBlank(message = "corn表达式不能为空") - private String cronExpression; - - // @Schema(name = "jobMethodName", title = "执行方法") - // @NotBlank(message = "执行方法不能为空") - // @NotNull(message = "执行方法不能为空") - // private String jobMethodName; - -} \ No newline at end of file diff --git a/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersDto.java b/auth-core/src/main/java/cn/bunny/services/domain/schedule/dto/SchedulersDto.java similarity index 58% rename from auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/schedule/dto/SchedulersDto.java index 1d3c1b0..33aee82 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/schedule/dto/SchedulersDto.java @@ -1,5 +1,6 @@ -package cn.bunny.services.domain.quartz.dto; +package cn.bunny.services.domain.schedule.dto; +import cn.bunny.services.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; @@ -15,18 +16,26 @@ import lombok.NoArgsConstructor; public class SchedulersDto { @Schema(name = "jobName", title = "任务名称") + @NotBlank(message = "任务名称不能为空", groups = {ValidationGroups.Add.class, ValidationGroups.Update.class}) private String jobName; @Schema(name = "jobGroup", title = "任务分组") + @NotBlank(message = "任务分组不能为空", groups = {ValidationGroups.Add.class, ValidationGroups.Update.class}) private String jobGroup; @Schema(name = "description", title = "任务详情") + @NotBlank(message = "任务详情不能为空", groups = {ValidationGroups.Update.class}) private String description; @Schema(name = "jobClassName", title = "任务类名称") - @NotBlank(message = "corn表达式不能为空") + @NotBlank(message = "corn表达式不能为空", groups = {ValidationGroups.Add.class}) private String jobClassName; + @Schema(name = "cronExpression", title = "corn表达式") + @NotBlank(message = "corn表达式不能为空", groups = {ValidationGroups.Add.class, ValidationGroups.Update.class}) + private String cronExpression; + + @Schema(name = "triggerName", title = "触发器名称") private String triggerName; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersGroupDto.java b/auth-core/src/main/java/cn/bunny/services/domain/schedule/dto/SchedulersGroupDto.java similarity index 54% rename from auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersGroupDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/schedule/dto/SchedulersGroupDto.java index 78fd91a..95b4037 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersGroupDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/schedule/dto/SchedulersGroupDto.java @@ -1,6 +1,9 @@ -package cn.bunny.services.domain.quartz.dto; +package cn.bunny.services.domain.schedule.dto; +import cn.bunny.services.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -12,8 +15,13 @@ import lombok.NoArgsConstructor; @Builder @Schema(name = "SchedulersGroupDto对象", title = "任务调度分组分页查询", description = "任务调度分组分页查询") public class SchedulersGroupDto { + + @Schema(name = "id", title = "主键") + @NotNull(message = "id不能为空", groups = {ValidationGroups.Update.class}) + private Long id; @Schema(name = "groupName", title = "分组名称") + @NotBlank(message = "分组名称不能为空", groups = {ValidationGroups.Add.class, ValidationGroups.Update.class}) private String groupName; @Schema(name = "description", title = "分组详情") diff --git a/auth-core/src/main/java/cn/bunny/services/domain/quartz/entity/Schedulers.java b/auth-core/src/main/java/cn/bunny/services/domain/schedule/entity/Schedulers.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/quartz/entity/Schedulers.java rename to auth-core/src/main/java/cn/bunny/services/domain/schedule/entity/Schedulers.java index 127845a..a3bab91 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/quartz/entity/Schedulers.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/schedule/entity/Schedulers.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.quartz.entity; +package cn.bunny.services.domain.schedule.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/quartz/entity/SchedulersGroup.java b/auth-core/src/main/java/cn/bunny/services/domain/schedule/entity/SchedulersGroup.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/quartz/entity/SchedulersGroup.java rename to auth-core/src/main/java/cn/bunny/services/domain/schedule/entity/SchedulersGroup.java index 0c52848..a582858 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/quartz/entity/SchedulersGroup.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/schedule/entity/SchedulersGroup.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.quartz.entity; +package cn.bunny.services.domain.schedule.entity; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/quartz/vo/SchedulersGroupVo.java b/auth-core/src/main/java/cn/bunny/services/domain/schedule/vo/SchedulersGroupVo.java similarity index 92% rename from auth-core/src/main/java/cn/bunny/services/domain/quartz/vo/SchedulersGroupVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/schedule/vo/SchedulersGroupVo.java index b7e5362..4ceb259 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/quartz/vo/SchedulersGroupVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/schedule/vo/SchedulersGroupVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.quartz.vo; +package cn.bunny.services.domain.schedule.vo; import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/quartz/vo/SchedulersVo.java b/auth-core/src/main/java/cn/bunny/services/domain/schedule/vo/SchedulersVo.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/quartz/vo/SchedulersVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/schedule/vo/SchedulersVo.java index 4b0f5cf..a7e8a0d 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/quartz/vo/SchedulersVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/schedule/vo/SchedulersVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.quartz.vo; +package cn.bunny.services.domain.schedule.vo; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/dao/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java b/dao/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java index 7532e5d..6247a9b 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.schedule; -import cn.bunny.services.domain.quartz.dto.SchedulersGroupDto; -import cn.bunny.services.domain.quartz.entity.SchedulersGroup; -import cn.bunny.services.domain.quartz.vo.SchedulersGroupVo; +import cn.bunny.services.domain.schedule.dto.SchedulersGroupDto; +import cn.bunny.services.domain.schedule.entity.SchedulersGroup; +import cn.bunny.services.domain.schedule.vo.SchedulersGroupVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java b/dao/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java index 471c960..3ac8356 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.schedule; -import cn.bunny.services.domain.quartz.dto.SchedulersDto; -import cn.bunny.services.domain.quartz.entity.Schedulers; +import cn.bunny.services.domain.schedule.dto.SchedulersDto; +import cn.bunny.services.domain.schedule.entity.Schedulers; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml b/dao/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml index 2013afc..dbfdb57 100644 --- a/dao/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml +++ b/dao/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml @@ -3,7 +3,7 @@ - + @@ -20,7 +20,7 @@ - select schedulers_group.*, create_user.username as create_username, diff --git a/dao/src/main/resources/mapper/schedule/SchedulersMapper.xml b/dao/src/main/resources/mapper/schedule/SchedulersMapper.xml index 4079e75..d68e341 100644 --- a/dao/src/main/resources/mapper/schedule/SchedulersMapper.xml +++ b/dao/src/main/resources/mapper/schedule/SchedulersMapper.xml @@ -3,7 +3,7 @@ - + @@ -19,7 +19,7 @@ - select from view_qrtz_schedulers diff --git a/service/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java b/service/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java index 5e9d69a..6faf608 100644 --- a/service/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java +++ b/service/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java @@ -1,11 +1,9 @@ package cn.bunny.services.service.schedule; import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.quartz.dto.SchedulersGroupAddDto; -import cn.bunny.services.domain.quartz.dto.SchedulersGroupDto; -import cn.bunny.services.domain.quartz.dto.SchedulersGroupUpdateDto; -import cn.bunny.services.domain.quartz.entity.SchedulersGroup; -import cn.bunny.services.domain.quartz.vo.SchedulersGroupVo; +import cn.bunny.services.domain.schedule.dto.SchedulersGroupDto; +import cn.bunny.services.domain.schedule.entity.SchedulersGroup; +import cn.bunny.services.domain.schedule.vo.SchedulersGroupVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; @@ -33,14 +31,14 @@ public interface SchedulersGroupService extends IService { * * @param dto 添加表单 */ - void addSchedulersGroup(SchedulersGroupAddDto dto); + void createSchedulersGroup(SchedulersGroupDto dto); /** * * 更新任务调度分组 * * @param dto 更新表单 */ - void updateSchedulersGroup(SchedulersGroupUpdateDto dto); + void updateSchedulersGroup(SchedulersGroupDto dto); /** * * 删除|批量删除任务调度分组类型 diff --git a/service/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java b/service/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java index bdf3a81..2a0e3c3 100644 --- a/service/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java +++ b/service/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java @@ -1,11 +1,9 @@ package cn.bunny.services.service.schedule; import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.quartz.dto.SchedulersAddDto; -import cn.bunny.services.domain.quartz.dto.SchedulersDto; -import cn.bunny.services.domain.quartz.dto.SchedulersUpdateDto; -import cn.bunny.services.domain.quartz.entity.Schedulers; -import cn.bunny.services.domain.quartz.vo.SchedulersVo; +import cn.bunny.services.domain.schedule.dto.SchedulersDto; +import cn.bunny.services.domain.schedule.entity.Schedulers; +import cn.bunny.services.domain.schedule.vo.SchedulersVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; @@ -31,33 +29,33 @@ public interface SchedulersService extends IService { * * @param dto 添加表单 */ - void addSchedulers(SchedulersAddDto dto); + void createSchedulers(SchedulersDto dto); /** * * 暂停Schedulers任务 * * @param dto Schedulers公共操作表单 */ - void pauseScheduler(SchedulersUpdateDto dto); + void pauseScheduler(SchedulersDto dto); /** * * 恢复Schedulers任务 * * @param dto Schedulers公共操作表单 */ - void resumeScheduler(SchedulersUpdateDto dto); + void resumeScheduler(SchedulersDto dto); /** * * 移出Schedulers任务 * * @param dto Schedulers公共操作表单 */ - void deleteSchedulers(SchedulersUpdateDto dto); + void deleteSchedulers(SchedulersDto dto); /** * 更新任务 * * @param dto 更新任务表单 */ - void updateSchedulers(SchedulersUpdateDto dto); + void updateSchedulers(SchedulersDto dto); } diff --git a/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java b/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java index 40f3266..84f1ada 100644 --- a/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java @@ -1,11 +1,9 @@ package cn.bunny.services.service.schedule.impl; import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.quartz.dto.SchedulersGroupAddDto; -import cn.bunny.services.domain.quartz.dto.SchedulersGroupDto; -import cn.bunny.services.domain.quartz.dto.SchedulersGroupUpdateDto; -import cn.bunny.services.domain.quartz.entity.SchedulersGroup; -import cn.bunny.services.domain.quartz.vo.SchedulersGroupVo; +import cn.bunny.services.domain.schedule.dto.SchedulersGroupDto; +import cn.bunny.services.domain.schedule.entity.SchedulersGroup; +import cn.bunny.services.domain.schedule.vo.SchedulersGroupVo; import cn.bunny.services.mapper.schedule.SchedulersGroupMapper; import cn.bunny.services.service.schedule.SchedulersGroupService; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -68,7 +66,7 @@ public class SchedulersGroupServiceImpl extends ServiceImpl