FatttSnake/oxygen-api
1
0
Fork 0
Code Pull Requests Activity

Optimize UserInfo

Browse Source
This commit is contained in:
Fat Snake
2023-10-30 23:57:49 +08:00
parent c1326f5e7e
commit 7b2ee34917
3 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/kotlin/top/fatweb/api/entity/permission/UserInfo.kt
View File

@@ -18,6 +18,9 @@ class UserInfo : Serializable {
@TableId("id") @TableId("id")
var id: Long? = null var id: Long? = null
@TableField("user_id")
var userId: Long? = null
/** /**
* 昵称 * 昵称
*/ */
@@ -57,6 +60,6 @@ class UserInfo : Serializable {
var version: Int? = null var version: Int? = null
override fun toString(): String { override fun toString(): String {
return "UserInfo(id=$id, nickName=$nickName, avatar=$avatar, email=$email, createTime=$createTime, updateTime=$updateTime, deleted=$deleted, version=$version)" return "UserInfo(id=$id, userId=$userId, nickName=$nickName, avatar=$avatar, email=$email, createTime=$createTime, updateTime=$updateTime, deleted=$deleted, version=$version)"
} }
} }

1
src/main/resources/db/migration/V1_0_0_231104__Add_table_'t_user_info'.sql
View File

@@ -3,6 +3,7 @@ drop table if exists t_user_info;
create table if not exists t_user_info create table if not exists t_user_info
( (
id bigint not null primary key, id bigint not null primary key,
user_id bigint not null comment '用户ID',
nick_name varchar(50) null comment '昵称', nick_name varchar(50) null comment '昵称',
avatar varchar(500) null comment '头像', avatar varchar(500) null comment '头像',
email varchar(100) null comment '邮箱', email varchar(100) null comment '邮箱',

9
src/main/resources/mapper/permission/UserMapper.xml
View File

@@ -17,6 +17,14 @@
t_user.update_time as user_update_time, t_user.update_time as user_update_time,
t_user.deleted as user_deleted, t_user.deleted as user_deleted,
t_user.version as user_version, t_user.version as user_version,
tui.id as user_info_id,
tui.nick_name as user_info_nick_name,
tui.avatar as user_info_avatar,
tui.email as user_info_email,
tui.create_time as user_info_create_time,
tui.update_time as user_info_update_time,
tui.deleted as user_info_deleted,
tui.version as user_info_version,
tmo.id as module_id, tmo.id as module_id,
tmo.name as module_name, tmo.name as module_name,
tmo.power_id as module_power_id, tmo.power_id as module_power_id,
@@ -36,6 +44,7 @@
t.power_id as operation_power_id, t.power_id as operation_power_id,
t.element_id as operation_element_id t.element_id as operation_element_id
from t_user from t_user
left join (select * from t_user_info where deleted = 0) as tui on t_user.id = tui.user_id
left join (select * from t_user_group where deleted = 0) as tug on t_user.id = tug.user_id left join (select * from t_user_group where deleted = 0) as tug on t_user.id = tug.user_id
left join (select * from t_group where deleted = 0 and enable = 1) as tg on tg.id = tug.group_id left join (select * from t_group where deleted = 0 and enable = 1) as tg on tg.id = tug.group_id
left join (select * from t_role_group where deleted = 0) as trg on tg.id = trg.group_id left join (select * from t_role_group where deleted = 0) as trg on tg.id = trg.group_id