...

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/AppController.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.basic.dao.AppRepo;
-import cn.com.qmth.examcloud.core.basic.dao.entity.App;
+import cn.com.qmth.examcloud.core.basic.dao.entity.AppEntity;
 import io.swagger.annotations.ApiOperation;
 
 /**
@@ -25,7 +25,7 @@ public class AppController extends ControllerSupport {
 
 	@ApiOperation(value = "查询所有应用")
 	@GetMapping("getAllApp")
-	public List<App> getAllApp() {
+	public List<AppEntity> getAllApp() {
 		Sort sort = new Sort(Sort.Direction.ASC, "id");
 		return appRepo.findAll(sort);
 	}

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/RolePrivilegeController.java

@@ -34,10 +34,10 @@ import cn.com.qmth.examcloud.core.basic.dao.PrivilegeGroupRepo;
 import cn.com.qmth.examcloud.core.basic.dao.PrivilegeRepo;
 import cn.com.qmth.examcloud.core.basic.dao.RolePrivilegeRelationRepo;
 import cn.com.qmth.examcloud.core.basic.dao.RoleRepo;
-import cn.com.qmth.examcloud.core.basic.dao.entity.App;
-import cn.com.qmth.examcloud.core.basic.dao.entity.Privilege;
-import cn.com.qmth.examcloud.core.basic.dao.entity.PrivilegeGroup;
-import cn.com.qmth.examcloud.core.basic.dao.entity.RolePrivilegeRelation;
+import cn.com.qmth.examcloud.core.basic.dao.entity.AppEntity;
+import cn.com.qmth.examcloud.core.basic.dao.entity.PrivilegeEntity;
+import cn.com.qmth.examcloud.core.basic.dao.entity.PrivilegeGroupEntity;
+import cn.com.qmth.examcloud.core.basic.dao.entity.RolePrivilegeRelationEntity;
 import cn.com.qmth.examcloud.core.basic.service.RolePrivilegeService;
 import io.swagger.annotations.ApiOperation;
 
@@ -81,7 +81,7 @@ public class RolePrivilegeController extends ControllerSupport {
 		User accessUser = getAccessUser();
 		Long rootOrgId = accessUser.getRootOrgId();
 
-		PrivilegeGroup privilegeGroup = privilegeGroupRepo.findByCode(groupCode);
+		PrivilegeGroupEntity privilegeGroup = privilegeGroupRepo.findByCode(groupCode);
 
 		if (null == privilegeGroup) {
 			throw new StatusException("B-002001", "groupCode is not existing");
@@ -91,26 +91,26 @@ public class RolePrivilegeController extends ControllerSupport {
 		List<Long> roleIdList = Lists.newArrayList();
 		for (Role cur : roleList) {
 			String roleCode = cur.getRoleCode();
-			cn.com.qmth.examcloud.core.basic.dao.entity.Role role = roleRepo.findByCode(roleCode);
+			cn.com.qmth.examcloud.core.basic.dao.entity.RoleEntity role = roleRepo.findByCode(roleCode);
 			if (null == role) {
 				throw new StatusException("B-002002", "role code is wrong. roleCode=" + roleCode);
 			}
 			roleIdList.add(role.getId());
 		}
 
-		List<RolePrivilegeRelation> rolePrivRelationList = rolePrivilegeRelationRepo
+		List<RolePrivilegeRelationEntity> rolePrivRelationList = rolePrivilegeRelationRepo
 				.findAllByRoleIdInAndRootOrgId(roleIdList, rootOrgId);
 
 		Set<String> pIdSet = Sets.newHashSet();
-		for (RolePrivilegeRelation cur : rolePrivRelationList) {
+		for (RolePrivilegeRelationEntity cur : rolePrivRelationList) {
 			pIdSet.add(String.valueOf(cur.getPrivilegeId()));
 		}
 
-		List<Privilege> privilegeList = privilegeRepo.findAllByGroupId(privilegeGroup.getId());
+		List<PrivilegeEntity> privilegeList = privilegeRepo.findAllByGroupId(privilegeGroup.getId());
 
 		List<PrivilegeInfo> privilegeInfoList = Lists.newArrayList();
 
-		for (Privilege cur : privilegeList) {
+		for (PrivilegeEntity cur : privilegeList) {
 			boolean hasPrivilege = pIdSet.contains(String.valueOf(cur.getId()));
 			if ((!full) && (!hasPrivilege)) {
 				continue;
@@ -143,15 +143,15 @@ public class RolePrivilegeController extends ControllerSupport {
 	@GetMapping("getPrivilegeGroupList")
 	public List<PrivilegeGroupBean> getPrivilegeGroupList() {
 		Sort sort = new Sort(Sort.Direction.ASC, "id");
-		List<PrivilegeGroup> list = privilegeGroupRepo.findAll(sort);
+		List<PrivilegeGroupEntity> list = privilegeGroupRepo.findAll(sort);
 
 		List<PrivilegeGroupBean> ret = Lists.newArrayList();
 
-		for (PrivilegeGroup cur : list) {
+		for (PrivilegeGroupEntity cur : list) {
 			PrivilegeGroupBean bean = new PrivilegeGroupBean();
 			bean.setId(cur.getId());
 			bean.setAppId(cur.getAppId());
-			App app = appRepo.findOne(cur.getAppId());
+			AppEntity app = appRepo.findOne(cur.getAppId());
 			if (null != app) {
 				bean.setAppName(app.getName());
 			}
@@ -167,8 +167,8 @@ public class RolePrivilegeController extends ControllerSupport {
 	@ApiOperation(value = "查询权限树")
 	@GetMapping("getPrivilegeTree/{groupId}")
 	public EleTreeNode getPrivilegeTree(@PathVariable Long groupId) {
-		PrivilegeGroup group = privilegeGroupRepo.findOne(groupId);
-		List<Privilege> privilegeList = privilegeRepo.findAllByGroupId(groupId);
+		PrivilegeGroupEntity group = privilegeGroupRepo.findOne(groupId);
+		List<PrivilegeEntity> privilegeList = privilegeRepo.findAllByGroupId(groupId);
 		EleTreeNode rootNode = new EleTreeNode(-1L, group.getName());
 		TreeUtil.convert2OneEleTreeNode(rootNode, privilegeList);
 
@@ -178,11 +178,11 @@ public class RolePrivilegeController extends ControllerSupport {
 	@ApiOperation(value = "查询权限ID集合")
 	@GetMapping("getPrivilegeIdList/{rootOrgId}/{roleId}")
 	public Set<Long> getPrivilegeTree(@PathVariable Long rootOrgId, @PathVariable Long roleId) {
-		List<RolePrivilegeRelation> rolePrivRelationList = rolePrivilegeRelationRepo
+		List<RolePrivilegeRelationEntity> rolePrivRelationList = rolePrivilegeRelationRepo
 				.findAllByRoleIdAndRootOrgId(roleId, rootOrgId);
 
 		Set<Long> pIdSet = Sets.newHashSet();
-		for (RolePrivilegeRelation cur : rolePrivRelationList) {
+		for (RolePrivilegeRelationEntity cur : rolePrivRelationList) {
 			pIdSet.add(cur.getPrivilegeId());
 		}
 
@@ -207,19 +207,19 @@ public class RolePrivilegeController extends ControllerSupport {
 
 	@ApiOperation(value = "增加权限")
 	@PostMapping("addPrivilege")
-	public Privilege addPrivilege(@RequestBody Privilege privilege) {
+	public PrivilegeEntity addPrivilege(@RequestBody PrivilegeEntity privilege) {
 
 		privilege.setName(privilege.getName().trim());
 		privilege.setCode(privilege.getCode().trim());
 		privilege.setDescription(privilege.getDescription());
 
-		PrivilegeGroup group = privilegeGroupRepo.findOne(privilege.getGroupId());
+		PrivilegeGroupEntity group = privilegeGroupRepo.findOne(privilege.getGroupId());
 		if (null == group) {
 			throw new StatusException("B-020001", "权限组不存在");
 		}
 
 		if (null != privilege.getParentId()) {
-			Privilege parentPrivilege = privilegeRepo.findOne(privilege.getParentId());
+			PrivilegeEntity parentPrivilege = privilegeRepo.findOne(privilege.getParentId());
 			if (null == parentPrivilege) {
 				throw new StatusException("B-020002", "父权限不存在");
 			}
@@ -228,25 +228,25 @@ public class RolePrivilegeController extends ControllerSupport {
 			}
 		}
 
-		Privilege ret = privilegeRepo.save(privilege);
+		PrivilegeEntity ret = privilegeRepo.save(privilege);
 
 		return ret;
 	}
 
 	@ApiOperation(value = "更新权限")
 	@PutMapping("updatePrivilege")
-	public Privilege updatePrivilege(@RequestBody Privilege privilege) {
+	public PrivilegeEntity updatePrivilege(@RequestBody PrivilegeEntity privilege) {
 
 		privilege.setName(privilege.getName().trim());
 		privilege.setCode(privilege.getCode().trim());
 		privilege.setDescription(privilege.getDescription());
-		PrivilegeGroup group = privilegeGroupRepo.findOne(privilege.getGroupId());
+		PrivilegeGroupEntity group = privilegeGroupRepo.findOne(privilege.getGroupId());
 		if (null == group) {
 			throw new StatusException("B-020001", "权限组不存在");
 		}
 
 		if (null != privilege.getParentId()) {
-			Privilege parentPrivilege = privilegeRepo.findOne(privilege.getParentId());
+			PrivilegeEntity parentPrivilege = privilegeRepo.findOne(privilege.getParentId());
 			if (null == parentPrivilege) {
 				throw new StatusException("B-020002", "父权限不存在");
 			}
@@ -255,7 +255,7 @@ public class RolePrivilegeController extends ControllerSupport {
 			}
 		}
 
-		Privilege ret = privilegeRepo.save(privilege);
+		PrivilegeEntity ret = privilegeRepo.save(privilege);
 
 		return ret;
 	}
@@ -263,12 +263,12 @@ public class RolePrivilegeController extends ControllerSupport {
 	@ApiOperation(value = "删除权限")
 	@DeleteMapping("deletePrivilege/{id}")
 	public void deletePrivilege(@PathVariable Long id) {
-		Privilege privilege = privilegeRepo.findOne(id);
+		PrivilegeEntity privilege = privilegeRepo.findOne(id);
 		if (null == privilege) {
 			throw new StatusException("B-020004", "权限不存在");
 		}
 
-		List<Privilege> children = privilegeRepo.findAllByParentId(privilege.getId());
+		List<PrivilegeEntity> children = privilegeRepo.findAllByParentId(privilege.getId());
 		if (CollectionUtils.isNotEmpty(children)) {
 			throw new StatusException("B-020005", "存在子权限");
 		}
@@ -277,8 +277,8 @@ public class RolePrivilegeController extends ControllerSupport {
 
 	@ApiOperation(value = "查询权限")
 	@GetMapping("getPrivilege/{id}")
-	public Privilege getPrivilege(@PathVariable Long id) {
-		Privilege privilege = privilegeRepo.findOne(id);
+	public PrivilegeEntity getPrivilege(@PathVariable Long id) {
+		PrivilegeEntity privilege = privilegeRepo.findOne(id);
 		if (null == privilege) {
 			throw new StatusException("B-020004", "权限不存在");
 		}

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/bean/PrivilegeInfo.java

@@ -1,8 +1,9 @@
 package cn.com.qmth.examcloud.core.basic.api.controller.bean;
 
+import java.util.Date;
+
 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.jpa.JpaEntity;
 
 /**
  * 权限信息
@@ -11,7 +12,7 @@ import cn.com.qmth.examcloud.commons.web.jpa.JpaEntity;
  * @date 2018年5月23日
  * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
  */
