...

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

@@ -1,14 +1,10 @@
 package cn.com.qmth.examcloud.core.basic.api.controller;
 
-import cn.com.qmth.examcloud.commons.base.util.ErrorMsg;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
-import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
-import io.swagger.annotations.ApiOperation;
-
 import java.io.File;
-import java.util.Date;
 import java.util.List;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -25,15 +21,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import cn.com.qmth.examcloud.commons.base.util.ErrorMsg;
+import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.basic.dao.StudentRepo;
 import cn.com.qmth.examcloud.core.basic.dao.UserRepo;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Student;
-import cn.com.qmth.examcloud.core.basic.dao.entity.UserEntity;
-import cn.com.qmth.examcloud.core.basic.dao.enums.LoginType;
-import cn.com.qmth.examcloud.core.basic.service.bean.UserInfo;
 import cn.com.qmth.examcloud.core.basic.service.impl.StudentServiceImpl;
-
-import javax.servlet.http.HttpServletRequest;
+import io.swagger.annotations.ApiOperation;
 
 /**
  * 学生服务API Created by songyue on 17/1/14.
@@ -90,15 +84,12 @@ public class StudentController extends ControllerSupport {
 
 	@ApiOperation(value = "新增学生", notes = "新增")
 	@PostMapping
-	public ResponseEntity addStudent(@RequestBody Student student) {
-		student.setCreateTime(new Date());
-		return new ResponseEntity(studentService.save(student), HttpStatus.CREATED);
+	public void addStudent(@RequestBody Student student) {
 	}
 
 	@ApiOperation(value = "更新学生", notes = "更新")
 	@PutMapping
-	public ResponseEntity updateStudent(@RequestBody Student student) {
-		return new ResponseEntity(studentService.update(student), HttpStatus.OK);
+	public void updateStudent(@RequestBody Student student) {
 	}
 
 	@ApiOperation(value = "按ID删除学生", notes = "删除")

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

@@ -47,11 +47,11 @@ 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.RoleRepo;
 import cn.com.qmth.examcloud.core.basic.dao.UserRepo;
+import cn.com.qmth.examcloud.core.basic.dao.constants.Consts;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Org;
 import cn.com.qmth.examcloud.core.basic.dao.entity.RoleEntity;
 import cn.com.qmth.examcloud.core.basic.dao.entity.UserEntity;
 import cn.com.qmth.examcloud.core.basic.dao.entity.UserRole;
-import cn.com.qmth.examcloud.core.basic.dao.enums.UserScope;
 import cn.com.qmth.examcloud.core.basic.service.bean.UserInfo;
 import cn.com.qmth.examcloud.core.basic.service.impl.UserServiceImpl;
 import io.swagger.annotations.ApiOperation;
@@ -188,17 +188,16 @@ public class UserController extends ControllerSupport {
 
 	@ApiOperation(value = "按orgId查询用户", notes = "机构id查询机构用户")
 	@GetMapping("/org/{orgId}")
-	public ResponseEntity getUserByOrgId(@PathVariable long orgId) {
-		List<UserEntity> userList = userRepo.findByOrgIdAndType(orgId, UserType.COMMON.name());
-		return new ResponseEntity(userList, HttpStatus.OK);
+	public List<UserEntity> getUserByOrgId(@PathVariable long orgId) {
+		List<UserEntity> userList = userRepo.findByOrgId(orgId);
+		return userList;
 	}
 
 	@ApiOperation(value = "按rootOrgId查询用户", notes = "根机构id查询机构用户")
 	@GetMapping("/rootOrg/{rootOrgId}")
-	public ResponseEntity getUserByRootOrgId(@PathVariable long rootOrgId) {
-		List<UserEntity> userList = userRepo.findByRootOrgIdAndType(rootOrgId,
-				UserType.COMMON.name());
-		return new ResponseEntity(userList, HttpStatus.OK);
+	public List<UserEntity> getUserByRootOrgId(@PathVariable long rootOrgId) {
+		List<UserEntity> userList = userRepo.findByRootOrgId(rootOrgId);
+		return userList;
 	}
 
 	/**
@@ -274,8 +273,6 @@ public class UserController extends ControllerSupport {
 		userEntity.setOrgId(userForm.getOrgId());
 		userEntity.setRootOrgId(rootOrgId);
 		userEntity.setPassword(userForm.getPassword());
-		userEntity.setScope(UserScope.ORG);
-		userEntity.setType(UserType.COMMON);
 		userEntity.setUpdateTime(new Date());
 
 		List<UserRole> userRoles = Lists.newArrayList();
@@ -301,13 +298,14 @@ public class UserController extends ControllerSupport {
 
 	@ApiOperation(value = "重置用户密码", notes = "重置密码")
 	@PutMapping("/resetPass/{id}")
-	public ResponseEntity resetPass(@PathVariable String id) {
+	public void resetPass(@PathVariable String id) {
 		List<Long> ids = Stream.of(id.split(",")).map(s -> Long.parseLong(s.trim()))
 				.collect(Collectors.toList());
 		for (Long userId : ids) {
-			userService.initPassword(userId);
+			UserEntity user = userRepo.findOne(userId);
+			user.setPassword(Consts.DEFAULT_PASSWORD);
+			userRepo.save(user);
 		}
-		return new ResponseEntity(HttpStatus.OK);
 	}
 
 	@ApiOperation(value = "启用用户", notes = "启用用户")
@@ -319,7 +317,6 @@ public class UserController extends ControllerSupport {
 		for (Long userId : userIds) {
 			UserEntity user = userRepo.findOne(userId);
 			user.setEnable(true);
-			user.setUpdateTime(new Date());
 			userRepo.save(user);
 			ret.add(user.getId() + ":" + user.getName());
 		}
@@ -335,7 +332,6 @@ public class UserController extends ControllerSupport {
 		for (Long userId : userIds) {
 			UserEntity user = userRepo.findOne(userId);
 			user.setEnable(false);
-			user.setUpdateTime(new Date());
 			userRepo.save(user);
 			ret.add(user.getId() + ":" + user.getName());
 		}
@@ -465,9 +461,4 @@ public class UserController extends ControllerSupport {
 		}
 	}
 
-	@ApiOperation(value = "查询印刷项目经理", notes = "查询印刷项目经理")
-	@GetMapping("/allPrintPm")
-	public ResponseEntity getAllPrintPm() {
-		return new ResponseEntity(userRepo.findPrintPm(), HttpStatus.OK);
-	}
 }

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

@@ -7,6 +7,7 @@ package cn.com.qmth.examcloud.core.basic.base.enums;
  * @date 2018年5月25日
  * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
  */
