...

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

@@ -11,7 +11,8 @@ import cn.com.qmth.examcloud.core.basic.api.UserCloudService;
 import cn.com.qmth.examcloud.core.basic.api.bean.UserInfo;
 import cn.com.qmth.examcloud.core.basic.api.request.GetUserInfoReq;
 import cn.com.qmth.examcloud.core.basic.api.response.GetUserInfoResp;
-import cn.com.qmth.examcloud.core.basic.service.impl.UserServiceImpl;
+import cn.com.qmth.examcloud.core.basic.dao.entity.User;
+import cn.com.qmth.examcloud.core.basic.service.UserService;
 import io.swagger.annotations.ApiOperation;
 
 /**
@@ -25,7 +26,7 @@ import io.swagger.annotations.ApiOperation;
 public class UserCloudServiceProvider extends ControllerSupport implements UserCloudService {
 
 	@Autowired
-	UserServiceImpl userService;
+	UserService userService;
 
 	@ApiOperation(value = "获取用户信息", notes = "获取用户信息")
 	@PostMapping("getUserInfo")
@@ -33,8 +34,14 @@ public class UserCloudServiceProvider extends ControllerSupport implements UserC
 	public GetUserInfoResp getUserInfo(@RequestBody GetUserInfoReq req) {
 
 		GetUserInfoResp resp = new GetUserInfoResp();
+		String rootOrgId = req.getRootOrgId();
+		String loginName = req.getLoginName();
+
+		User user = userService.getUser(Long.parseLong(rootOrgId), loginName);
+
 		UserInfo userInfo = new UserInfo();
-		userInfo.setLoginName("wangwei");
+		userInfo.setRootOrgId(user.getRootOrgId());
+		userInfo.setLoginName(user.getLoginName());
 		resp.setUserInfo(userInfo);
 		return resp;
 	}

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

@@ -1,128 +1,15 @@
 package cn.com.qmth.examcloud.core.basic.api.bean;
 
 import java.io.Serializable;
-import java.util.List;
 
 public class UserInfo implements Serializable {
 
 	private static final long serialVersionUID = 7939545789907406883L;
 
-	private Long userId;
-
-	private Long orgId;
-
 	private Long rootOrgId;
 
-	private String name;
-
 	private String loginName;
 
-	private String type;
-
-	private String token;
-
-	private String avatar;
-
-	private String orgName;
-
-	private String rootOrgName;
-
-	private String rootOrgLogo;
-
-	private Long studentId;
-
-	private String identityNumber;
-
-	private String studentCode;
-
-	private List<UserRole> userRoles;
-
-	private List<String> roleNames;
-
-	public static long getSerialVersionUID() {
-		return serialVersionUID;
-	}
-
-	public Long getUserId() {
-		return userId;
-	}
-
-	public void setUserId(Long userId) {
-		this.userId = userId;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getLoginName() {
-		return loginName;
-	}
-
-	public void setLoginName(String loginName) {
-		this.loginName = loginName;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public String getToken() {
-		return token;
-	}
-
-	public void setToken(String token) {
-		this.token = token;
-	}
-
-	public String getAvatar() {
-		return avatar;
-	}
-
-	public void setAvatar(String avatar) {
-		this.avatar = avatar;
-	}
-
-	public String getOrgName() {
-		return orgName;
-	}
-
-	public void setOrgName(String orgName) {
-		this.orgName = orgName;
-	}
-
-	public String getRootOrgName() {
-		return rootOrgName;
-	}
-
-	public void setRootOrgName(String rootOrgName) {
-		this.rootOrgName = rootOrgName;
-	}
-
-	public String getRootOrgLogo() {
-		return rootOrgLogo;
-	}
-
-	public void setRootOrgLogo(String rootOrgLogo) {
-		this.rootOrgLogo = rootOrgLogo;
-	}
-
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
 	public Long getRootOrgId() {
 		return rootOrgId;
 	}
@@ -131,46 +18,12 @@ public class UserInfo implements Serializable {
 		this.rootOrgId = rootOrgId;
 	}
 
-	public Long getStudentId() {
-		return studentId;
-	}
-
-	public void setStudentId(Long studentId) {
-		this.studentId = studentId;
-	}
-
-	public String getIdentityNumber() {
-		return identityNumber;
-	}
-
-	public void setIdentityNumber(String identityNumber) {
-		this.identityNumber = identityNumber;
-	}
-
-	public List<UserRole> getUserRoles() {
-		return userRoles;
-	}
-
-	public void setUserRoles(List<UserRole> userRoles) {
-		this.userRoles = userRoles;
-	}
-
-	public List<String> getRoleNames() {
-		return roleNames;
-	}
-
-	public void setRoleNames(List<String> roleNames) {
-		this.roleNames = roleNames;
-	}
-
-	public String getStudentCode() {
-		return studentCode;
+	public String getLoginName() {
+		return loginName;
 	}
 
-	public void setStudentCode(String studentCode) {
-		this.studentCode = studentCode;
+	public void setLoginName(String loginName) {
+		this.loginName = loginName;
 	}
 
-	public UserInfo() {
-	}
 }

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

@@ -1,5 +1,7 @@
 package cn.com.qmth.examcloud.core.basic.service;
 
+import cn.com.qmth.examcloud.core.basic.dao.entity.User;
+
 /**
  * 用户服务
  * 
@@ -8,4 +10,15 @@ package cn.com.qmth.examcloud.core.basic.service;
  */
 public interface UserService {
 
+	/**
+	 * 查询用户
+	 *
+	 * @author WANGWEI
+	 * @param rootOrgId
+	 * @param loginName
+	 * @return
+	 */
+	User getUser(Long rootOrgId, String loginName);
+	
+
 }

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

@@ -9,16 +9,18 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.persistence.criteria.*;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.Predicate;
 
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.*;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
-import ch.qos.logback.core.net.LoginAuthenticator;
 import cn.com.qmth.examcloud.common.uac.AccessCtrlUtil;
 import cn.com.qmth.examcloud.common.uac.AccessUserOps;
 import cn.com.qmth.examcloud.common.uac.AccessUserOpsForRedis;
@@ -37,7 +39,6 @@ import cn.com.qmth.examcloud.core.basic.dao.entity.User;
 import cn.com.qmth.examcloud.core.basic.dao.entity.UserLogin;
 import cn.com.qmth.examcloud.core.basic.dao.entity.UserOpsLog;
 import cn.com.qmth.examcloud.core.basic.dao.entity.UserRole;
-import cn.com.qmth.examcloud.core.basic.dao.enums.OrgType;
 import cn.com.qmth.examcloud.core.basic.dao.enums.UserScope;
 import cn.com.qmth.examcloud.core.basic.dao.enums.UserType;
 import cn.com.qmth.examcloud.core.basic.service.UserService;
@@ -472,4 +473,10 @@ public class UserServiceImpl  implements UserService{
 		return userRepo.save(user);
 	}
 
+	@Override
+	public User getUser(Long rootOrgId, String loginName) {
+        User user = userRepo.findByRootOrgIdAndLoginName(rootOrgId,loginName);
+        return user;
+	}
+
 }