...

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

@@ -21,6 +21,7 @@ import cn.com.qmth.examcloud.core.basic.api.bean.UserBean;
 import cn.com.qmth.examcloud.core.basic.api.request.LoginReq;
 import cn.com.qmth.examcloud.core.basic.api.response.LoginResp;
 import cn.com.qmth.examcloud.core.basic.base.enums.AccountType;
+import cn.com.qmth.examcloud.core.basic.base.enums.UserType;
 import cn.com.qmth.examcloud.core.basic.dao.OrgRepo;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Org;
 import cn.com.qmth.examcloud.core.basic.dao.entity.User;
@@ -71,15 +72,16 @@ public class UserCloudServiceProvider extends ControllerSupport implements UserC
 
 		UserBean userBean = new UserBean();
 
-		// 一般账户登录
+		// 常规账户登录
 		if (AccountType.COMMON_LOGIN_NAME.getCode().equals(accountType)) {
 			User user = userService.getUser(Long.parseLong(rootOrgId), accountValue);
 			String rightPassword = user.getPassword();
 			if (!rightPassword.equals(password)) {
 				throw new StatusException("B-001003", "密码错误");
 			}
-			userBean.setId(user.getId());
-			userBean.setLoginName(user.getLoginName());
+			userBean.setUserType(UserType.COMMON.getCode());
+			userBean.setUserId(user.getId());
+			userBean.setDisplayName(user.getLoginName());
 			userBean.setRootOrgId(user.getRootOrgId());
 
 			List<UserRole> userRoles = user.getUserRoles();

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/bean/UserBean.java

@@ -4,20 +4,6 @@ import java.util.List;
 
 import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
 
-/**
- * 类注释
- *
- * @author WANGWEI
- * @date 2018年5月25日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-/**
- * 类注释
- *
- * @author WANGWEI
- * @date 2018年5月25日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
 /**
  * 类注释
  *
@@ -29,15 +15,20 @@ public class UserBean implements JsonSerializable {
 
 	private static final long serialVersionUID = -4157068941699776174L;
 
+	/**
+	 * 用户类型
+	 */
+	private String userType;
+
 	/**
 	 * 用户ID
 	 */
-	private Long id;
+	private Long userId;
 
 	/**
-	 * 登录名
+	 * 显示名
 	 */
-	private String loginName;
+	private String displayName;
 
 	/**
 	 * 顶级机构ID
@@ -49,20 +40,28 @@ public class UserBean implements JsonSerializable {
 	 */
 	private List<RoleBean> roleList;
 
-	public Long getId() {
-		return id;
+	public String getUserType() {
+		return userType;
+	}
+
+	public void setUserType(String userType) {
+		this.userType = userType;
+	}
+
+	public Long getUserId() {
+		return userId;
 	}
 
-	public void setId(Long id) {
-		this.id = id;
+	public void setUserId(Long userId) {
+		this.userId = userId;
 	}
 
-	public String getLoginName() {
-		return loginName;
+	public String getDisplayName() {
+		return displayName;
 	}
 
-	public void setLoginName(String loginName) {
-		this.loginName = loginName;
+	public void setDisplayName(String displayName) {
+		this.displayName = displayName;
 	}
 
 	public Long getRootOrgId() {

examcloud-core-basic-base/src/main/java/cn/com/qmth/examcloud/core/basic/base/enums/AccountType.java

@@ -12,17 +12,17 @@ public enum AccountType {
 	/**
 	 * 学生学号
 	 */
-	STUDENT_CODE("STUDENT_CODE", "学号"),
+	STUDENT_CODE("STUDENT_CODE", "学生学号"),
 
 	/**
 	 * 学生身份证号
 	 */
-	STUDENT_IDENTITY_NUMBER("STUDENT_IDENTITY_NUMBER", "学号"),
+	STUDENT_IDENTITY_NUMBER("STUDENT_IDENTITY_NUMBER", "学生身份证号"),
 
 	/**
-	 * 一般登录名（非学生登录）
+	 * 常规登录名（非学生登录）
 	 */
-	COMMON_LOGIN_NAME("COMMON_LOGIN_NAME", "一般登录名");
+	COMMON_LOGIN_NAME("COMMON_LOGIN_NAME", "常规登录名");
 
 	// ===========================================================================
 

examcloud-core-basic-base/src/main/java/cn/com/qmth/examcloud/core/basic/base/enums/UserType.java

@@ -0,0 +1,59 @@
+package cn.com.qmth.examcloud.core.basic.base.enums;
+
+/**
+ * 用户类型
+ *
+ * @author WANGWEI
+ * @date 2018年5月25日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public enum UserType {
+
+	/**
+	 * 学生
+	 */
+	STUDENT("S", "学生"),
+
+	/**
+	 * 常规用户
+	 */
+	COMMON("C", "常规用户");
+
+	// ===========================================================================
+
+	/**
+	 * 码
+	 */
+	private String code;
+
+	/**
+	 * 描述
+	 */
+	private String desc;
+
+	/**
+	 * 构造函数
+	 *
+	 * @param code
+	 * @param desc
+	 */
+	private UserType(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	/**
+	 * @return the code
+	 */
+	public String getCode() {
+		return code;
+	}
+
+	/**
+	 * @return the desc
+	 */
+	public String getDesc() {
+		return desc;
+	}
+
+}