...

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

@@ -32,8 +32,8 @@ import cn.com.qmth.examcloud.commons.web.security.enums.RoleMeta;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.basic.api.bean.RoleBean;
 import cn.com.qmth.examcloud.core.basic.api.controller.bean.PrivilegeGroupBean;
-import cn.com.qmth.examcloud.core.basic.api.controller.bean.PrivilegeInfo;
-import cn.com.qmth.examcloud.core.basic.api.controller.bean.UpdateRolePrivilegeRelationsReq;
+import cn.com.qmth.examcloud.core.basic.api.controller.bean.PrivilegeDomain;
+import cn.com.qmth.examcloud.core.basic.api.controller.bean.UpdateRolePrivilegeRelationsDomain;
 import cn.com.qmth.examcloud.core.basic.base.constants.BasicConsts;
 import cn.com.qmth.examcloud.core.basic.dao.AppRepo;
 import cn.com.qmth.examcloud.core.basic.dao.OrgRepo;
@@ -109,7 +109,7 @@ public class RolePrivilegeController extends ControllerSupport {
 
 	@ApiOperation(value = "查询用户的权限树", notes = "")
 	@PostMapping("getUserPrivileges")
-	public List<PrivilegeInfo> getPrivileges(@RequestParam String groupCode,
+	public List<PrivilegeDomain> getPrivileges(@RequestParam String groupCode,
 			@RequestParam boolean full) {
 
 		User accessUser = getAccessUser();
@@ -134,7 +134,7 @@ public class RolePrivilegeController extends ControllerSupport {
 		List<PrivilegeEntity> privilegeList = privilegeRepo
 				.findAllByGroupIdOrderByWeightDesc(privilegeGroup.getId());
 
-		List<PrivilegeInfo> privilegeInfoList = Lists.newArrayList();
+		List<PrivilegeDomain> privilegeInfoList = Lists.newArrayList();
 
 		for (PrivilegeEntity cur : privilegeList) {
 			boolean hasPrivilege = pIdSet.contains(String.valueOf(cur.getId()));
@@ -146,7 +146,7 @@ public class RolePrivilegeController extends ControllerSupport {
 				continue;
 			}
 
-			PrivilegeInfo privilegeInfo = new PrivilegeInfo();
+			PrivilegeDomain privilegeInfo = new PrivilegeDomain();
 			privilegeInfo.setHasPrivilege(hasPrivilege);
 			privilegeInfo.setCode(cur.getCode());
 			privilegeInfo.setCreationTime(cur.getCreationTime());
@@ -223,7 +223,7 @@ public class RolePrivilegeController extends ControllerSupport {
 
 	@ApiOperation(value = "更新角色权限关联")
 	@PostMapping("updateRolePrivilegeRelations")
-	public void updateRolePrivilegeRelations(@RequestBody UpdateRolePrivilegeRelationsReq req) {
+	public void updateRolePrivilegeRelations(@RequestBody UpdateRolePrivilegeRelationsDomain req) {
 		Long rootOrgId = Long.parseLong(req.getRootOrgId());
 		Long roleId = Long.parseLong(req.getRoleId());
 		Long privilegeGroupId = Long.parseLong(req.getPrivilegeGroupId());

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

@@ -42,7 +42,7 @@ import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.security.enums.RoleMeta;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.basic.api.controller.bean.UserDomain;
-import cn.com.qmth.examcloud.core.basic.api.controller.bean.UserForm;
+import cn.com.qmth.examcloud.core.basic.api.controller.bean.UserFormDomain;
 import cn.com.qmth.examcloud.core.basic.base.enums.AccountType;
 import cn.com.qmth.examcloud.core.basic.dao.OrgRepo;
 import cn.com.qmth.examcloud.core.basic.dao.RoleRepo;
@@ -262,7 +262,7 @@ public class UserController extends ControllerSupport {
 	 */
 	@ApiOperation(value = "新增用户", notes = "新增")
 	@PostMapping
-	public Map<String, Object> addUser(@RequestBody UserForm userForm) {
+	public Map<String, Object> addUser(@RequestBody UserFormDomain userForm) {
 		trim(userForm);
 		userForm.setId(null);
 		return insertOrUpdateUser(userForm);
@@ -277,7 +277,7 @@ public class UserController extends ControllerSupport {
 	 */
 	@ApiOperation(value = "更新用户", notes = "更新")
 	@PutMapping
-	public Map<String, Object> updateUser(@RequestBody UserForm userForm) {
+	public Map<String, Object> updateUser(@RequestBody UserFormDomain userForm) {
 		trim(userForm);
 		if (null == userForm.getId()) {
 			throw new StatusException("B-150009", "user ID is null");
@@ -304,7 +304,7 @@ public class UserController extends ControllerSupport {
 	 * @param userForm
 	 * @return
 	 */
-	private Map<String, Object> insertOrUpdateUser(UserForm userForm) {
+	private Map<String, Object> insertOrUpdateUser(UserFormDomain userForm) {
 		cn.com.qmth.examcloud.commons.web.security.bean.User accessUser = getAccessUser();
 		Long rootOrgId = userForm.getRootOrgId();
 		Org rootOrg = orgRepo.findOne(rootOrgId);

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

@@ -12,7 +12,7 @@ import cn.com.qmth.examcloud.commons.web.helpers.tree.TreeNode;
  * @date 2018年5月23日
  * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
  */
-public class PrivilegeInfo implements JsonSerializable, TreeNode {
+public class PrivilegeDomain implements JsonSerializable, TreeNode {
 
 	private static final long serialVersionUID = -8828760710678965127L;
 

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

@@ -11,7 +11,7 @@ import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
  * @date 2018年6月14日
  * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
  */
-public class UpdateRolePrivilegeRelationsReq implements JsonSerializable {
+public class UpdateRolePrivilegeRelationsDomain implements JsonSerializable {
 
 	private static final long serialVersionUID = -9173265174568713167L;
 

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

@@ -11,7 +11,7 @@ import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
  * @date 2018年6月25日
  * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
  */
-public class UserForm implements JsonSerializable {
+public class UserFormDomain implements JsonSerializable {
 
 	private static final long serialVersionUID = -1326157272669439949L;