From bef4f6d51bff03c0512a75f43e79699b7296f1fa Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期四, 23 十一月 2023 18:00:53 +0800
Subject: [PATCH] 修改系统角色逻辑、和老师身份逻辑
---
src/main/java/com/qxueyou/scc/user/model/UserRole.java | 310 ++++++++++++++++++++++++++-------------------------
1 files changed, 156 insertions(+), 154 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/user/model/UserRole.java b/src/main/java/com/qxueyou/scc/user/model/UserRole.java
index dda8895..2410fc4 100644
--- a/src/main/java/com/qxueyou/scc/user/model/UserRole.java
+++ b/src/main/java/com/qxueyou/scc/user/model/UserRole.java
@@ -31,7 +31,6 @@
/**
* The persistent class for the user_role database table.
- *
*/
@Entity
@Table(name = "user_role")
@@ -39,192 +38,195 @@
@NamedQuery(name = "UserRole.findAll", query = "SELECT u FROM UserRole u")
public class UserRole implements Serializable, com.qxueyou.scc.base.model.ITrace {
- /**
- * UID
- */
- private static final long serialVersionUID = 2698140980142511930L;
+ /**
+ * UID
+ */
+ private static final long serialVersionUID = 2698140980142511930L;
- public static Integer ROLE_TYPE_ADMIN = 1;
-
- public static String ROLE_TEACHER_ID = "2";
-
- public static String ROLE_ADMIN_ID = "3";
-
- @Id
- @GeneratedValue(generator = "hibernate-uuid")
- @GenericGenerator(name = "hibernate-uuid", strategy = "uuid")
- @Column(name = "ROLE_ID", unique = true, nullable = false, length = 32)
- private String roleId;
+ public static Integer ROLE_TYPE_ADMIN = 1;
- @Column(name = "CREATE_ID", nullable = false, length = 32)
- private String createId;
+ // public static String ROLE_TEACHER_ID = "2";
+ //鑰佸笀瑙掕壊id
+ public static String ROLE_TEACHER_ID = "2c9048668b0e633d018b6a06e896026a";
- @Column(name = "CREATE_TIME", nullable = false)
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
- @Column(name = "CREATOR", nullable = false, length = 100)
- private String creator;
+ public static String ROLE_ADMIN_ID = "3";
- @Column(name = "DELETE_FLAG", nullable = false)
- private boolean deleteFlag;
+ @Id
+ @GeneratedValue(generator = "hibernate-uuid")
+ @GenericGenerator(name = "hibernate-uuid", strategy = "uuid")
+ @Column(name = "ROLE_ID", unique = true, nullable = false, length = 32)
+ private String roleId;
- @Column(name = "NAME", length = 150)
- private String name;
-
- @Column(name = "TOP_ORG_ID", length = 150)
- private String topOrgId;
+ @Column(name = "CREATE_ID", nullable = false, length = 32)
+ private String createId;
- @Column(name = "UPDATE_ID", length = 32)
- private String updateId;
+ @Column(name = "CREATE_TIME", nullable = false)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
- @Column(name = "UPDATE_TIME", nullable = false)
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
+ @Column(name = "CREATOR", nullable = false, length = 100)
+ private String creator;
- @Column(name = "UPDATOR", length = 100)
- private String updator;
+ @Column(name = "DELETE_FLAG", nullable = false)
+ private boolean deleteFlag;
+
+ @Column(name = "NAME", length = 150)
+ private String name;
+
+ @Column(name = "TOP_ORG_ID", length = 150)
+ private String topOrgId;
+
+ @Column(name = "UPDATE_ID", length = 32)
+ private String updateId;
+
+ @Column(name = "UPDATE_TIME", nullable = false)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ @Column(name = "UPDATOR", length = 100)
+ private String updator;
// @Column(name = "ENAME", length = 100)
// private String ename;
- @Column(name = "type", length = 2)
- private String type;
+ @Column(name = "type", length = 2)
+ private String type;
- @ManyToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
- @JoinTable(name = "USER_RE_ROLE_USER", joinColumns = { @JoinColumn(name = "ROLE_ID") }, inverseJoinColumns = {
- @JoinColumn(name = "USER_ID") })
- @GeneratedValue(generator = "hibernate-uuid1")
- @GenericGenerator(name = "hibernate-uuid1", strategy = "uuid")
- @CollectionId(columns = @Column(name = "RE_ID"), type = @Type(type = "string"), generator = "hibernate-uuid1")
- @JsonIgnore
- private List<User> users;
+ @ManyToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+ @JoinTable(name = "USER_RE_ROLE_USER", joinColumns = {@JoinColumn(name = "ROLE_ID")}, inverseJoinColumns = {
+ @JoinColumn(name = "USER_ID")})
+ @GeneratedValue(generator = "hibernate-uuid1")
+ @GenericGenerator(name = "hibernate-uuid1", strategy = "uuid")
+ @CollectionId(columns = @Column(name = "RE_ID"), type = @Type(type = "string"), generator = "hibernate-uuid1")
+ @JsonIgnore
+ private List<User> users;
- @ManyToMany(fetch = FetchType.LAZY, mappedBy = "roles")
- private List<SysMenu> menus;
+ @ManyToMany(fetch = FetchType.LAZY, mappedBy = "roles")
+ private List<SysMenu> menus;
- @OneToMany(fetch = FetchType.LAZY, mappedBy = "userRole")
- @JsonIgnore
- private List<SysPrivilege> sysPrivileges;
+ @OneToMany(fetch = FetchType.LAZY, mappedBy = "userRole")
+ @JsonIgnore
+ private List<SysPrivilege> sysPrivileges;
- @OneToMany(mappedBy = "userRole", fetch = FetchType.LAZY)
- @JsonIgnore
- private List<UserReRoleUser> res;
-
- @Transient
- private boolean isMe;
+ @OneToMany(mappedBy = "userRole", fetch = FetchType.LAZY)
+ @JsonIgnore
+ private List<UserReRoleUser> res;
- public List<SysMenu> getMenus() {
- return menus;
- }
+ @Transient
+ private boolean isMe;
- public void setMenus(List<SysMenu> menus) {
- this.menus = menus;
- }
+ public List<SysMenu> getMenus() {
+ return menus;
+ }
- public List<User> getUsers() {
- return users;
- }
+ public void setMenus(List<SysMenu> menus) {
+ this.menus = menus;
+ }
- public void setUsers(List<User> users) {
- this.users = users;
- }
+ public List<User> getUsers() {
+ return users;
+ }
- public String getRoleId() {
- return this.roleId;
- }
+ public void setUsers(List<User> users) {
+ this.users = users;
+ }
- public void setRoleId(String roleId) {
- this.roleId = roleId;
- }
+ public String getRoleId() {
+ return this.roleId;
+ }
- public String getCreateId() {
- return this.createId;
- }
+ public void setRoleId(String roleId) {
+ this.roleId = roleId;
+ }
- public void setCreateId(String createId) {
- this.createId = createId;
- }
+ public String getCreateId() {
+ return this.createId;
+ }
- public Date getCreateTime() {
- return this.createTime;
- }
+ public void setCreateId(String createId) {
+ this.createId = createId;
+ }
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
+ public Date getCreateTime() {
+ return this.createTime;
+ }
- public String getCreator() {
- return this.creator;
- }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
- public void setCreator(String creator) {
- this.creator = creator;
- }
+ public String getCreator() {
+ return this.creator;
+ }
- public boolean getDeleteFlag() {
- return this.deleteFlag;
- }
+ public void setCreator(String creator) {
+ this.creator = creator;
+ }
- public void setDeleteFlag(boolean deleteFlag) {
- this.deleteFlag = deleteFlag;
- }
+ public boolean getDeleteFlag() {
+ return this.deleteFlag;
+ }
- public String getName() {
- return this.name;
- }
+ public void setDeleteFlag(boolean deleteFlag) {
+ this.deleteFlag = deleteFlag;
+ }
- public void setName(String name) {
- this.name = name;
- }
+ public String getName() {
+ return this.name;
+ }
- public String getUpdateId() {
- return this.updateId;
- }
+ public void setName(String name) {
+ this.name = name;
+ }
- public void setUpdateId(String updateId) {
- this.updateId = updateId;
- }
+ public String getUpdateId() {
+ return this.updateId;
+ }
- public Date getUpdateTime() {
- return this.updateTime;
- }
+ public void setUpdateId(String updateId) {
+ this.updateId = updateId;
+ }
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
+ public Date getUpdateTime() {
+ return this.updateTime;
+ }
- public String getUpdator() {
- return this.updator;
- }
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
- public void setUpdator(String updator) {
- this.updator = updator;
- }
+ public String getUpdator() {
+ return this.updator;
+ }
- public List<SysPrivilege> getSysPrivileges() {
- return sysPrivileges;
- }
+ public void setUpdator(String updator) {
+ this.updator = updator;
+ }
- public void setSysPrivileges(List<SysPrivilege> sysPrivileges) {
- this.sysPrivileges = sysPrivileges;
- }
+ public List<SysPrivilege> getSysPrivileges() {
+ return sysPrivileges;
+ }
- public List<UserReRoleUser> getRes() {
- return res;
- }
+ public void setSysPrivileges(List<SysPrivilege> sysPrivileges) {
+ this.sysPrivileges = sysPrivileges;
+ }
- public void setRes(List<UserReRoleUser> res) {
- this.res = res;
- }
+ public List<UserReRoleUser> getRes() {
+ return res;
+ }
- public boolean getMe() {
- return isMe;
- }
+ public void setRes(List<UserReRoleUser> res) {
+ this.res = res;
+ }
- public void setMe(boolean isMe) {
- this.isMe = isMe;
- }
+ public boolean getMe() {
+ return isMe;
+ }
+
+ public void setMe(boolean isMe) {
+ this.isMe = isMe;
+ }
// public String getEname() {
// return ename;
@@ -234,20 +236,20 @@
// this.ename = ename;
// }
- public String getType() {
- return type;
- }
+ public String getType() {
+ return type;
+ }
- public void setType(String type) {
- this.type = type;
- }
+ public void setType(String type) {
+ this.type = type;
+ }
- public String getTopOrgId() {
- return topOrgId;
- }
+ public String getTopOrgId() {
+ return topOrgId;
+ }
- public void setTopOrgId(String topOrgId) {
- this.topOrgId = topOrgId;
- }
+ public void setTopOrgId(String topOrgId) {
+ this.topOrgId = topOrgId;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0