.....

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/Privilege.java

@@ -5,8 +5,8 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
 import cn.com.qmth.examcloud.commons.web.helpers.tree.TreeNode;
+import cn.com.qmth.examcloud.commons.web.support.JpaEntitySupport;
 
 /**
  * 权限
@@ -17,7 +17,7 @@ import cn.com.qmth.examcloud.commons.web.helpers.tree.TreeNode;
  */
 @Entity
 @Table(name = "EC_B_PRIVILEGE")
-public class Privilege implements TreeNode, JsonSerializable {
+public class Privilege extends JpaEntitySupport implements TreeNode {
 
 	private static final long serialVersionUID = -6288949236298877031L;
 
@@ -47,8 +47,8 @@ public class Privilege implements TreeNode, JsonSerializable {
 	/**
 	 * 组(权限分组,同一组的权限构成权限树)
 	 */
-	@Column(unique = true, nullable = false)
-	private String group;
+	@Column(unique = false, nullable = false)
+	private String groupId;
 
 	public String getId() {
 		return id;
@@ -82,12 +82,12 @@ public class Privilege implements TreeNode, JsonSerializable {
 		this.domain = domain;
 	}
 
-	public String getGroup() {
-		return group;
+	public String getGroupId() {
+		return groupId;
 	}
 
-	public void setGroup(String group) {
-		this.group = group;
+	public void setGroupId(String groupId) {
+		this.groupId = groupId;
 	}
 
 }

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/Role.java

@@ -5,6 +5,8 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
+import cn.com.qmth.examcloud.commons.web.support.JpaEntitySupport;
+
 /**
  * 角色
  *
@@ -14,7 +16,9 @@ import javax.persistence.Table;
  */
 @Entity
 @Table(name = "EC_B_ROLE")
-public class Role {
+public class Role extends JpaEntitySupport {
+
+	private static final long serialVersionUID = -2167420238674588632L;
 
 	@Id
 	private String roleId;

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/RolePrivilegeRelation.java

@@ -5,6 +5,8 @@ import javax.persistence.Id;
 import javax.persistence.IdClass;
 import javax.persistence.Table;
 
+import cn.com.qmth.examcloud.commons.web.support.JpaEntitySupport;
+
 /**
  * 角色权限关联
  *
@@ -15,7 +17,9 @@ import javax.persistence.Table;
 @Entity
 @Table(name = "EC_B_ROLE_PRIV_RELATION")
 @IdClass(RolePrivilegeRelationPK.class)
-public class RolePrivilegeRelation {
+public class RolePrivilegeRelation extends JpaEntitySupport {
+
+	private static final long serialVersionUID = 8849214483955278647L;
 
 	@Id
 	private String roleId;

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/UserPrivilegeRelation.java

@@ -5,6 +5,8 @@ import javax.persistence.Id;
 import javax.persistence.IdClass;
 import javax.persistence.Table;
 
+import cn.com.qmth.examcloud.commons.web.support.JpaEntitySupport;
+
 /**
  * 权限
  *
@@ -15,7 +17,9 @@ import javax.persistence.Table;
 @Entity
 @Table(name = "EC_B_USER_PRIV_RELATION")
 @IdClass(UserPrivilegeRelationPK.class)
-public class UserPrivilegeRelation {
+public class UserPrivilegeRelation extends JpaEntitySupport {
+
+	private static final long serialVersionUID = -2673489395106849624L;
 
 	@Id
 	private String userId;

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/UserRoleRelation.java

@@ -5,6 +5,8 @@ import javax.persistence.Id;
 import javax.persistence.IdClass;
 import javax.persistence.Table;
 
+import cn.com.qmth.examcloud.commons.web.support.JpaEntitySupport;
+
 /**
  * 角色
  *
@@ -15,7 +17,9 @@ import javax.persistence.Table;
 @Entity
 @Table(name = "EC_B_USER_ROLE_RELATION")
 @IdClass(UserRoleRelationPK.class)
-public class UserRoleRelation {
+public class UserRoleRelation extends JpaEntitySupport {
+
+	private static final long serialVersionUID = 5623631699393069659L;
 
 	@Id
 	private String userId;