🏷️ feat: 定时任务相关实体类验证分组
This commit is contained in:
parent
00d910a524
commit
7a735da331
|
@ -2,21 +2,20 @@ package cn.bunny.services.controller.schedule;
|
||||||
|
|
||||||
import cn.bunny.services.aop.annotation.PermissionTag;
|
import cn.bunny.services.aop.annotation.PermissionTag;
|
||||||
import cn.bunny.services.aop.scanner.QuartzSchedulersScanner;
|
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.enums.ResultCodeEnum;
|
||||||
import cn.bunny.services.domain.common.model.vo.result.PageResult;
|
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.common.model.vo.result.Result;
|
||||||
import cn.bunny.services.domain.quartz.dto.SchedulersAddDto;
|
import cn.bunny.services.domain.schedule.dto.SchedulersDto;
|
||||||
import cn.bunny.services.domain.quartz.dto.SchedulersDto;
|
import cn.bunny.services.domain.schedule.entity.Schedulers;
|
||||||
import cn.bunny.services.domain.quartz.dto.SchedulersUpdateDto;
|
import cn.bunny.services.domain.schedule.vo.SchedulersVo;
|
||||||
import cn.bunny.services.domain.quartz.entity.Schedulers;
|
|
||||||
import cn.bunny.services.domain.quartz.vo.SchedulersVo;
|
|
||||||
import cn.bunny.services.service.schedule.SchedulersService;
|
import cn.bunny.services.service.schedule.SchedulersService;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import io.swagger.v3.oas.annotations.Operation;
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
import io.swagger.v3.oas.annotations.Parameter;
|
import io.swagger.v3.oas.annotations.Parameter;
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
import jakarta.annotation.Resource;
|
import jakarta.annotation.Resource;
|
||||||
import jakarta.validation.Valid;
|
import org.springframework.validation.annotation.Validated;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -56,15 +55,15 @@ public class SchedulersController {
|
||||||
@Operation(summary = "添加任务调度", description = "添加任务")
|
@Operation(summary = "添加任务调度", description = "添加任务")
|
||||||
@PermissionTag(permission = "schedulers:add")
|
@PermissionTag(permission = "schedulers:add")
|
||||||
@PostMapping()
|
@PostMapping()
|
||||||
public Result<Object> addSchedulers(@Valid @RequestBody SchedulersAddDto dto) {
|
public Result<Object> createSchedulers(@Validated(ValidationGroups.Add.class) @RequestBody SchedulersDto dto) {
|
||||||
schedulersService.addSchedulers(dto);
|
schedulersService.createSchedulers(dto);
|
||||||
return Result.success(ResultCodeEnum.CREATE_SUCCESS);
|
return Result.success(ResultCodeEnum.CREATE_SUCCESS);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Operation(summary = "更新任务调度", description = "更新任务")
|
@Operation(summary = "更新任务调度", description = "更新任务")
|
||||||
@PermissionTag(permission = "schedulers:update")
|
@PermissionTag(permission = "schedulers:update")
|
||||||
@PutMapping()
|
@PutMapping()
|
||||||
public Result<String> updateSchedulers(@Valid @RequestBody SchedulersUpdateDto dto) {
|
public Result<String> updateSchedulers(@Validated(ValidationGroups.Update.class) @RequestBody SchedulersDto dto) {
|
||||||
schedulersService.updateSchedulers(dto);
|
schedulersService.updateSchedulers(dto);
|
||||||
return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
|
return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
|
||||||
}
|
}
|
||||||
|
@ -72,7 +71,7 @@ public class SchedulersController {
|
||||||
@Operation(summary = "暂停任务调度", description = "暂停任务")
|
@Operation(summary = "暂停任务调度", description = "暂停任务")
|
||||||
@PermissionTag(permission = "schedulers:update")
|
@PermissionTag(permission = "schedulers:update")
|
||||||
@PutMapping("pause")
|
@PutMapping("pause")
|
||||||
public Result<String> pause(@RequestBody SchedulersUpdateDto dto) {
|
public Result<String> pause(@RequestBody SchedulersDto dto) {
|
||||||
schedulersService.pauseScheduler(dto);
|
schedulersService.pauseScheduler(dto);
|
||||||
return Result.success();
|
return Result.success();
|
||||||
}
|
}
|
||||||
|
@ -80,7 +79,7 @@ public class SchedulersController {
|
||||||
@Operation(summary = "恢复任务调度", description = "恢复任务")
|
@Operation(summary = "恢复任务调度", description = "恢复任务")
|
||||||
@PermissionTag(permission = "schedulers:update")
|
@PermissionTag(permission = "schedulers:update")
|
||||||
@PutMapping("resume")
|
@PutMapping("resume")
|
||||||
public Result<String> resume(@RequestBody SchedulersUpdateDto dto) {
|
public Result<String> resume(@RequestBody SchedulersDto dto) {
|
||||||
schedulersService.resumeScheduler(dto);
|
schedulersService.resumeScheduler(dto);
|
||||||
return Result.success();
|
return Result.success();
|
||||||
}
|
}
|
||||||
|
@ -88,7 +87,7 @@ public class SchedulersController {
|
||||||
@Operation(summary = "删除任务调度", description = "删除任务")
|
@Operation(summary = "删除任务调度", description = "删除任务")
|
||||||
@PermissionTag(permission = "schedulers:delete")
|
@PermissionTag(permission = "schedulers:delete")
|
||||||
@DeleteMapping()
|
@DeleteMapping()
|
||||||
public Result<String> deleteSchedulers(@RequestBody SchedulersUpdateDto dto) {
|
public Result<String> deleteSchedulers(@RequestBody SchedulersDto dto) {
|
||||||
schedulersService.deleteSchedulers(dto);
|
schedulersService.deleteSchedulers(dto);
|
||||||
return Result.success(ResultCodeEnum.DELETE_SUCCESS);
|
return Result.success(ResultCodeEnum.DELETE_SUCCESS);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,21 +1,20 @@
|
||||||
package cn.bunny.services.controller.schedule;
|
package cn.bunny.services.controller.schedule;
|
||||||
|
|
||||||
import cn.bunny.services.aop.annotation.PermissionTag;
|
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.enums.ResultCodeEnum;
|
||||||
import cn.bunny.services.domain.common.model.vo.result.PageResult;
|
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.common.model.vo.result.Result;
|
||||||
import cn.bunny.services.domain.quartz.dto.SchedulersGroupAddDto;
|
import cn.bunny.services.domain.schedule.dto.SchedulersGroupDto;
|
||||||
import cn.bunny.services.domain.quartz.dto.SchedulersGroupDto;
|
import cn.bunny.services.domain.schedule.entity.SchedulersGroup;
|
||||||
import cn.bunny.services.domain.quartz.dto.SchedulersGroupUpdateDto;
|
import cn.bunny.services.domain.schedule.vo.SchedulersGroupVo;
|
||||||
import cn.bunny.services.domain.quartz.entity.SchedulersGroup;
|
|
||||||
import cn.bunny.services.domain.quartz.vo.SchedulersGroupVo;
|
|
||||||
import cn.bunny.services.service.schedule.SchedulersGroupService;
|
import cn.bunny.services.service.schedule.SchedulersGroupService;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import io.swagger.v3.oas.annotations.Operation;
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
import io.swagger.v3.oas.annotations.Parameter;
|
import io.swagger.v3.oas.annotations.Parameter;
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
import jakarta.annotation.Resource;
|
import jakarta.annotation.Resource;
|
||||||
import jakarta.validation.Valid;
|
import org.springframework.validation.annotation.Validated;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -54,15 +53,15 @@ public class SchedulersGroupController {
|
||||||
@Operation(summary = "添加任务调度分组", description = "添加任务调度分组")
|
@Operation(summary = "添加任务调度分组", description = "添加任务调度分组")
|
||||||
@PermissionTag(permission = "schedulersGroup:add")
|
@PermissionTag(permission = "schedulersGroup:add")
|
||||||
@PostMapping()
|
@PostMapping()
|
||||||
public Result<String> addSchedulersGroup(@Valid @RequestBody SchedulersGroupAddDto dto) {
|
public Result<String> createSchedulersGroup(@Validated(ValidationGroups.Add.class) @RequestBody SchedulersGroupDto dto) {
|
||||||
schedulersGroupService.addSchedulersGroup(dto);
|
schedulersGroupService.createSchedulersGroup(dto);
|
||||||
return Result.success(ResultCodeEnum.CREATE_SUCCESS);
|
return Result.success(ResultCodeEnum.CREATE_SUCCESS);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Operation(summary = "更新任务调度分组", description = "更新任务调度分组")
|
@Operation(summary = "更新任务调度分组", description = "更新任务调度分组")
|
||||||
@PermissionTag(permission = "schedulersGroup:update")
|
@PermissionTag(permission = "schedulersGroup:update")
|
||||||
@PutMapping()
|
@PutMapping()
|
||||||
public Result<String> updateSchedulersGroup(@Valid @RequestBody SchedulersGroupUpdateDto dto) {
|
public Result<String> updateSchedulersGroup(@Validated(ValidationGroups.Update.class) @RequestBody SchedulersGroupDto dto) {
|
||||||
schedulersGroupService.updateSchedulersGroup(dto);
|
schedulersGroupService.updateSchedulersGroup(dto);
|
||||||
return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
|
return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
|
||||||
}
|
}
|
||||||
|
|
|
@ -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;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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;
|
|
||||||
|
|
||||||
}
|
|
|
@ -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;
|
|
||||||
|
|
||||||
}
|
|
|
@ -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;
|
|
||||||
|
|
||||||
}
|
|
|
@ -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 io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import jakarta.validation.constraints.NotBlank;
|
import jakarta.validation.constraints.NotBlank;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
|
@ -15,18 +16,26 @@ import lombok.NoArgsConstructor;
|
||||||
public class SchedulersDto {
|
public class SchedulersDto {
|
||||||
|
|
||||||
@Schema(name = "jobName", title = "任务名称")
|
@Schema(name = "jobName", title = "任务名称")
|
||||||
|
@NotBlank(message = "任务名称不能为空", groups = {ValidationGroups.Add.class, ValidationGroups.Update.class})
|
||||||
private String jobName;
|
private String jobName;
|
||||||
|
|
||||||
@Schema(name = "jobGroup", title = "任务分组")
|
@Schema(name = "jobGroup", title = "任务分组")
|
||||||
|
@NotBlank(message = "任务分组不能为空", groups = {ValidationGroups.Add.class, ValidationGroups.Update.class})
|
||||||
private String jobGroup;
|
private String jobGroup;
|
||||||
|
|
||||||
@Schema(name = "description", title = "任务详情")
|
@Schema(name = "description", title = "任务详情")
|
||||||
|
@NotBlank(message = "任务详情不能为空", groups = {ValidationGroups.Update.class})
|
||||||
private String description;
|
private String description;
|
||||||
|
|
||||||
@Schema(name = "jobClassName", title = "任务类名称")
|
@Schema(name = "jobClassName", title = "任务类名称")
|
||||||
@NotBlank(message = "corn表达式不能为空")
|
@NotBlank(message = "corn表达式不能为空", groups = {ValidationGroups.Add.class})
|
||||||
private String jobClassName;
|
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 = "触发器名称")
|
@Schema(name = "triggerName", title = "触发器名称")
|
||||||
private String triggerName;
|
private String triggerName;
|
||||||
|
|
|
@ -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 io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import jakarta.validation.constraints.NotBlank;
|
||||||
|
import jakarta.validation.constraints.NotNull;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
@ -13,7 +16,12 @@ import lombok.NoArgsConstructor;
|
||||||
@Schema(name = "SchedulersGroupDto对象", title = "任务调度分组分页查询", description = "任务调度分组分页查询")
|
@Schema(name = "SchedulersGroupDto对象", title = "任务调度分组分页查询", description = "任务调度分组分页查询")
|
||||||
public class SchedulersGroupDto {
|
public class SchedulersGroupDto {
|
||||||
|
|
||||||
|
@Schema(name = "id", title = "主键")
|
||||||
|
@NotNull(message = "id不能为空", groups = {ValidationGroups.Update.class})
|
||||||
|
private Long id;
|
||||||
|
|
||||||
@Schema(name = "groupName", title = "分组名称")
|
@Schema(name = "groupName", title = "分组名称")
|
||||||
|
@NotBlank(message = "分组名称不能为空", groups = {ValidationGroups.Add.class, ValidationGroups.Update.class})
|
||||||
private String groupName;
|
private String groupName;
|
||||||
|
|
||||||
@Schema(name = "description", title = "分组详情")
|
@Schema(name = "description", title = "分组详情")
|
|
@ -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.IdType;
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
import com.baomidou.mybatisplus.annotation.TableField;
|
|
@ -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 cn.bunny.services.domain.common.model.entity.BaseEntity;
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
import com.baomidou.mybatisplus.annotation.TableField;
|
|
@ -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 cn.bunny.services.domain.common.model.vo.BaseUserVo;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
|
@ -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 io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
|
@ -1,8 +1,8 @@
|
||||||
package cn.bunny.services.mapper.schedule;
|
package cn.bunny.services.mapper.schedule;
|
||||||
|
|
||||||
import cn.bunny.services.domain.quartz.dto.SchedulersGroupDto;
|
import cn.bunny.services.domain.schedule.dto.SchedulersGroupDto;
|
||||||
import cn.bunny.services.domain.quartz.entity.SchedulersGroup;
|
import cn.bunny.services.domain.schedule.entity.SchedulersGroup;
|
||||||
import cn.bunny.services.domain.quartz.vo.SchedulersGroupVo;
|
import cn.bunny.services.domain.schedule.vo.SchedulersGroupVo;
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package cn.bunny.services.mapper.schedule;
|
package cn.bunny.services.mapper.schedule;
|
||||||
|
|
||||||
import cn.bunny.services.domain.quartz.dto.SchedulersDto;
|
import cn.bunny.services.domain.schedule.dto.SchedulersDto;
|
||||||
import cn.bunny.services.domain.quartz.entity.Schedulers;
|
import cn.bunny.services.domain.schedule.entity.Schedulers;
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<mapper namespace="cn.bunny.services.mapper.schedule.SchedulersGroupMapper">
|
<mapper namespace="cn.bunny.services.mapper.schedule.SchedulersGroupMapper">
|
||||||
|
|
||||||
<!-- 通用查询映射结果 -->
|
<!-- 通用查询映射结果 -->
|
||||||
<resultMap id="BaseResultMap" type="cn.bunny.services.domain.quartz.entity.SchedulersGroup">
|
<resultMap id="BaseResultMap" type="cn.bunny.services.domain.schedule.entity.SchedulersGroup">
|
||||||
<id column="id" property="id"/>
|
<id column="id" property="id"/>
|
||||||
<id column="create_time" property="createTime"/>
|
<id column="create_time" property="createTime"/>
|
||||||
<id column="update_time" property="updateTime"/>
|
<id column="update_time" property="updateTime"/>
|
||||||
|
@ -20,7 +20,7 @@
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<!-- 分页查询任务调度分组内容 -->
|
<!-- 分页查询任务调度分组内容 -->
|
||||||
<select id="selectListByPage" resultType="cn.bunny.services.domain.quartz.vo.SchedulersGroupVo">
|
<select id="selectListByPage" resultType="cn.bunny.services.domain.schedule.vo.SchedulersGroupVo">
|
||||||
select
|
select
|
||||||
schedulers_group.*,
|
schedulers_group.*,
|
||||||
create_user.username as create_username,
|
create_user.username as create_username,
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<mapper namespace="cn.bunny.services.mapper.schedule.SchedulersMapper">
|
<mapper namespace="cn.bunny.services.mapper.schedule.SchedulersMapper">
|
||||||
|
|
||||||
<!-- 通用查询映射结果 -->
|
<!-- 通用查询映射结果 -->
|
||||||
<resultMap id="BaseResultMap" type="cn.bunny.services.domain.quartz.entity.Schedulers">
|
<resultMap id="BaseResultMap" type="cn.bunny.services.domain.schedule.entity.Schedulers">
|
||||||
<id column="job_name" property="jobName"/>
|
<id column="job_name" property="jobName"/>
|
||||||
<id column="job_group" property="jobGroup"/>
|
<id column="job_group" property="jobGroup"/>
|
||||||
<id column="description" property="description"/>
|
<id column="description" property="description"/>
|
||||||
|
@ -19,7 +19,7 @@
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<!-- 分页查询Schedulers视图内容 -->
|
<!-- 分页查询Schedulers视图内容 -->
|
||||||
<select id="selectListByPage" resultType="cn.bunny.services.domain.quartz.entity.Schedulers">
|
<select id="selectListByPage" resultType="cn.bunny.services.domain.schedule.entity.Schedulers">
|
||||||
select
|
select
|
||||||
<include refid="Base_Column_List"/>
|
<include refid="Base_Column_List"/>
|
||||||
from view_qrtz_schedulers
|
from view_qrtz_schedulers
|
||||||
|
|
|
@ -1,11 +1,9 @@
|
||||||
package cn.bunny.services.service.schedule;
|
package cn.bunny.services.service.schedule;
|
||||||
|
|
||||||
import cn.bunny.services.domain.common.model.vo.result.PageResult;
|
import cn.bunny.services.domain.common.model.vo.result.PageResult;
|
||||||
import cn.bunny.services.domain.quartz.dto.SchedulersGroupAddDto;
|
import cn.bunny.services.domain.schedule.dto.SchedulersGroupDto;
|
||||||
import cn.bunny.services.domain.quartz.dto.SchedulersGroupDto;
|
import cn.bunny.services.domain.schedule.entity.SchedulersGroup;
|
||||||
import cn.bunny.services.domain.quartz.dto.SchedulersGroupUpdateDto;
|
import cn.bunny.services.domain.schedule.vo.SchedulersGroupVo;
|
||||||
import cn.bunny.services.domain.quartz.entity.SchedulersGroup;
|
|
||||||
import cn.bunny.services.domain.quartz.vo.SchedulersGroupVo;
|
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
|
|
||||||
|
@ -33,14 +31,14 @@ public interface SchedulersGroupService extends IService<SchedulersGroup> {
|
||||||
*
|
*
|
||||||
* @param dto 添加表单
|
* @param dto 添加表单
|
||||||
*/
|
*/
|
||||||
void addSchedulersGroup(SchedulersGroupAddDto dto);
|
void createSchedulersGroup(SchedulersGroupDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* * 更新任务调度分组
|
* * 更新任务调度分组
|
||||||
*
|
*
|
||||||
* @param dto 更新表单
|
* @param dto 更新表单
|
||||||
*/
|
*/
|
||||||
void updateSchedulersGroup(SchedulersGroupUpdateDto dto);
|
void updateSchedulersGroup(SchedulersGroupDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* * 删除|批量删除任务调度分组类型
|
* * 删除|批量删除任务调度分组类型
|
||||||
|
|
|
@ -1,11 +1,9 @@
|
||||||
package cn.bunny.services.service.schedule;
|
package cn.bunny.services.service.schedule;
|
||||||
|
|
||||||
import cn.bunny.services.domain.common.model.vo.result.PageResult;
|
import cn.bunny.services.domain.common.model.vo.result.PageResult;
|
||||||
import cn.bunny.services.domain.quartz.dto.SchedulersAddDto;
|
import cn.bunny.services.domain.schedule.dto.SchedulersDto;
|
||||||
import cn.bunny.services.domain.quartz.dto.SchedulersDto;
|
import cn.bunny.services.domain.schedule.entity.Schedulers;
|
||||||
import cn.bunny.services.domain.quartz.dto.SchedulersUpdateDto;
|
import cn.bunny.services.domain.schedule.vo.SchedulersVo;
|
||||||
import cn.bunny.services.domain.quartz.entity.Schedulers;
|
|
||||||
import cn.bunny.services.domain.quartz.vo.SchedulersVo;
|
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
|
|
||||||
|
@ -31,33 +29,33 @@ public interface SchedulersService extends IService<Schedulers> {
|
||||||
*
|
*
|
||||||
* @param dto 添加表单
|
* @param dto 添加表单
|
||||||
*/
|
*/
|
||||||
void addSchedulers(SchedulersAddDto dto);
|
void createSchedulers(SchedulersDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* * 暂停Schedulers任务
|
* * 暂停Schedulers任务
|
||||||
*
|
*
|
||||||
* @param dto Schedulers公共操作表单
|
* @param dto Schedulers公共操作表单
|
||||||
*/
|
*/
|
||||||
void pauseScheduler(SchedulersUpdateDto dto);
|
void pauseScheduler(SchedulersDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* * 恢复Schedulers任务
|
* * 恢复Schedulers任务
|
||||||
*
|
*
|
||||||
* @param dto Schedulers公共操作表单
|
* @param dto Schedulers公共操作表单
|
||||||
*/
|
*/
|
||||||
void resumeScheduler(SchedulersUpdateDto dto);
|
void resumeScheduler(SchedulersDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* * 移出Schedulers任务
|
* * 移出Schedulers任务
|
||||||
*
|
*
|
||||||
* @param dto Schedulers公共操作表单
|
* @param dto Schedulers公共操作表单
|
||||||
*/
|
*/
|
||||||
void deleteSchedulers(SchedulersUpdateDto dto);
|
void deleteSchedulers(SchedulersDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新任务
|
* 更新任务
|
||||||
*
|
*
|
||||||
* @param dto 更新任务表单
|
* @param dto 更新任务表单
|
||||||
*/
|
*/
|
||||||
void updateSchedulers(SchedulersUpdateDto dto);
|
void updateSchedulers(SchedulersDto dto);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,11 +1,9 @@
|
||||||
package cn.bunny.services.service.schedule.impl;
|
package cn.bunny.services.service.schedule.impl;
|
||||||
|
|
||||||
import cn.bunny.services.domain.common.model.vo.result.PageResult;
|
import cn.bunny.services.domain.common.model.vo.result.PageResult;
|
||||||
import cn.bunny.services.domain.quartz.dto.SchedulersGroupAddDto;
|
import cn.bunny.services.domain.schedule.dto.SchedulersGroupDto;
|
||||||
import cn.bunny.services.domain.quartz.dto.SchedulersGroupDto;
|
import cn.bunny.services.domain.schedule.entity.SchedulersGroup;
|
||||||
import cn.bunny.services.domain.quartz.dto.SchedulersGroupUpdateDto;
|
import cn.bunny.services.domain.schedule.vo.SchedulersGroupVo;
|
||||||
import cn.bunny.services.domain.quartz.entity.SchedulersGroup;
|
|
||||||
import cn.bunny.services.domain.quartz.vo.SchedulersGroupVo;
|
|
||||||
import cn.bunny.services.mapper.schedule.SchedulersGroupMapper;
|
import cn.bunny.services.mapper.schedule.SchedulersGroupMapper;
|
||||||
import cn.bunny.services.service.schedule.SchedulersGroupService;
|
import cn.bunny.services.service.schedule.SchedulersGroupService;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
|
@ -68,7 +66,7 @@ public class SchedulersGroupServiceImpl extends ServiceImpl<SchedulersGroupMappe
|
||||||
* @param dto 任务调度分组添加
|
* @param dto 任务调度分组添加
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void addSchedulersGroup(SchedulersGroupAddDto dto) {
|
public void createSchedulersGroup(SchedulersGroupDto dto) {
|
||||||
// 保存数据
|
// 保存数据
|
||||||
SchedulersGroup schedulersGroup = new SchedulersGroup();
|
SchedulersGroup schedulersGroup = new SchedulersGroup();
|
||||||
BeanUtils.copyProperties(dto, schedulersGroup);
|
BeanUtils.copyProperties(dto, schedulersGroup);
|
||||||
|
@ -81,7 +79,7 @@ public class SchedulersGroupServiceImpl extends ServiceImpl<SchedulersGroupMappe
|
||||||
* @param dto 任务调度分组更新
|
* @param dto 任务调度分组更新
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void updateSchedulersGroup(SchedulersGroupUpdateDto dto) {
|
public void updateSchedulersGroup(SchedulersGroupDto dto) {
|
||||||
// 更新内容
|
// 更新内容
|
||||||
SchedulersGroup schedulersGroup = new SchedulersGroup();
|
SchedulersGroup schedulersGroup = new SchedulersGroup();
|
||||||
BeanUtils.copyProperties(dto, schedulersGroup);
|
BeanUtils.copyProperties(dto, schedulersGroup);
|
||||||
|
|
|
@ -2,11 +2,9 @@ package cn.bunny.services.service.schedule.impl;
|
||||||
|
|
||||||
import cn.bunny.services.domain.common.enums.ResultCodeEnum;
|
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.PageResult;
|
||||||
import cn.bunny.services.domain.quartz.dto.SchedulersAddDto;
|
import cn.bunny.services.domain.schedule.dto.SchedulersDto;
|
||||||
import cn.bunny.services.domain.quartz.dto.SchedulersDto;
|
import cn.bunny.services.domain.schedule.entity.Schedulers;
|
||||||
import cn.bunny.services.domain.quartz.dto.SchedulersUpdateDto;
|
import cn.bunny.services.domain.schedule.vo.SchedulersVo;
|
||||||
import cn.bunny.services.domain.quartz.entity.Schedulers;
|
|
||||||
import cn.bunny.services.domain.quartz.vo.SchedulersVo;
|
|
||||||
import cn.bunny.services.exception.AuthCustomerException;
|
import cn.bunny.services.exception.AuthCustomerException;
|
||||||
import cn.bunny.services.mapper.schedule.SchedulersMapper;
|
import cn.bunny.services.mapper.schedule.SchedulersMapper;
|
||||||
import cn.bunny.services.service.schedule.SchedulersService;
|
import cn.bunny.services.service.schedule.SchedulersService;
|
||||||
|
@ -67,7 +65,7 @@ public class SchedulersServiceImpl extends ServiceImpl<SchedulersMapper, Schedul
|
||||||
* @param dto 更新任务表单
|
* @param dto 更新任务表单
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void updateSchedulers(SchedulersUpdateDto dto) {
|
public void updateSchedulers(SchedulersDto dto) {
|
||||||
String jobName = dto.getJobName();
|
String jobName = dto.getJobName();
|
||||||
String jobGroup = dto.getJobGroup();
|
String jobGroup = dto.getJobGroup();
|
||||||
String cronExpression = dto.getCronExpression();
|
String cronExpression = dto.getCronExpression();
|
||||||
|
@ -98,7 +96,7 @@ public class SchedulersServiceImpl extends ServiceImpl<SchedulersMapper, Schedul
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@Override
|
@Override
|
||||||
public void addSchedulers(SchedulersAddDto dto) {
|
public void createSchedulers(SchedulersDto dto) {
|
||||||
String jobName = dto.getJobName();
|
String jobName = dto.getJobName();
|
||||||
String jobGroup = dto.getJobGroup();
|
String jobGroup = dto.getJobGroup();
|
||||||
String cronExpression = dto.getCronExpression();
|
String cronExpression = dto.getCronExpression();
|
||||||
|
@ -143,7 +141,7 @@ public class SchedulersServiceImpl extends ServiceImpl<SchedulersMapper, Schedul
|
||||||
* @param dto Schedulers公共操作表单
|
* @param dto Schedulers公共操作表单
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void pauseScheduler(SchedulersUpdateDto dto) {
|
public void pauseScheduler(SchedulersDto dto) {
|
||||||
try {
|
try {
|
||||||
JobKey key = new JobKey(dto.getJobName(), dto.getJobGroup());
|
JobKey key = new JobKey(dto.getJobName(), dto.getJobGroup());
|
||||||
scheduler.pauseJob(key);
|
scheduler.pauseJob(key);
|
||||||
|
@ -158,7 +156,7 @@ public class SchedulersServiceImpl extends ServiceImpl<SchedulersMapper, Schedul
|
||||||
* @param dto Schedulers公共操作表单
|
* @param dto Schedulers公共操作表单
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void resumeScheduler(SchedulersUpdateDto dto) {
|
public void resumeScheduler(SchedulersDto dto) {
|
||||||
try {
|
try {
|
||||||
JobKey key = new JobKey(dto.getJobName(), dto.getJobGroup());
|
JobKey key = new JobKey(dto.getJobName(), dto.getJobGroup());
|
||||||
scheduler.resumeJob(key);
|
scheduler.resumeJob(key);
|
||||||
|
@ -173,7 +171,7 @@ public class SchedulersServiceImpl extends ServiceImpl<SchedulersMapper, Schedul
|
||||||
* @param dto Schedulers公共操作表单
|
* @param dto Schedulers公共操作表单
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void deleteSchedulers(SchedulersUpdateDto dto) {
|
public void deleteSchedulers(SchedulersDto dto) {
|
||||||
try {
|
try {
|
||||||
String jobGroup = dto.getJobGroup();
|
String jobGroup = dto.getJobGroup();
|
||||||
String jobName = dto.getJobName();
|
String jobName = dto.getJobName();
|
||||||
|
|
Loading…
Reference in New Issue