From 07c579699ddd5b125e1f7659a948514d712eb93c Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Fri, 1 Jan 2021 22:18:18 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90system=E3=80=91=E6=95=B4=E7=90=86?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E7=BB=84=EF=BC=8C=E5=8E=BB=E6=8E=89group1-5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kernel/rule/pojo/request/BaseRequest.java | 30 ------------------- .../controller/SysTimersController.java | 5 ++-- .../timer/modular/param/SysTimersParam.java | 14 ++++++++- .../user/pojo/request/SysUserRequest.java | 11 +------ 4 files changed, 16 insertions(+), 44 deletions(-) diff --git a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/request/BaseRequest.java b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/request/BaseRequest.java index 7dbe07870..516aa1b16 100644 --- a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/request/BaseRequest.java +++ b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/request/BaseRequest.java @@ -99,34 +99,4 @@ public class BaseRequest implements Serializable { public @interface updateStatus { } - /** - * 预留组1，用来给特殊业务的参数校验用 - */ - public @interface groupOne { - } - - /** - * 预留组2，用来给特殊业务的参数校验用 - */ - public @interface groupTwo { - } - - /** - * 预留组3，用来给特殊业务的参数校验用 - */ - public @interface groupThree { - } - - /** - * 预留组4，用来给特殊业务的参数校验用 - */ - public @interface groupFour { - } - - /** - * 预留组5，用来给特殊业务的参数校验用 - */ - public @interface groupFive { - } - } diff --git a/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/controller/SysTimersController.java b/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/controller/SysTimersController.java index 708b47e22..dc3516caf 100644 --- a/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/controller/SysTimersController.java +++ b/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/controller/SysTimersController.java @@ -3,7 +3,6 @@ package cn.stylefeng.roses.kernel.timer.modular.controller; import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource; import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource; import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource; -import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.timer.modular.param.SysTimersParam; @@ -71,7 +70,7 @@ public class SysTimersController { * @date 2020/7/1 14:34 */ @PostResource(name = "启动定时任务", path = "/sysTimers/start") - public ResponseData start(@RequestBody @Validated(BaseRequest.groupOne.class) SysTimersParam sysTimersParam) { + public ResponseData start(@RequestBody @Validated(SysTimersParam.startTimer.class) SysTimersParam sysTimersParam) { sysTimersService.start(sysTimersParam); return new SuccessResponseData(); } @@ -83,7 +82,7 @@ public class SysTimersController { * @date 2020/7/1 14:34 */ @PostResource(name = "停止定时任务", path = "/sysTimers/stop") - public ResponseData stop(@RequestBody @Validated(BaseRequest.groupOne.class) SysTimersParam sysTimersParam) { + public ResponseData stop(@RequestBody @Validated(SysTimersParam.stopTimer.class) SysTimersParam sysTimersParam) { sysTimersService.stop(sysTimersParam); return new SuccessResponseData(); } diff --git a/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/param/SysTimersParam.java b/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/param/SysTimersParam.java index 2ea34e2de..8618d5b04 100644 --- a/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/param/SysTimersParam.java +++ b/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/param/SysTimersParam.java @@ -20,7 +20,7 @@ public class SysTimersParam extends BaseRequest { /** * 定时器id */ - @NotNull(message = "主键timerId不能为空", groups = {edit.class, detail.class, delete.class, groupOne.class}) + @NotNull(message = "主键timerId不能为空", groups = {edit.class, detail.class, delete.class, startTimer.class, stopTimer.class}) private Long timerId; /** @@ -51,4 +51,16 @@ public class SysTimersParam extends BaseRequest { */ private String remark; + /** + * 启用定时任务 + */ + public @interface startTimer { + } + + /** + * 停止定时任务 + */ + public @interface stopTimer { + } + } diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/request/SysUserRequest.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/request/SysUserRequest.java index 2ae204180..1e327c27e 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/request/SysUserRequest.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/request/SysUserRequest.java @@ -26,7 +26,7 @@ public class SysUserRequest extends BaseRequest { /** * 主键 */ - @NotNull(message = "userId不能为空", groups = {edit.class, delete.class, detail.class, start.class, stop.class, grantRole.class, grantData.class, updateInfo.class, updatePwd.class, resetPwd.class, changeStatus.class, updateAvatar.class}) + @NotNull(message = "userId不能为空", groups = {edit.class, delete.class, detail.class, grantRole.class, grantData.class, updateInfo.class, updatePwd.class, resetPwd.class, changeStatus.class, updateAvatar.class}) private Long userId; /** @@ -136,63 +136,54 @@ public class SysUserRequest extends BaseRequest { * 参数校验分组：修改密码 */ public @interface updatePwd { - } /** * 参数校验分组：重置密码 */ public @interface resetPwd { - } /** * 参数校验分组：修改头像 */ public @interface updateAvatar { - } /** * 参数校验分组：停用 */ public @interface stop { - } /** * 参数校验分组：启用 */ public @interface start { - } /** * 参数校验分组：更新信息 */ public @interface updateInfo { - } /** * 参数校验分组：授权角色 */ public @interface grantRole { - } /** * 参数校验分组：授权数据 */ public @interface grantData { - } /** * 参数校验分组：修改状态 */ public @interface changeStatus { - } }