refactor(entity): 使用MyBatis-Plus和AutoTable注解重新定义主键和注释

- 重构`Role`, `RolePermission`, `User`, 和`UserRole`实体类,统一使用`@ColumnId`注解代替`@TableId`,并为各实体类的字段添加了相应的注释。- 为`Role`实体类的`roleId`和`roleName`字段,`RolePermission`的`roleId`和`permissionId`字段,`User`实体类的`studentId`, `username`, `password`, `email`, `grade`, 和`userGroup`字段,以及`UserRole`的`userId`和`roleId`字段添加了`@ColumnNotNull`注解,以强化字段的非空约束。
This commit is contained in:
suyiiyii 2024-08-24 23:32:04 +08:00
parent 1723555606
commit 0fdf18154c
4 changed files with 25 additions and 5 deletions

View File

@ -2,6 +2,8 @@ package top.suyiiyii.sims.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; 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 com.tangzc.mpe.autotable.annotation.Table;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
@ -20,10 +22,12 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
public class Role { public class Role {
@TableId("id") @ColumnId(mode = IdType.AUTO,comment = "id主键")
private Integer id; private Integer id;
@ColumnNotNull
private Integer roleId; private Integer roleId;
//管理员普通用户组员组长队长 //管理员普通用户组员组长队长
@ColumnNotNull
private String roleName; private String roleName;
public static Role guest() { public static Role guest() {

View File

@ -3,6 +3,8 @@ package top.suyiiyii.sims.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; 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 com.tangzc.mpe.autotable.annotation.Table;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
@ -23,8 +25,10 @@ import java.security.Permission;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
public class RolePermission { public class RolePermission {
@TableId("id") @ColumnId(mode = IdType.AUTO,comment = "id主键")
private Integer id; private Integer id;
@ColumnNotNull
private Integer roleId; private Integer roleId;
@ColumnNotNull
private Integer permissionId; private Integer permissionId;
} }

View File

@ -1,6 +1,8 @@
package top.suyiiyii.sims.entity; 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 com.tangzc.mpe.autotable.annotation.Table;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
@ -19,12 +21,18 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
public class User { public class User {
@TableId("id") @ColumnId(mode = IdType.AUTO,comment = "id主键")
private Integer id; private Integer id;
@Column(comment = "学生id",notNull = true)
private Integer studentId; private Integer studentId;
@Column(comment = "用户名",notNull = true)
private String username; private String username;
@Column(comment = "密码",notNull = true)
private String password; private String password;
@Column(comment = "邮箱",notNull = true)
private String email; private String email;
@Column(comment = "年级",notNull = true)
private String grade; private String grade;
@Column(comment = "用户所属团队",notNull = true)
private String userGroup; private String userGroup;
} }

View File

@ -2,6 +2,8 @@ package top.suyiiyii.sims.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; 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 com.tangzc.mpe.autotable.annotation.Table;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
@ -20,8 +22,10 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
public class UserRole { public class UserRole {
@TableId("id") @ColumnId(mode = IdType.AUTO,comment = "id主键")
private Integer id; private Integer id;
@ColumnNotNull
private Integer userId; private Integer userId;
@ColumnNotNull
private Integer roleId; private Integer roleId;
} }