From 0fdf18154c4d88d2b4770dd48ba4d499e6a05bbb Mon Sep 17 00:00:00 2001 From: suyiiyii Date: Sat, 24 Aug 2024 23:32:04 +0800 Subject: [PATCH] =?UTF-8?q?refactor(entity):=20=E4=BD=BF=E7=94=A8MyBatis-P?= =?UTF-8?q?lus=E5=92=8CAutoTable=E6=B3=A8=E8=A7=A3=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E4=B8=BB=E9=94=AE=E5=92=8C=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 重构`Role`, `RolePermission`, `User`, 和`UserRole`实体类，统一使用`@ColumnId`注解代替`@TableId`，并为各实体类的字段添加了相应的注释。- 为`Role`实体类的`roleId`和`roleName`字段，`RolePermission`的`roleId`和`permissionId`字段，`User`实体类的`studentId`, `username`, `password`, `email`, `grade`, 和`userGroup`字段，以及`UserRole`的`userId`和`roleId`字段添加了`@ColumnNotNull`注解，以强化字段的非空约束。 --- src/main/java/top/suyiiyii/sims/entity/Role.java | 6 +++++- .../top/suyiiyii/sims/entity/RolePermission.java | 6 +++++- src/main/java/top/suyiiyii/sims/entity/User.java | 12 ++++++++++-- src/main/java/top/suyiiyii/sims/entity/UserRole.java | 6 +++++- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/main/java/top/suyiiyii/sims/entity/Role.java b/src/main/java/top/suyiiyii/sims/entity/Role.java index 69fe543..b4e2737 100644 --- a/src/main/java/top/suyiiyii/sims/entity/Role.java +++ b/src/main/java/top/suyiiyii/sims/entity/Role.java @@ -2,6 +2,8 @@ package top.suyiiyii.sims.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.tangzc.autotable.annotation.ColumnNotNull; +import com.tangzc.mpe.autotable.annotation.ColumnId; import com.tangzc.mpe.autotable.annotation.Table; import lombok.AllArgsConstructor; import lombok.Data; @@ -20,10 +22,12 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor public class Role { - @TableId("id") + @ColumnId(mode = IdType.AUTO,comment = "id主键") private Integer id; + @ColumnNotNull private Integer roleId; //管理员，普通用户，组员，组长，队长 + @ColumnNotNull private String roleName; public static Role guest() { diff --git a/src/main/java/top/suyiiyii/sims/entity/RolePermission.java b/src/main/java/top/suyiiyii/sims/entity/RolePermission.java index f838187..96b9593 100644 --- a/src/main/java/top/suyiiyii/sims/entity/RolePermission.java +++ b/src/main/java/top/suyiiyii/sims/entity/RolePermission.java @@ -3,6 +3,8 @@ package top.suyiiyii.sims.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.tangzc.autotable.annotation.ColumnNotNull; +import com.tangzc.mpe.autotable.annotation.ColumnId; import com.tangzc.mpe.autotable.annotation.Table; import lombok.AllArgsConstructor; import lombok.Data; @@ -23,8 +25,10 @@ import java.security.Permission; @AllArgsConstructor @NoArgsConstructor public class RolePermission { - @TableId("id") + @ColumnId(mode = IdType.AUTO,comment = "id主键") private Integer id; + @ColumnNotNull private Integer roleId; + @ColumnNotNull private Integer permissionId; } diff --git a/src/main/java/top/suyiiyii/sims/entity/User.java b/src/main/java/top/suyiiyii/sims/entity/User.java index d7bed55..000364d 100644 --- a/src/main/java/top/suyiiyii/sims/entity/User.java +++ b/src/main/java/top/suyiiyii/sims/entity/User.java @@ -1,6 +1,8 @@ package top.suyiiyii.sims.entity; -import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.IdType; +import com.tangzc.mpe.autotable.annotation.Column; +import com.tangzc.mpe.autotable.annotation.ColumnId; import com.tangzc.mpe.autotable.annotation.Table; import lombok.AllArgsConstructor; import lombok.Data; @@ -19,12 +21,18 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor public class User { - @TableId("id") + @ColumnId(mode = IdType.AUTO,comment = "id主键") private Integer id; + @Column(comment = "学生id",notNull = true) private Integer studentId; + @Column(comment = "用户名",notNull = true) private String username; + @Column(comment = "密码",notNull = true) private String password; + @Column(comment = "邮箱",notNull = true) private String email; + @Column(comment = "年级",notNull = true) private String grade; + @Column(comment = "用户所属团队",notNull = true) private String userGroup; } diff --git a/src/main/java/top/suyiiyii/sims/entity/UserRole.java b/src/main/java/top/suyiiyii/sims/entity/UserRole.java index 323df76..85f20ae 100644 --- a/src/main/java/top/suyiiyii/sims/entity/UserRole.java +++ b/src/main/java/top/suyiiyii/sims/entity/UserRole.java @@ -2,6 +2,8 @@ package top.suyiiyii.sims.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.tangzc.autotable.annotation.ColumnNotNull; +import com.tangzc.mpe.autotable.annotation.ColumnId; import com.tangzc.mpe.autotable.annotation.Table; import lombok.AllArgsConstructor; import lombok.Data; @@ -20,8 +22,10 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor public class UserRole { - @TableId("id") + @ColumnId(mode = IdType.AUTO,comment = "id主键") private Integer id; + @ColumnNotNull private Integer userId; + @ColumnNotNull private Integer roleId; }