refactor(database): Update table names and indexes

Updated @TableName annotations in DepartmentEntity, FileEntity, ImageEntity, MenuEntity, PermissionEntity, RoleEntity, and UserEntity Updated @JoinTable annotations in RoleEntity and UserEntity Updated methods for querying associated tables in RoleService and UserService Updated creation scripts for file, image, video, permission, menu, role, and user tables Removed unnecessary indexes and added pagination primary order indexes
2026-05-23 09:08:46 +00:00 · 2025-07-25 22:14:20 +08:00 · 2025-07-25 22:14:20 +08:00 · 0a7768d775
commit 0a7768d775
parent 04eb6015ea
12 changed files with 50 additions and 48 deletions
--- a/cloud/model/model-file/src/main/java/com/bgasol/model/file/file/entity/FileEntity.java
+++ b/cloud/model/model-file/src/main/java/com/bgasol/model/file/file/entity/FileEntity.java
@ -11,7 +11,7 @@ import lombok.experimental.SuperBuilder;
@Getter
@SuperBuilder
@NoArgsConstructor
-@TableName("t_file")
+@TableName("file_t_file")
@Schema(description = "文件实体类")
 public class FileEntity extends BaseEntity {
    @TableField("name")
--- a/cloud/model/model-file/src/main/java/com/bgasol/model/file/image/entity/ImageEntity.java
+++ b/cloud/model/model-file/src/main/java/com/bgasol/model/file/image/entity/ImageEntity.java
@ -15,7 +15,7 @@ import lombok.experimental.SuperBuilder;
@Getter
@SuperBuilder
@NoArgsConstructor
-@TableName("t_image")
+@TableName("file_t_image")
@Schema(description = "图片实体类")
 public class ImageEntity extends BaseEntity {
    @Schema(description = "图片名称")
--- a/cloud/model/model-file/src/main/java/com/bgasol/model/file/video/entity/VideoEntity.java
+++ b/cloud/model/model-file/src/main/java/com/bgasol/model/file/video/entity/VideoEntity.java
@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder;
@Getter
@SuperBuilder
@NoArgsConstructor
-@TableName("t_video")
+@TableName("file_t_video")
@Schema(description = "视频实体类")
 public class VideoEntity extends BaseEntity {
    @Schema(description = "视频名称")
--- a/cloud/model/model-file/src/main/resources/db/file/V1.1__create_file_image.sql
+++ b/cloud/model/model-file/src/main/resources/db/file/V1.1__create_file_image.sql
@ -1,5 +1,5 @@
 -- 文件表
-CREATE TABLE t_file
+CREATE TABLE file_t_file
 (
    id          VARCHAR(255) NOT NULL PRIMARY KEY,
    type        VARCHAR(255),
@ -19,12 +19,12 @@ CREATE TABLE t_file
    bucket      VARCHAR(255)  -- 文件所在桶
 );

-- 为文件表添加索引
-CREATE INDEX idx_file_hash ON t_file(hash);
-CREATE INDEX idx_file_name ON t_file(name);
+-- 分页主序
+CREATE INDEX idx_file_deleted_create_time_desc ON file_t_file (deleted, create_time DESC);
+

 -- 图片表
-CREATE TABLE t_image
+CREATE TABLE file_t_image
 (
    id          VARCHAR(255) NOT NULL PRIMARY KEY,
    type        VARCHAR(255),
@ -36,15 +36,15 @@ CREATE TABLE t_image

    name        VARCHAR(255), -- 图片名称
    width       INTEGER,      -- 图片宽度
-    height      INTEGER,      -- 图片高度
+    height      INTEGER,      -- 图高度
    file_id     VARCHAR(255)  -- 图片文件id
 );

-- 为图片表添加索引
-CREATE INDEX idx_image_file_id ON t_image(file_id);
-CREATE INDEX idx_image_name ON t_image(name);
+-- 分页主序
+CREATE INDEX idx_image_deleted_create_time_desc ON file_t_image (deleted, create_time DESC);

-CREATE TABLE t_video
+-- 视频表
+CREATE TABLE file_t_video
 (
    id          VARCHAR(255) NOT NULL PRIMARY KEY,
    type        VARCHAR(255),
@ -65,6 +65,5 @@ CREATE TABLE t_video
    file_id     VARCHAR(255)  -- 视频文件id
 );

-- 为视频表添加索引
-CREATE INDEX idx_video_file_id ON t_video(file_id);
-CREATE INDEX idx_video_name ON t_video(name);
+-- 分页主序
+CREATE INDEX idx_video_deleted_create_time_desc ON file_t_video (deleted, create_time DESC);
--- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/department/entity/DepartmentEntity.java
+++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/department/entity/DepartmentEntity.java
@ -12,7 +12,7 @@ import lombok.experimental.SuperBuilder;
@SuperBuilder
@NoArgsConstructor
@Schema(description = "部门实体")
-@TableName("t_department")
+@TableName("system_t_department")
 public class DepartmentEntity extends BaseTreeEntity<DepartmentEntity> {

    @Schema(description = "部门名")
--- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/menu/entity/MenuEntity.java
+++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/menu/entity/MenuEntity.java
@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder;
@SuperBuilder
@NoArgsConstructor
@Schema(description = "菜单实体")
-@TableName("t_menu")
+@TableName("system_t_menu")
 public class MenuEntity extends BaseTreeEntity<MenuEntity> {

    @Schema(description = "菜单名")
--- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/permission/entity/PermissionEntity.java
+++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/permission/entity/PermissionEntity.java
@ -12,7 +12,7 @@ import lombok.experimental.SuperBuilder;
@SuperBuilder
@NoArgsConstructor
@Schema(description = "权限实体")
-@TableName("t_permission")
+@TableName("system_t_permission")
 public class PermissionEntity extends BaseTreeEntity<PermissionEntity> {

    @Schema(description = "权限名")
--- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/role/entity/RoleEntity.java
+++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/role/entity/RoleEntity.java
@ -19,7 +19,7 @@ import java.util.List;
@SuperBuilder
@NoArgsConstructor
@Schema(description = "角色实体")
-@TableName("t_role")
+@TableName("system_t_role")
 public class RoleEntity extends BaseEntity {
    @Schema(description = "角色名")
    @TableField("name")
@ -37,7 +37,7 @@ public class RoleEntity extends BaseEntity {
    @TableField(exist = false)
    @ManyToMany(targetEntity = PermissionEntity.class)
    @JoinTable(
-            name = "c_role_permission",
+            name = "system_c_role_permission",
            joinColumns = @JoinColumn(name = "role_id"),
            inverseJoinColumns = @JoinColumn(name = "permission_id")
    )
@ -47,7 +47,7 @@ public class RoleEntity extends BaseEntity {
    @TableField(exist = false)
    @ManyToMany(targetEntity = MenuEntity.class)
    @JoinTable(
-            name = "c_role_menu",
+            name = "system_c_role_menu",
            joinColumns = @JoinColumn(name = "role_id"),
            inverseJoinColumns = @JoinColumn(name = "menu_id")
    )
--- a/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/entity/UserEntity.java
+++ b/cloud/model/model-system/src/main/java/com/bgasol/model/system/user/entity/UserEntity.java
@ -21,7 +21,7 @@ import java.util.List;
@SuperBuilder
@NoArgsConstructor
@Schema(description = "用户实体类")
-@TableName("t_user")
+@TableName("system_t_user")
 public class UserEntity extends BaseEntity {

    @Schema(description = "用户名")
@ -61,7 +61,7 @@ public class UserEntity extends BaseEntity {
    @TableField(exist = false)
    @ManyToMany(targetEntity = RoleEntity.class)
    @JoinTable(
-            name = "c_user_role",
+            name = "system_c_user_role",
            joinColumns = @JoinColumn(name = "user_id"),
            inverseJoinColumns = @JoinColumn(name = "role_id")
    )
--- a/cloud/model/model-system/src/main/resources/db/system/V1.1__user_menu_permission_role_department.sql
+++ b/cloud/model/model-system/src/main/resources/db/system/V1.1__user_menu_permission_role_department.sql
@ -1,5 +1,5 @@
 -- 权限表
-CREATE TABLE t_permission
+CREATE TABLE system_t_permission
 (
    id            VARCHAR(255) NOT NULL PRIMARY KEY,
    type          VARCHAR(255),
@ -15,10 +15,11 @@ CREATE TABLE t_permission
    path          VARCHAR(255), -- 权限路径
    micro_service VARCHAR(255)  -- 微服务名
 );
-CREATE INDEX idx_permission_parent_id ON t_permission(parent_id);
+-- 分页主序
+CREATE INDEX idx_permission_deleted_create_time_desc ON system_t_permission (deleted, create_time DESC);

 -- 菜单表
-CREATE TABLE t_menu
+CREATE TABLE system_t_menu
 (
    id               VARCHAR(255) NOT NULL PRIMARY KEY,
    type             VARCHAR(255),
@ -43,10 +44,11 @@ CREATE TABLE t_menu
    is_hidden        BOOLEAN,      -- 是否隐藏（不显示）
    menu_group       VARCHAR(255)  -- 菜单组
 );
-CREATE INDEX idx_menu_parent_id ON t_menu(parent_id);
+-- 分页主序
+CREATE INDEX idx_menu_deleted_create_time_desc ON system_t_menu (deleted, create_time DESC);

 -- 角色表
-CREATE TABLE t_role
+CREATE TABLE system_t_role
 (
    id          VARCHAR(255) NOT NULL PRIMARY KEY,
    type        VARCHAR(255),
@ -61,10 +63,11 @@ CREATE TABLE t_role
    code        VARCHAR(255), -- 角色编码
    status      INTEGER       -- 角色状态
 );
-CREATE INDEX idx_role_parent_id ON t_role(parent_id);
+-- 分页主序
+CREATE INDEX idx_role_deleted_create_time_desc ON system_t_role (deleted, create_time DESC);

 -- 部门表
-CREATE TABLE t_department
+CREATE TABLE system_t_department
 (
    id          VARCHAR(255) NOT NULL PRIMARY KEY,
    type        VARCHAR(255),
@ -83,10 +86,11 @@ CREATE TABLE t_department
    html        VARCHAR(255), -- 部门备注HTML
    icon_id     VARCHAR(255)  -- 部门图标id 关联图片id
 );
-CREATE INDEX idx_department_parent_id ON t_department(parent_id);
+-- 分页主序
+CREATE INDEX idx_department_deleted_create_time_desc ON system_t_department (deleted, create_time DESC);

 -- 用户表
-CREATE TABLE t_user
+CREATE TABLE system_t_user
 (
    id            VARCHAR(255) NOT NULL PRIMARY KEY,
    type          VARCHAR(255),
@ -106,33 +110,32 @@ CREATE TABLE t_user
    locked        BOOLEAN,      -- 账户锁定
    department_id VARCHAR(255)  -- 角色
 );
-CREATE UNIQUE INDEX idx_user_username ON t_user(username);
-CREATE INDEX idx_user_department_id ON t_user(department_id);
-CREATE INDEX idx_user_status ON t_user(status);
+-- 分页主序
+CREATE INDEX idx_user_deleted_create_time_desc ON system_t_user (deleted, create_time DESC);

 -- 角色菜单关联表
-CREATE TABLE c_role_menu
+CREATE TABLE system_c_role_menu
 (
    role_id VARCHAR(255) NOT NULL,
    menu_id VARCHAR(255) NOT NULL
 );
-CREATE INDEX idx_role_menu_role_id ON c_role_menu(role_id);
-CREATE INDEX idx_role_menu_menu_id ON c_role_menu(menu_id);
+CREATE INDEX idx_role_menu_role_id ON system_c_role_menu(role_id);
+CREATE INDEX idx_role_menu_menu_id ON system_c_role_menu(menu_id);

 -- 角色权限关联表
-CREATE TABLE c_role_permission
+CREATE TABLE system_c_role_permission
 (
    role_id       VARCHAR(255) NOT NULL,
    permission_id VARCHAR(255) NOT NULL
 );
-CREATE INDEX idx_role_permission_role_id ON c_role_permission(role_id);
-CREATE INDEX idx_role_permission_permission_id ON c_role_permission(permission_id);
+CREATE INDEX idx_role_permission_role_id ON system_c_role_permission(role_id);
+CREATE INDEX idx_role_permission_permission_id ON system_c_role_permission(permission_id);

 -- 用户角色关联表
-CREATE TABLE c_user_role
+CREATE TABLE system_c_user_role
 (
    user_id VARCHAR(255) NOT NULL,
    role_id VARCHAR(255) NOT NULL
 );
-CREATE INDEX idx_user_role_user_id ON c_user_role(user_id);
-CREATE INDEX idx_user_role_role_id ON c_user_role(role_id);
+CREATE INDEX idx_user_role_user_id ON system_c_user_role(user_id);
+CREATE INDEX idx_user_role_role_id ON system_c_user_role(role_id);
--- a/cloud/web/web-system-8081/src/main/java/com/bgasol/web/system/role/service/RoleService.java
+++ b/cloud/web/web-system-8081/src/main/java/com/bgasol/web/system/role/service/RoleService.java
@ -42,7 +42,7 @@ public class RoleService extends BaseService<RoleEntity, BasePageDto<RoleEntity>
    public void findOtherTable(RoleEntity roleEntity) {
        // 查询关联的角色
        List<String> permissionIds = this.roleMapper.findFromTable(
-                "c_role_permission",
+                "system_c_role_permission",
                "role_id",
                roleEntity.getId(),
                "permission_id");
@ -54,7 +54,7 @@ public class RoleService extends BaseService<RoleEntity, BasePageDto<RoleEntity>

        // 查询关联的菜单
        List<String> roleIds = this.roleMapper.findFromTable(
-                "c_role_menu",
+                "system_c_role_menu",
                "role_id",
                roleEntity.getId(),
                "menu_id");
--- a/cloud/web/web-system-8081/src/main/java/com/bgasol/web/system/user/service/UserService.java
+++ b/cloud/web/web-system-8081/src/main/java/com/bgasol/web/system/user/service/UserService.java
@ -126,7 +126,7 @@ public class UserService extends BaseService<UserEntity, UserPageDto> {
    @Transactional(readOnly = true)
    public void findOtherTable(UserEntity userEntity) {
        // 获取关联角色
-        List<String> roleIds = this.userMapper.findFromTable("c_user_role",
+        List<String> roleIds = this.userMapper.findFromTable("system_c_user_role",
                "user_id",
                userEntity.getId(),
                "role_id");