-public class PrivilegeInfo extends JpaEntity implements JsonSerializable, TreeNode {
+public class PrivilegeInfo implements JsonSerializable, TreeNode {
 
 	private static final long serialVersionUID = -8828760710678965127L;
 
@@ -50,6 +51,10 @@ public class PrivilegeInfo extends JpaEntity implements JsonSerializable, TreeNo
 	 */
 	private String description;
 
+	private Date updateTime;
+
+	private Date creationTime;
+
 	/**
 	 * 扩展属性
 	 */
@@ -131,6 +136,22 @@ public class PrivilegeInfo extends JpaEntity implements JsonSerializable, TreeNo
 		this.description = description;
 	}
 
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public Date getCreationTime() {
+		return creationTime;
+	}
+
+	public void setCreationTime(Date creationTime) {
+		this.creationTime = creationTime;
+	}
+
 	public String getExt1() {
 		return ext1;
 	}

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/provider/RolePrivilegeCloudServiceProvider.java

@@ -49,9 +49,9 @@ public class RolePrivilegeCloudServiceProvider extends ControllerSupport
 	@PostMapping("getAllRoles")
 	@Override
 	public List<RoleBean> getAllRoles() {
-		List<cn.com.qmth.examcloud.core.basic.dao.entity.Role> roleList = roleRepo.findAll();
+		List<cn.com.qmth.examcloud.core.basic.dao.entity.RoleEntity> roleList = roleRepo.findAll();
 		List<RoleBean> roleBeanList = Lists.newArrayList();
-		for (cn.com.qmth.examcloud.core.basic.dao.entity.Role cur : roleList) {
+		for (cn.com.qmth.examcloud.core.basic.dao.entity.RoleEntity cur : roleList) {
 			RoleBean bean = new RoleBean();
 			bean.setRoleId(cur.getId());
 			bean.setRoleName(cur.getName());

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

@@ -3,7 +3,7 @@ package cn.com.qmth.examcloud.core.basic.dao;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.core.basic.dao.entity.App;
+import cn.com.qmth.examcloud.core.basic.dao.entity.AppEntity;
 
 /**
  * 类注释
@@ -12,6 +12,6 @@ import cn.com.qmth.examcloud.core.basic.dao.entity.App;
  * @date 2018年6月11日
  * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
  */
-public interface AppRepo extends JpaRepository<App, Long>, QueryByExampleExecutor<App> {
+public interface AppRepo extends JpaRepository<AppEntity, Long>, QueryByExampleExecutor<AppEntity> {
 
 }

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

@@ -4,14 +4,14 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.core.basic.dao.entity.PrivilegeGroup;
+import cn.com.qmth.examcloud.core.basic.dao.entity.PrivilegeGroupEntity;
 
 public interface PrivilegeGroupRepo
 		extends
-			JpaRepository<PrivilegeGroup, Long>,
-			QueryByExampleExecutor<PrivilegeGroup>,
-			JpaSpecificationExecutor<PrivilegeGroup> {
+			JpaRepository<PrivilegeGroupEntity, Long>,
+			QueryByExampleExecutor<PrivilegeGroupEntity>,
+			JpaSpecificationExecutor<PrivilegeGroupEntity> {
 
-	PrivilegeGroup findByCode(String code);
+	PrivilegeGroupEntity findByCode(String code);
 
 }

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

@@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.core.basic.dao.entity.Privilege;
+import cn.com.qmth.examcloud.core.basic.dao.entity.PrivilegeEntity;
 
 /**
  * 类注释
@@ -17,14 +17,14 @@ import cn.com.qmth.examcloud.core.basic.dao.entity.Privilege;
  */
 public interface PrivilegeRepo
 		extends
-			JpaRepository<Privilege, Long>,
-			QueryByExampleExecutor<Privilege>,
-			JpaSpecificationExecutor<Privilege> {
+			JpaRepository<PrivilegeEntity, Long>,
+			QueryByExampleExecutor<PrivilegeEntity>,
+			JpaSpecificationExecutor<PrivilegeEntity> {
 
-	List<Privilege> findAllByGroupId(Long groupId);
+	List<PrivilegeEntity> findAllByGroupId(Long groupId);
 
-	List<Privilege> findAllByParentId(Long parentId);
+	List<PrivilegeEntity> findAllByParentId(Long parentId);
 
-	List<Privilege> findAllByIdIn(List<Long> idList);
+	List<PrivilegeEntity> findAllByIdIn(List<Long> idList);
 
 }

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

@@ -6,20 +6,20 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.core.basic.dao.entity.RolePrivilegeRelation;
+import cn.com.qmth.examcloud.core.basic.dao.entity.RolePrivilegeRelationEntity;
 import cn.com.qmth.examcloud.core.basic.dao.entity.RolePrivilegeRelationPK;
 
 public interface RolePrivilegeRelationRepo
 		extends
-			JpaRepository<RolePrivilegeRelation, RolePrivilegeRelationPK>,
-			QueryByExampleExecutor<RolePrivilegeRelation>,
-			JpaSpecificationExecutor<RolePrivilegeRelation> {
+			JpaRepository<RolePrivilegeRelationEntity, RolePrivilegeRelationPK>,
+			QueryByExampleExecutor<RolePrivilegeRelationEntity>,
+			JpaSpecificationExecutor<RolePrivilegeRelationEntity> {
 
-	List<RolePrivilegeRelation> findAllByRoleId(Long roleId);
+	List<RolePrivilegeRelationEntity> findAllByRoleId(Long roleId);
 
-	List<RolePrivilegeRelation> findAllByRoleIdAndRootOrgId(Long roleId, Long rootOrgId);
+	List<RolePrivilegeRelationEntity> findAllByRoleIdAndRootOrgId(Long roleId, Long rootOrgId);
 
-	List<RolePrivilegeRelation> findAllByRoleIdInAndRootOrgId(List<Long> roleIdList,
+	List<RolePrivilegeRelationEntity> findAllByRoleIdInAndRootOrgId(List<Long> roleIdList,
 			Long rootOrgId);
 	
 	void deleteByRoleIdAndRootOrgId(Long roleId,Long rootOrgId);

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

@@ -4,14 +4,14 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.core.basic.dao.entity.Role;
+import cn.com.qmth.examcloud.core.basic.dao.entity.RoleEntity;
 
 public interface RoleRepo
 		extends
-			JpaRepository<Role, Long>,
-			QueryByExampleExecutor<Role>,
-			JpaSpecificationExecutor<Role> {
+			JpaRepository<RoleEntity, Long>,
+			QueryByExampleExecutor<RoleEntity>,
+			JpaSpecificationExecutor<RoleEntity> {
 
-	Role findByCode(String code);
+	RoleEntity findByCode(String code);
 
 }

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/App.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/AppEntity.java

@@ -17,7 +17,7 @@ import cn.com.qmth.examcloud.commons.web.jpa.JpaEntity;
  */
 @Entity
 @Table(name = "EC_B_APP")
-public class App extends JpaEntity {
+public class AppEntity extends JpaEntity {
 
 	private static final long serialVersionUID = -6288949236298877031L;
 

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

@@ -18,7 +18,7 @@ import cn.com.qmth.examcloud.commons.web.jpa.JpaEntity;
  */
 @Entity
 @Table(name = "EC_B_PRIVILEGE")
-public class Privilege extends JpaEntity implements TreeNode {
+public class PrivilegeEntity extends JpaEntity implements TreeNode {
 
 	private static final long serialVersionUID = -6288949236298877031L;
 

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/PrivilegeGroup.java → examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/PrivilegeGroupEntity.java

@@ -17,7 +17,7 @@ import cn.com.qmth.examcloud.commons.web.jpa.JpaEntity;
  */
 @Entity
 @Table(name = "EC_B_PRIVILEGE_GROUP")
-public class PrivilegeGroup extends JpaEntity {
+public class PrivilegeGroupEntity extends JpaEntity {
 
 	private static final long serialVersionUID = -3654724059677675683L;
 

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

@@ -17,7 +17,7 @@ import cn.com.qmth.examcloud.commons.web.jpa.JpaEntity;
  */
 @Entity
 @Table(name = "EC_B_ROLE")
-public class Role extends JpaEntity {
+public class RoleEntity extends JpaEntity {
 
 	private static final long serialVersionUID = -2167420238674588632L;
 

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

@@ -17,7 +17,7 @@ import cn.com.qmth.examcloud.commons.web.jpa.JpaEntity;
 @Entity
 @Table(name = "EC_B_ROLE_PRIV_RELATION")
 @IdClass(RolePrivilegeRelationPK.class)
-public class RolePrivilegeRelation extends JpaEntity {
+public class RolePrivilegeRelationEntity extends JpaEntity {
 
 	private static final long serialVersionUID = 8849214483955278647L;
 

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

@@ -17,7 +17,7 @@ import cn.com.qmth.examcloud.commons.web.jpa.JpaEntity;
 @Entity
 @Table(name = "EC_B_USER_PRIV_RELATION")
 @IdClass(UserPrivilegeRelationPK.class)
-public class UserPrivilegeRelation extends JpaEntity {
+public class UserPrivilegeRelationEntity extends JpaEntity {
 
 	private static final long serialVersionUID = -2673489395106849624L;
 

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

@@ -17,7 +17,7 @@ import cn.com.qmth.examcloud.commons.web.jpa.JpaEntity;
 @Entity
 @Table(name = "EC_B_USER_ROLE_RELATION")
 @IdClass(UserRoleRelationPK.class)
-public class UserRoleRelation extends JpaEntity {
+public class UserRoleRelationEntity extends JpaEntity {
 
 	private static final long serialVersionUID = 5623631699393069659L;
 

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/RolePrivilegeServiceImpl.java

@@ -15,7 +15,7 @@ import com.google.common.collect.Sets;
 import cn.com.qmth.examcloud.core.basic.dao.OrgRepo;
 import cn.com.qmth.examcloud.core.basic.dao.PrivilegeRepo;
 import cn.com.qmth.examcloud.core.basic.dao.RolePrivilegeRelationRepo;
-import cn.com.qmth.examcloud.core.basic.dao.entity.RolePrivilegeRelation;
+import cn.com.qmth.examcloud.core.basic.dao.entity.RolePrivilegeRelationEntity;
 import cn.com.qmth.examcloud.core.basic.service.RolePrivilegeService;
 
 /**
@@ -53,7 +53,7 @@ public class RolePrivilegeServiceImpl implements RolePrivilegeService {
 
 		Set<String> temp = Sets.newHashSet();
 
-		List<RolePrivilegeRelation> list = Lists.newArrayList();
+		List<RolePrivilegeRelationEntity> list = Lists.newArrayList();
 		for (Long cur : privilegeIdSet) {
 			if (0 > cur) {
 				continue;
@@ -63,7 +63,7 @@ public class RolePrivilegeServiceImpl implements RolePrivilegeService {
 				continue;
 			}
 			temp.add(String.valueOf(cur));
-			RolePrivilegeRelation bean = new RolePrivilegeRelation();
+			RolePrivilegeRelationEntity bean = new RolePrivilegeRelationEntity();
 			bean.setRoleId(roleId);
 			bean.setRootOrgId(rootOrgId);
 			bean.setPrivilegeId(cur);