+@Deprecated
 public enum UserType {
 
 	/**

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

@@ -34,18 +34,13 @@ public interface UserRepo
 
 	int countByLoginName(String loginName);
 
-	List<UserEntity> findByOrgIdAndType(long orgId, String userType);
-
-	List<UserEntity> findByRootOrgIdAndType(long rootOrgId, String userType);
-
 	List<UserEntity> findByOrgId(Long orgId);
 
+	List<UserEntity> findByRootOrgId(Long rootOrgId);
+
 	@Query(nativeQuery = true, value = "SELECT DISTINCT * FROM ecs_core_user us, ecs_core_user_role ur WHERE us.id = ur.user_id And us.root_org_id = ? And ur.role_code = 'MARKER' And us.enable = 1")
 	List<UserEntity> findMarkerByRootOrgId(Long rootOrgId);
 
-	@Query(nativeQuery = true, value = "SELECT DISTINCT * FROM ecs_core_user us, ecs_core_user_role ur WHERE us.type = 'PRINT' and us.id = ur.user_id and ur.role_code = 'PROJECT_MANAGER' And us.enable = 1")
-	List<UserEntity> findPrintPm();
-
 	@Query(value = "SELECT  * FROM ecs_core_user X, ecs_core_user_role Y WHERE X.id = Y.user_id "
 			+ "And X.root_org_id = :rootOrgId And X.name like :name And x.login_name like :loginName And type = :type "
 			+ "And Y.role_code = :roleCode ORDER BY ?#{#pageable} ", countQuery = ""

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

@@ -1,28 +1,19 @@
 package cn.com.qmth.examcloud.core.basic.dao.entity;
 
-import java.util.Date;
-
-import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
 import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 import javax.validation.constraints.NotNull;
 
-import org.springframework.format.annotation.DateTimeFormat;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.commons.web.jpa.JpaEntity;
 
 /**
  * Created by songyue on 17/1/13.
  */
 @Entity
 @Table(name = "ecs_core_student")
-public class Student implements JsonSerializable {
+public class Student extends JpaEntity {
 
 	private static final long serialVersionUID = 757531976286006550L;
 
@@ -30,13 +21,14 @@ public class Student implements JsonSerializable {
 	@GeneratedValue
 	private Long id;
 
-	@OneToOne(cascade = {CascadeType.ALL})
-	@JoinColumn(name = "userId")
-	private UserEntity user;
+	@GeneratedValue
+	private Long userId;
 
 	@NotNull
 	private String name;
 
+	private String password;
+
 	private String studentCode;
 
 	private String identityNumber;
@@ -45,20 +37,8 @@ public class Student implements JsonSerializable {
 
 	private String remark;
 
-	/**
-	 * 使用UserEntity.enable;modified by wangwei
-	 */
-	@Deprecated
 	private Boolean enable;
 
-	@Temporal(value = TemporalType.DATE)
-	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	private Date createTime;
-
-	@Temporal(value = TemporalType.DATE)
-	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	private Date updateTime;
-
 	private Long orgId;
 
 	private Long rootOrgId;
@@ -83,12 +63,28 @@ public class Student implements JsonSerializable {
 		this.id = id;
 	}
 
-	public UserEntity getUser() {
-		return user;
+	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 getPassword() {
+		return password;
 	}
 
-	public void setUser(UserEntity user) {
-		this.user = user;
+	public void setPassword(String password) {
+		this.password = password;
 	}
 
 	public String getStudentCode() {
@@ -123,36 +119,10 @@ public class Student implements JsonSerializable {
 		this.remark = remark;
 	}
 
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	@Deprecated
 	public Boolean getEnable() {
 		return enable;
 	}
 
-	@Deprecated
 	public void setEnable(Boolean enable) {
 		this.enable = enable;
 	}

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

@@ -14,9 +14,7 @@ import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 
 import cn.com.qmth.examcloud.commons.web.jpa.JpaEntity;
-import cn.com.qmth.examcloud.core.basic.base.enums.UserType;
 import cn.com.qmth.examcloud.core.basic.dao.enums.Gender;
-import cn.com.qmth.examcloud.core.basic.dao.enums.UserScope;
 
 /**
  * Created by songyue on 17/1/13.
@@ -49,16 +47,8 @@ public class UserEntity extends JpaEntity {
 	@Enumerated(EnumType.STRING)
 	private Gender gender;
 
-	@NotNull
-	@Enumerated(EnumType.STRING)
-	private UserScope scope;
-
 	private String avatar;
 
-	@NotNull
-	@Enumerated(EnumType.STRING)
-	private UserType type;
-
 	@NotNull
 	private Boolean enable;
 
@@ -130,14 +120,6 @@ public class UserEntity extends JpaEntity {
 		this.gender = gender;
 	}
 
-	public UserScope getScope() {
-		return scope;
-	}
-
-	public void setScope(UserScope scope) {
-		this.scope = scope;
-	}
-
 	public String getAvatar() {
 		return avatar;
 	}
@@ -146,14 +128,6 @@ public class UserEntity extends JpaEntity {
 		this.avatar = avatar;
 	}
 
-	public UserType getType() {
-		return type;
-	}
-
-	public void setType(UserType type) {
-		this.type = type;
-	}
-
 	public Boolean getEnable() {
 		return enable;
 	}
@@ -173,11 +147,9 @@ public class UserEntity extends JpaEntity {
 	public UserEntity() {
 	}
 
-	public UserEntity(String name, UserScope scope, Long rootOrgId, Long orgId, UserType type) {
+	public UserEntity(String name, Long rootOrgId, Long orgId) {
 		this.name = name;
-		this.scope = scope;
 		this.rootOrgId = rootOrgId;
 		this.orgId = orgId;
-		this.type = type;
 	}
 }

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

@@ -21,7 +21,6 @@ import cn.com.qmth.examcloud.commons.base.util.UUID;
 import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
 import cn.com.qmth.examcloud.commons.web.security.bean.Role;
 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.core.basic.base.constants.PropKeys;
 import cn.com.qmth.examcloud.core.basic.base.enums.AccountType;
 import cn.com.qmth.examcloud.core.basic.base.enums.UserType;
@@ -99,19 +98,33 @@ public class AuthServiceImpl implements AuthService {
 		String accountValue = loginInfo.getAccountValue();
 		String password = loginInfo.getPassword();
 
-		UserEntity userEntity = null;
-		Student student = null;
 		User user = new User();
 
 		// 常规账户登录
 		if (AccountType.COMMON_LOGIN_NAME.getCode().equals(accountType)) {
 			user.setUserType(UserType.COMMON.getCode());
-			userEntity = userService.getUser(Long.parseLong(rootOrgId), accountValue);
+			UserEntity userEntity = userService.getUser(Long.parseLong(rootOrgId), accountValue);
 			if (null == userEntity) {
 				throw new StatusException("B-001004", "用户不存在");
 			}
+			if (!userEntity.getEnable()) {
+				throw new StatusException("B-001005", "账户被禁用");
+			}
+			String rightPassword = userEntity.getPassword();
+			if (!rightPassword.equals(password)) {
+				throw new StatusException("B-001003", "密码错误");
+			}
+			user.setUserId(userEntity.getId());
 			user.setDisplayName(userEntity.getLoginName());
+			user.setRootOrgId(userEntity.getRootOrgId());
+			user.setRootOrgName(rootOrg.getName());
+			user.setOrgId(userEntity.getOrgId());
+
+			List<UserRole> userRoles = userEntity.getUserRoles();
+			List<Role> roleList = getRoles(userRoles);
+			user.setRoleList(roleList);
 		} else {
+			Student student = null;
 			// 学生学号登录
 			if (AccountType.STUDENT_CODE.getCode().equals(accountType)) {
 				student = studentRepo.findByStudentCodeAndRootOrgId(accountValue, rootOrg.getId());
@@ -125,47 +138,30 @@ public class AuthServiceImpl implements AuthService {
 			if (null == student) {
 				throw new StatusException("B-001110", "学生不存在");
 			}
+			if (!student.getEnable()) {
+				throw new StatusException("B-001005", "账户被禁用");
+			}
+			String rightPassword = student.getPassword();
+			if (!rightPassword.equals(password)) {
+				throw new StatusException("B-001003", "密码错误");
+			}
 
 			user.setUserType(UserType.STUDENT.getCode());
 			user.setStudentId(student.getId());
+			user.setUserId(student.getUserId());
 			user.setStudentCode(student.getStudentCode());
 			user.setIdentityNumber(student.getIdentityNumber());
-
-			userEntity = userRepo.findOne(student.getUser().getId());
-			if (null == userEntity) {
-				throw new StatusException("B-001004", "用户不存在");
-			}
-			user.setDisplayName(userEntity.getName());
-			List<UserRole> roleList = Lists.newArrayList();
-			UserRole userRole = new UserRole();
-			userRole.setRoleCode(RoleMeta.STUDENT.name());
-			roleList.add(userRole);
-			userEntity.setUserRoles(roleList);
-		}
-
-		String rightPassword = userEntity.getPassword();
-		if (!rightPassword.equals(password)) {
-			throw new StatusException("B-001003", "密码错误");
+			user.setRootOrgId(student.getRootOrgId());
+			user.setRootOrgName(rootOrg.getName());
+			user.setOrgId(student.getOrgId());
+			user.setDisplayName(student.getName());
 		}
 
-		if (!userEntity.getEnable()) {
-			throw new StatusException("B-001005", "账户被禁用");
-		}
-
-		user.setUserId(userEntity.getId());
-
-		user.setRootOrgId(userEntity.getRootOrgId());
-		user.setRootOrgName(rootOrg.getName());
-		user.setOrgId(userEntity.getOrgId());
 		if (null != user.getOrgId()) {
 			Org org = orgRepo.findOne(user.getOrgId());
 			user.setOrgName(org.getName());
 		}
 
-		List<UserRole> userRoles = userEntity.getUserRoles();
-		List<Role> roleList = getRoles(userRoles);
-		user.setRoleList(roleList);
-
 		setSession(user);
 
 		return user;

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

@@ -23,18 +23,14 @@ import cn.com.qmth.examcloud.commons.base.exception.StatusException;
 import cn.com.qmth.examcloud.commons.base.util.excel.ExcelError;
 import cn.com.qmth.examcloud.commons.base.util.excel.ExcelReader;
 import cn.com.qmth.examcloud.commons.base.util.excel.ExcelReaderHandle;
-import cn.com.qmth.examcloud.core.basic.base.enums.UserType;
 import cn.com.qmth.examcloud.core.basic.dao.ExamSiteRepo;
 import cn.com.qmth.examcloud.core.basic.dao.OrgMemRepo;
 import cn.com.qmth.examcloud.core.basic.dao.OrgRepo;
 import cn.com.qmth.examcloud.core.basic.dao.UserRepo;
-import cn.com.qmth.examcloud.core.basic.dao.constants.Consts;
 import cn.com.qmth.examcloud.core.basic.dao.entity.ExamSite;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Org;
 import cn.com.qmth.examcloud.core.basic.dao.entity.UserEntity;
-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.service.bean.OrgDto;
 
 @Service
@@ -86,10 +82,7 @@ public class OrgService {
 			Org tempOrg = orgRepo.save(orgAssembler(orgDto));
 			orgDto.setId(tempOrg.getId());
 			examSiteRepo.save(examSiteAssembler(orgDto));
-			createOrgUser(tempOrg);
-
 		} else {
-
 			org.setName(orgDto.getName());
 			org.setContacts(orgDto.getContacts());
 			org.setTelphone(orgDto.getTelphone());
@@ -102,31 +95,12 @@ public class OrgService {
 				examSiteRepo.save(examSiteAssembler(orgDto));
 			} else {
 				examSite.setName(orgDto.getExamSiteName());
-				// examSite.setContacts(orgDto.getContacts());
-				// examSite.setTelphone(orgDto.getTelphone());
 				examSiteRepo.save(examSite);
 			}
 		}
 
 	}
 
-	/**
-	 * 创建学习中心用户
-	 * 
-	 * @param tempOrg
-	 */
-	private void createOrgUser(Org tempOrg) {
-		UserEntity user = new UserEntity(tempOrg.getName(), UserScope.ORG, tempOrg.getRootId(),
-				tempOrg.getId(), UserType.COMMON);
-		user.setLoginName(tempOrg.getCode());
-		user.setEnable(true);
-		user.setPassword(Consts.DEFAULT_PASSWORD);
-		List<UserRole> userRoles = new ArrayList<UserRole>();
-		userRoles.add(new UserRole("LC_USER"));
-		user.setUserRoles(userRoles);
-		userRepo.save(user);
-	}
-
 	private Org orgAssembler(OrgDto orgDto) {
 		Org org = new Org();
 		org.setRootId(orgDto.getRootId());

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

@@ -104,7 +104,7 @@ public class StudentServiceImpl implements StudentService {
 					student = studentRepo.findByIdentityNumber(fileName);
 				}
 				if (student != null) {// 学生存在则绑定照片
-					student.setPhotoPath(student.getUser().getRootOrgId() + File.separator + "photo"
+					student.setPhotoPath(student.getRootOrgId() + File.separator + "photo"
 							+ File.separator + fileName);
 					studentRepo.save(student);
 					dataSendService.sendStudent(student);
@@ -116,85 +116,6 @@ public class StudentServiceImpl implements StudentService {
 		return list;
 	}
 
-	@Transactional
-	public Student save(Student student) {
-		// 判断是否有用户
-		if (student.getUser() == null || null == student.getUser().getId()) {
-			// 判断是否有该学生
-			if (!StringUtils.isEmpty(student.getStudentCode())) {
-				// 学号查找不为空,更新身份证号
-				Student s1 = studentRepo.findByRootOrgIdAndStudentCode(
-						student.getUser().getRootOrgId(), student.getStudentCode());
-				if (s1 != null) {
-					s1.setIdentityNumber(student.getIdentityNumber());
-					s1.setUpdateTime(new Date());
-					s1.setName(student.getName());
-					s1.setOrgId(student.getOrgId());
-					s1 = studentRepo.save(s1);
-					dataSendService.sendStudent(s1);
-					return s1;
-				}
-			}
-
-			// 身份证查找不为空，更新学号
-			Student s2 = studentRepo.findByIdentityNumberAndRootOrgId(student.getIdentityNumber(),
-					student.getRootOrgId());
-			if (s2 != null) {
-				s2.setStudentCode(student.getStudentCode());
-				s2.setUpdateTime(new Date());
-				s2.setName(student.getName());
-				s2.setOrgId(student.getOrgId());
-				s2 = studentRepo.save(s2);
-				dataSendService.sendStudent(s2);
-				return s2;
-			}
-
-			student.setOrgId(student.getUser().getOrgId());
-			student.setRootOrgId(student.getUser().getRootOrgId());
-			// 新建用户和学生
-			UserEntity user = new UserEntity(student.getName(), UserScope.ORG,
-					student.getUser().getRootOrgId(), student.getUser().getOrgId(),
-					UserType.STUDENT);
-			user.setEnable(
-					student.getUser().getEnable() == null ? true : student.getUser().getEnable());
-
-			if (StringUtils.isNotEmpty(student.getStudentCode())) {
-				user.setLoginName(student.getStudentCode());
-			} else {
-				user.setLoginName(student.getIdentityNumber());
-			}
-
-			String identityNumber = student.getIdentityNumber();
-			if (StringUtils.isNotEmpty(identityNumber)
-					&& identityNumber.matches("[0-9a-zA-Z]{6,}")) {
-				user.setPassword(
-						StringUtils.substring(identityNumber, -6, identityNumber.length()));
-			} else {
-				user.setPassword(Consts.DEFAULT_PASSWORD);
-			}
-
-			List<UserRole> userRoles = new ArrayList<UserRole>();
-			userRoles.add(new UserRole("STUDENT"));
-			user.setUserRoles(userRoles);
-			userRepo.save(user);
-			student.setUser(user);
-		}
-
-		student = studentRepo.save(student);
-		dataSendService.sendStudent(student);
-		return student;
-	}
-
-	public Student update(Student student) {
-		student.setUpdateTime(new Date());
-		UserEntity user = userRepo.findOne(student.getUser().getId());
-		user.setName(student.getName());
-		student.setUser(user);
-		student = studentRepo.save(student);
-		dataSendService.sendStudent(student);
-		return student;
-	}
-
 	/*
 	 * 实现
 	 *
@@ -250,6 +171,15 @@ public class StudentServiceImpl implements StudentService {
 		Student updatedStudent = new Student();
 		if (null != student) {
 			updatedStudent.setId(student.getId());
+			updatedStudent.setPassword(student.getPassword());
+		} else {
+			if (StringUtils.isNotEmpty(identityNumber)
+					&& identityNumber.matches("[0-9a-zA-Z]{6,}")) {
+				updatedStudent.setPassword(
+						StringUtils.substring(identityNumber, -6, identityNumber.length()));
+			} else {
+				updatedStudent.setPassword(Consts.DEFAULT_PASSWORD);
+			}
 		}
 
 		updatedStudent.setName(studentInfo.getName());

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

@@ -14,7 +14,6 @@ import javax.persistence.criteria.Predicate;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 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;
@@ -37,16 +36,13 @@ import cn.com.qmth.examcloud.core.basic.dao.UserLoginRepo;
 import cn.com.qmth.examcloud.core.basic.dao.UserOpsLogRepo;
 import cn.com.qmth.examcloud.core.basic.dao.UserRepo;
 import cn.com.qmth.examcloud.core.basic.dao.UserRoleRepo;
-import cn.com.qmth.examcloud.core.basic.dao.constants.Consts;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Org;
-import cn.com.qmth.examcloud.core.basic.dao.entity.Student;
 import cn.com.qmth.examcloud.core.basic.dao.entity.ThirdPartyAccessEntity;
 import cn.com.qmth.examcloud.core.basic.dao.entity.ThirdPartyAccessPK;
 import cn.com.qmth.examcloud.core.basic.dao.entity.UserEntity;
 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.UserScope;
 import cn.com.qmth.examcloud.core.basic.service.AuthService;
 import cn.com.qmth.examcloud.core.basic.service.UserService;
 import cn.com.qmth.examcloud.core.basic.service.bean.LoginInfo;
@@ -95,47 +91,6 @@ public class UserServiceImpl implements UserService {
 		this.accessUserOps = new AccessUserOpsForRedis(redisTemplate);
 	}
 
-	/**
-	 * 查询所有用户
-	 * 
-	 * @param userCriteria
-	 * @param pageable
-	 * @return
-	 */
-	public Page<UserEntity> findAll(UserEntity userCriteria, Pageable pageable) {
-		Specification<UserEntity> userSpecification = (root, query, cb) -> {
-			List<Predicate> predicates = new ArrayList<>();
-			if (userCriteria.getType() != null) {
-				predicates.add(cb.equal(root.get("type"), userCriteria.getType()));
-			}
-			predicates.add(cb.equal(root.get("rootOrgId"), userCriteria.getRootOrgId()));
-			if (StringUtils.isNotEmpty(userCriteria.getLoginName())) {
-				predicates.add(
-						cb.like(root.get("loginName"), "%" + userCriteria.getLoginName() + "%"));
-			}
-			if (StringUtils.isNotEmpty(userCriteria.getName())) {
-				predicates.add(cb.like(root.get("name"), "%" + userCriteria.getName() + "%"));
-			}
-			if (userCriteria.getOrgId() != null) {
-				predicates.add(cb.equal(root.get("orgId"), userCriteria.getOrgId()));
-			}
-			if (userCriteria.getEnable() != null) {
-				predicates.add(cb.equal(root.get("enable"), userCriteria.getEnable()));
-			}
-			return cb.and(predicates.toArray(new Predicate[predicates.size()]));
-		};
-		List<UserEntity> users = userRepo.findAll(userSpecification);
-		int pageNumber = pageable.getPageNumber();
-		int pageSize = pageable.getPageSize();
-		users = users.stream().filter(user -> filterNonMarkerUser(user))
-				.collect(Collectors.toList());
-		long total = users.size();
-		users = users.stream().skip(pageNumber * pageSize).limit(pageSize)
-				.collect(Collectors.toList());
-		Page<UserEntity> userPage = new PageImpl<UserEntity>(users, pageable, total);
-		return userPage;
-	}
-
 	/**
 	 * 过滤非评卷员
 	 * 
@@ -177,74 +132,6 @@ public class UserServiceImpl implements UserService {
 		}
 	}
 
-	/**
-	 * 查询所有机构用户
-	 * 
-	 * @param userCriteria
-	 * @param pageable
-	 * @return
-	 */
-	public Page<UserEntity> findOrgUser(UserEntity userCriteria, Pageable pageable) {
-		Specification<UserEntity> userSpecification = (root, query, cb) -> {
-			List<Predicate> predicates = new ArrayList<>();
-			predicates.add(cb.equal(root.get("rootOrgId"), root.get("orgId")));
-			if (userCriteria.getType() != null) {
-				predicates.add(cb.equal(root.get("type"), userCriteria.getType()));
-			}
-			if (userCriteria.getOrgId() != null) {
-				predicates.add(cb.equal(root.get("rootOrgId"), userCriteria.getOrgId()));
-			}
-			if (StringUtils.isNotEmpty(userCriteria.getLoginName())) {
-				predicates.add(
-						cb.like(root.get("loginName"), "%" + userCriteria.getLoginName() + "%"));
-			}
-			if (StringUtils.isNotEmpty(userCriteria.getName())) {
-				predicates.add(cb.like(root.get("name"), "%" + userCriteria.getName() + "%"));
-			}
-			if (userCriteria.getEnable() != null) {
-				predicates.add(cb.equal(root.get("enable"), userCriteria.getEnable()));
-			}
-			return cb.and(predicates.toArray(new Predicate[predicates.size()]));
-		};
-		List<UserEntity> users = userRepo.findAll(userSpecification);
-		int pageNumber = pageable.getPageNumber();
-		int pageSize = pageable.getPageSize();
-		users = users.stream().filter(user -> filterAdminUser(user)).collect(Collectors.toList());
-		long total = users.size();
-		users = users.stream().skip(pageNumber * pageSize).limit(pageSize)
-				.collect(Collectors.toList());
-		Page<UserEntity> userPage = new PageImpl<UserEntity>(users, pageable, total);
-		return userPage;
-	}
-
-	/**
-	 * 初始化密码
-	 * 
-	 * @param userId
-	 */
-	public void initPassword(long userId) {
-		UserEntity user = userRepo.findOne(userId);
-		// 根据用户类型采用不同的初始化策略
-		if (user.getType() == UserType.COMMON) {
-			// 初始化为默认密码
-			user.setPassword(Consts.DEFAULT_PASSWORD);
-
-		} else if (user.getType() == UserType.STUDENT) {
-			// 截取身份证后6位为学生登录密码
-			Student student = studentRepo.findByUserId(userId);
-			String identityNumber = student.getIdentityNumber();
-			if (StringUtils.isNotEmpty(identityNumber)
-					&& identityNumber.matches("[0-9a-zA-Z]{6,}")) {
-				user.setPassword(
-						StringUtils.substring(identityNumber, -6, identityNumber.length()));
-			} else {
-				user.setPassword(Consts.DEFAULT_PASSWORD);
-			}
-		}
-		user.setUpdateTime(new Date());
-		userRepo.save(user);
-	}
-
 	/**
 	 * 一般登录
 	 * 
@@ -444,7 +331,6 @@ public class UserServiceImpl implements UserService {
 			userInfo.setRootOrgName(rootOrg.getName());
 		}
 		userInfo.setToken(token);
-		userInfo.setType(user.getType().toString());
 		userInfo.setUserRoles(user.getUserRoles());
 		userInfo.setRoleNames(getRoleNames(user.getUserRoles()));
 		return userInfo;
@@ -537,8 +423,6 @@ public class UserServiceImpl implements UserService {
 		List<UserRole> userRoles = new LinkedList<UserRole>();
 		userRoles.add(userRole);
 		user.setUserRoles(userRoles);
-		user.setScope(UserScope.ORG);
-		user.setType(UserType.COMMON);
 		return userRepo.save(user);
 	}