diff --git a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/entity/BaseEntity.java b/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/entity/BaseEntity.java index 2639afa..f0ef20b 100644 --- a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/entity/BaseEntity.java +++ b/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/entity/BaseEntity.java @@ -2,9 +2,9 @@ package com.bgasol.common.core.base.entity; import com.baomidou.mybatisplus.annotation.*; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.MappedSuperclass; -import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -18,6 +18,7 @@ import java.util.Date; @SuperBuilder @NoArgsConstructor @MappedSuperclass +@Entity public class BaseEntity implements Serializable { @Id @TableId(value = "id", type = IdType.ASSIGN_UUID) diff --git a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/entity/BaseTreeEntity.java b/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/entity/BaseTreeEntity.java index 3abfd20..f50ecf9 100644 --- a/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/entity/BaseTreeEntity.java +++ b/cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/entity/BaseTreeEntity.java @@ -15,6 +15,7 @@ import java.util.List; @SuperBuilder @NoArgsConstructor @MappedSuperclass +@Entity public abstract class BaseTreeEntity> extends BaseEntity { public static final String PARENT_ID = "parent_id"; @Schema(description = "父id") diff --git 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 index 4467588..be1655d 100644 --- 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 @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.bgasol.common.core.base.entity.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Entity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -15,6 +16,7 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @TableName("file_t_file") @Schema(description = "文件实体类") +@Entity public class FileEntity extends BaseEntity { @TableField("name") @Schema(description = "文件名称") diff --git 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 index 053c2d2..81a06b8 100644 --- 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 @@ -5,10 +5,13 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.bgasol.common.core.base.entity.BaseEntity; import com.bgasol.model.file.file.entity.FileEntity; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Entity; import jakarta.persistence.JoinColumn; import jakarta.persistence.OneToOne; import jakarta.persistence.Transient; -import lombok.*; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import lombok.experimental.SuperBuilder; @Setter @@ -17,6 +20,7 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @TableName("file_t_image") @Schema(description = "图片实体类") +@Entity public class ImageEntity extends BaseEntity { @Schema(description = "图片名称") @TableField("name") diff --git 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 index 4806325..0aeb7b5 100644 --- 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 @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.bgasol.common.core.base.entity.BaseEntity; import com.bgasol.model.file.file.entity.FileEntity; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Entity; import jakarta.persistence.JoinColumn; import jakarta.persistence.OneToOne; import jakarta.persistence.Transient; @@ -19,6 +20,7 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @TableName("file_t_video") @Schema(description = "视频实体类") +@Entity public class VideoEntity extends BaseEntity { @Schema(description = "视频名称") @TableField("name") diff --git 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 index a24eb5b..a9807b1 100644 --- 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 @@ -5,7 +5,10 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.bgasol.common.core.base.entity.BaseTreeEntity; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import jakarta.persistence.Entity; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import lombok.experimental.SuperBuilder; import java.util.List; @@ -16,6 +19,7 @@ import java.util.List; @NoArgsConstructor @Schema(description = "部门实体") @TableName("system_t_department") +@Entity public class DepartmentEntity extends BaseTreeEntity { @Schema(description = "部门名") diff --git 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 index 850e9c6..56764ac 100644 --- 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 @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.bgasol.common.core.base.entity.BaseTreeEntity; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import lombok.Getter; @@ -17,6 +18,7 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @Schema(description = "菜单实体") @TableName("system_t_menu") +@Entity public class MenuEntity extends BaseTreeEntity { @Schema(description = "菜单名") diff --git 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 index baf7874..b000eb5 100644 --- 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 @@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.bgasol.common.core.base.entity.BaseTreeEntity; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import jakarta.persistence.Entity; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import lombok.experimental.SuperBuilder; @Setter @@ -13,6 +16,7 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @Schema(description = "权限实体") @TableName("system_t_permission") +@Entity public class PermissionEntity extends BaseTreeEntity { @Schema(description = "权限名") diff --git 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 index 36b7226..d4f4844 100644 --- 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 @@ -6,10 +6,13 @@ import com.bgasol.common.core.base.entity.BaseEntity; import com.bgasol.model.system.menu.entity.MenuEntity; import com.bgasol.model.system.permission.entity.PermissionEntity; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Entity; import jakarta.persistence.JoinColumn; import jakarta.persistence.JoinTable; import jakarta.persistence.ManyToMany; -import lombok.*; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import lombok.experimental.SuperBuilder; import java.util.List; @@ -20,6 +23,7 @@ import java.util.List; @NoArgsConstructor @Schema(description = "角色实体") @TableName("system_t_role") +@Entity public class RoleEntity extends BaseEntity { @Schema(description = "角色名") @TableField("name") diff --git 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 index 33ffe84..58a232b 100644 --- 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,6 +21,7 @@ import java.util.List; @NoArgsConstructor @Schema(description = "用户实体类") @TableName("system_t_user") +@Entity public class UserEntity extends BaseEntity { @Schema(description = "用户名")