From c63b965e03c612937dee0ba6d593c8d474c605c3 Mon Sep 17 00:00:00 2001 From: stylefeng Date: Fri, 12 Jul 2024 13:49:51 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=908.1.9=E3=80=91=E3=80=90sys=E3=80=91?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=80=E4=B8=AA=E7=94=A8=E6=88=B7=E7=9A=84?= =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=86=BB=E7=BB=93=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roses/kernel/sys/api/enums/user/UserStatusEnum.java | 7 ++++++- .../roses/kernel/sys/api/pojo/user/UserInfoDetailDTO.java | 4 ++-- .../roses/kernel/sys/modular/user/entity/SysUser.java | 4 ++-- .../sys/modular/user/pojo/request/SysUserRequest.java | 4 ++-- .../mysql/V8.1.9_20240712_1348__add_temp_freeze_status.sql | 2 ++ 5 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 kernel-s-system/system-spring-boot-starter/src/main/resources/db/migration/mysql/V8.1.9_20240712_1348__add_temp_freeze_status.sql diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/enums/user/UserStatusEnum.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/enums/user/UserStatusEnum.java index ae75a5a5a..5e3471b31 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/enums/user/UserStatusEnum.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/enums/user/UserStatusEnum.java @@ -49,7 +49,12 @@ public enum UserStatusEnum implements ReadableEnum { /** * 冻结 */ - DISABLE(2, "冻结"); + DISABLE(2, "冻结"), + + /** + * 临时冻结，这个一般用在密码输入次数超过指定次数后，会被临时冻结 + */ + TEMP_FREEZE(3, "临时冻结"); private final Integer code; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/user/UserInfoDetailDTO.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/user/UserInfoDetailDTO.java index 7140d454c..d6d38605f 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/user/UserInfoDetailDTO.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/user/UserInfoDetailDTO.java @@ -108,9 +108,9 @@ public class UserInfoDetailDTO { private String superAdminFlag; /** - * 状态：1-正常，2-冻结 + * 状态：1-正常，2-冻结，3-临时冻结 */ - @ChineseDescription("状态：1-正常，2-冻结") + @ChineseDescription("状态：1-正常，2-冻结，3-临时冻结") private Integer statusFlag; /** diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUser.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUser.java index a74a4cd7b..8339e6837 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUser.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUser.java @@ -125,10 +125,10 @@ public class SysUser extends BaseExpandFieldEntity implements GetSortKey { private String superAdminFlag; /** - * 状态：1-正常，2-冻结 + * 状态：1-正常，2-冻结，3-临时冻结 */ @TableField("status_flag") - @ChineseDescription("状态：1-正常，2-冻结") + @ChineseDescription("状态：1-正常，2-冻结，3-临时冻结") @EnumFieldFormat(processEnum = UserStatusEnum.class) private Integer statusFlag; diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/pojo/request/SysUserRequest.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/pojo/request/SysUserRequest.java index d4b545134..ec4ef6c47 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/pojo/request/SysUserRequest.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/pojo/request/SysUserRequest.java @@ -119,9 +119,9 @@ public class SysUserRequest extends BaseRequest { private String superAdminFlag; /** - * 状态：1-正常，2-冻结 + * 状态：1-正常，2-冻结，3-临时冻结 */ - @ChineseDescription("状态：1-正常，2-冻结") + @ChineseDescription("状态：1-正常，2-冻结，3-临时冻结") @NotNull(message = "状态不能为空", groups = {add.class, edit.class, updateStatus.class}) private Integer statusFlag; diff --git a/kernel-s-system/system-spring-boot-starter/src/main/resources/db/migration/mysql/V8.1.9_20240712_1348__add_temp_freeze_status.sql b/kernel-s-system/system-spring-boot-starter/src/main/resources/db/migration/mysql/V8.1.9_20240712_1348__add_temp_freeze_status.sql new file mode 100644 index 000000000..25805ad75 --- /dev/null +++ b/kernel-s-system/system-spring-boot-starter/src/main/resources/db/migration/mysql/V8.1.9_20240712_1348__add_temp_freeze_status.sql @@ -0,0 +1,2 @@ +ALTER TABLE `sys_user` MODIFY COLUMN `status_flag` tinyint NOT NULL DEFAULT 1 COMMENT '状态：1-正常，2-冻结，3-临时冻结' AFTER `super_admin_flag`, +ADD COLUMN `freeze_deadline_time` datetime NULL COMMENT '账号冻结截止时间，如果是临时冻结，这个值需要填写' AFTER `status_flag`; \ No newline at end of file