From 72b27a102905910f7cf6f8f40cf38d14b39ec5f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=B0=91=E7=BF=94?= <971366405@qq.com> Date: Wed, 21 Aug 2024 17:38:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E7=8A=B6=E6=80=81=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 状态类型字段增加判断 --- src/main/java/com/youlai/system/model/form/DeptForm.java | 2 ++ src/main/java/com/youlai/system/model/form/DictForm.java | 2 ++ src/main/java/com/youlai/system/model/form/MenuForm.java | 2 ++ src/main/java/com/youlai/system/model/form/RoleForm.java | 2 ++ src/main/java/com/youlai/system/model/form/UserForm.java | 3 +++ 5 files changed, 11 insertions(+) diff --git a/src/main/java/com/youlai/system/model/form/DeptForm.java b/src/main/java/com/youlai/system/model/form/DeptForm.java index 6f544d24..5a5941dd 100644 --- a/src/main/java/com/youlai/system/model/form/DeptForm.java +++ b/src/main/java/com/youlai/system/model/form/DeptForm.java @@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; +import org.hibernate.validator.constraints.Range; @Schema(description = "部门表单对象") @Getter @@ -24,6 +25,7 @@ public class DeptForm { private Long parentId; @Schema(description="状态(1:启用;0:禁用)", example = "1") + @Range(min = 0, max = 1, message = "状态值不正确") private Integer status; @Schema(description="排序(数字越小排名越靠前)", example = "1") diff --git a/src/main/java/com/youlai/system/model/form/DictForm.java b/src/main/java/com/youlai/system/model/form/DictForm.java index 7a2cdba3..12e61616 100644 --- a/src/main/java/com/youlai/system/model/form/DictForm.java +++ b/src/main/java/com/youlai/system/model/form/DictForm.java @@ -5,6 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.Getter; import lombok.Setter; +import org.hibernate.validator.constraints.Range; import java.util.List; @@ -28,6 +29,7 @@ public class DictForm { private String code; @Schema(description = "字典状态（1-启用，0-禁用）", example = "1") + @Range(min = 0, max = 1, message = "字典状态不正确") private Integer status; @Schema(description = "字典数据项列表",example = "[{\"id\":1,\"name\":\"男\",\"value\":\"1\",\"sort\":1,\"status\":1},{\"id\":2,\"name\":\"女\",\"value\":\"2\",\"sort\":2,\"status\":1}]") diff --git a/src/main/java/com/youlai/system/model/form/MenuForm.java b/src/main/java/com/youlai/system/model/form/MenuForm.java index cf843a3d..4856e409 100644 --- a/src/main/java/com/youlai/system/model/form/MenuForm.java +++ b/src/main/java/com/youlai/system/model/form/MenuForm.java @@ -4,6 +4,7 @@ import com.youlai.system.enums.MenuTypeEnum; import com.youlai.system.common.model.KeyValue; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import org.hibernate.validator.constraints.Range; import java.util.List; @@ -42,6 +43,7 @@ public class MenuForm { private String perm; @Schema(description = "显示状态(1:显示;0:隐藏)") + @Range(max = 1, min = 0, message = "显示状态不正确") private Integer visible; @Schema(description = "排序(数字越小排名越靠前)") diff --git a/src/main/java/com/youlai/system/model/form/RoleForm.java b/src/main/java/com/youlai/system/model/form/RoleForm.java index 1fca4418..884c0c89 100644 --- a/src/main/java/com/youlai/system/model/form/RoleForm.java +++ b/src/main/java/com/youlai/system/model/form/RoleForm.java @@ -5,6 +5,7 @@ import lombok.Data; // import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank; +import org.hibernate.validator.constraints.Range; @Schema(description = "角色表单对象") @Data @@ -25,6 +26,7 @@ public class RoleForm { private Integer sort; @Schema(description="角色状态(1-正常；0-停用)") + @Range(max = 1, min = 0, message = "角色状态不正确") private Integer status; @Schema(description="数据权限") diff --git a/src/main/java/com/youlai/system/model/form/UserForm.java b/src/main/java/com/youlai/system/model/form/UserForm.java index a7a29087..6d8dda91 100644 --- a/src/main/java/com/youlai/system/model/form/UserForm.java +++ b/src/main/java/com/youlai/system/model/form/UserForm.java @@ -6,6 +6,8 @@ import lombok.Data; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.Pattern; +import org.hibernate.validator.constraints.Range; + import java.util.List; /** @@ -44,6 +46,7 @@ public class UserForm { private String email; @Schema(description="用户状态(1:正常;0:禁用)") + @Range(min = 0, max = 1, message = "用户状态不正确") private Integer status; @Schema(description="部门ID") From 0922880a493d1b962984fad56dbb931955feaaa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com> Date: Thu, 22 Aug 2024 08:04:37 +0000 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E9=85=8D=E7=BD=AE=E8=A1=A8SQL?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8C=E6=AD=A5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 郝先瑞 <1490493387@qq.com> --- sql/mysql5/youlai_boot.sql | 6 +++--- sql/mysql8/youlai_boot.sql | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sql/mysql5/youlai_boot.sql b/sql/mysql5/youlai_boot.sql index a76e7dbb..acd7f106 100644 --- a/sql/mysql5/youlai_boot.sql +++ b/sql/mysql5/youlai_boot.sql @@ -25,9 +25,9 @@ SET FOREIGN_KEY_CHECKS = 0; DROP TABLE IF EXISTS `sys_config`; CREATE TABLE `sys_config` ( `id` bigint NOT NULL AUTO_INCREMENT, - `sys_name` varchar(50) NOT NULL COMMENT '配置名称', - `sys_key` varchar(50) NOT NULL COMMENT '配置key', - `sys_value` varchar(100) NOT NULL COMMENT '配置值', + `config_name` varchar(50) NOT NULL COMMENT '配置名称', + `config_key` varchar(50) NOT NULL COMMENT '配置key', + `config_value` varchar(100) NOT NULL COMMENT '配置值', `remark` varchar(200) DEFAULT NULL COMMENT '描述、备注', `create_time` datetime NOT NULL COMMENT '创建时间', `create_by` bigint NOT NULL COMMENT '创建人ID', diff --git a/sql/mysql8/youlai_boot.sql b/sql/mysql8/youlai_boot.sql index 779091d2..dd7beda1 100644 --- a/sql/mysql8/youlai_boot.sql +++ b/sql/mysql8/youlai_boot.sql @@ -26,9 +26,9 @@ SET FOREIGN_KEY_CHECKS = 0; DROP TABLE IF EXISTS `sys_config`; CREATE TABLE `sys_config` ( `id` bigint NOT NULL AUTO_INCREMENT, - `sys_name` varchar(50) NOT NULL COMMENT '配置名称', - `sys_key` varchar(50) NOT NULL COMMENT '配置key', - `sys_value` varchar(100) NOT NULL COMMENT '配置值', + `config_name` varchar(50) NOT NULL COMMENT '配置名称', + `config_key` varchar(50) NOT NULL COMMENT '配置key', + `config_value` varchar(100) NOT NULL COMMENT '配置值', `remark` varchar(200) DEFAULT NULL COMMENT '描述、备注', `create_time` datetime NOT NULL COMMENT '创建时间', `create_by` bigint NOT NULL COMMENT '创建人ID', From cf494ed306ca60863ab41ee4e31b370f70d86181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com> Date: Fri, 23 Aug 2024 07:30:03 +0000 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E8=8E=B7=E5=8F=96=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E7=94=A8?= =?UTF-8?q?=E6=88=B7ID=E4=BB=8E=E4=B8=8A=E4=B8=8B=E6=96=87=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E8=80=8C=E9=9D=9E=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 郝先瑞 <1490493387@qq.com> --- .../com/youlai/system/controller/SysUserController.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/youlai/system/controller/SysUserController.java b/src/main/java/com/youlai/system/controller/SysUserController.java index 13c621e5..02b47440 100644 --- a/src/main/java/com/youlai/system/controller/SysUserController.java +++ b/src/main/java/com/youlai/system/controller/SysUserController.java @@ -163,10 +163,9 @@ public class SysUserController { } @Operation(summary = "获取个人中心用户信息") - @GetMapping("/{userId}/profile") - public Result getUserProfile( - @Parameter(description = "用户ID") @PathVariable Long userId - ) { + @GetMapping("/profile") + public Result getUserProfile() { + Long userId = SecurityUtils.getUserId(); UserProfileVO userProfile = userService.getUserProfile(userId); return Result.success(userProfile); }