。。。

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

@@ -18,7 +18,7 @@ import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.basic.base.constants.PropKeys;
 import cn.com.qmth.examcloud.core.basic.dao.StudentRepo;
-import cn.com.qmth.examcloud.core.basic.dao.entity.Student;
+import cn.com.qmth.examcloud.core.basic.dao.entity.StudentEntity;
 import cn.com.qmth.examcloud.core.basic.service.AuthService;
 import cn.com.qmth.examcloud.core.basic.service.bean.LoginInfo;
 import cn.com.qmth.examcloud.exchange.inner.api.SendSmsCloudService;
@@ -142,7 +142,7 @@ public class AuthController extends ControllerSupport {
 		User accessUser = getAccessUser();
 		Long studentId = accessUser.getStudentId();
 
-		Student sb = studentRepo.findBySecurityPhone(phone);
+		StudentEntity sb = studentRepo.findBySecurityPhone(phone);
 		if (null != sb) {
 			if (!sb.getId().equals(studentId)) {
 				throw new StatusException("B-001052", "手机号已被其他用户绑定,请更换手机号");
@@ -151,7 +151,7 @@ public class AuthController extends ControllerSupport {
 			}
 		}
 
-		Student s = studentRepo.findOne(studentId);
+		StudentEntity s = studentRepo.findOne(studentId);
 		s.setSecurityPhone(phone);
 		studentRepo.saveAndFlush(s);
 	}

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

@@ -35,7 +35,7 @@ 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.constants.Consts;
-import cn.com.qmth.examcloud.core.basic.dao.entity.Student;
+import cn.com.qmth.examcloud.core.basic.dao.entity.StudentEntity;
 import cn.com.qmth.examcloud.core.basic.service.bean.StudentInfo;
 import cn.com.qmth.examcloud.core.basic.service.impl.StudentServiceImpl;
 import io.swagger.annotations.ApiOperation;
@@ -70,12 +70,12 @@ public class StudentController extends ControllerSupport {
 	 */
 	@ApiOperation(value = "查询所有学生", notes = "分页")
 	@GetMapping("/{curPage}/{pageSize}")
-	public Page<Student> getAllStudent(@RequestParam String name, @RequestParam String studentCode,
+	public Page<StudentEntity> getAllStudent(@RequestParam String name, @RequestParam String studentCode,
 			@RequestParam String identityNumber, @PathVariable Integer curPage,
 			@PathVariable Integer pageSize) {
 		User accessUser = getAccessUser();
 
-		Specification<Student> specification = (root, query, cb) -> {
+		Specification<StudentEntity> specification = (root, query, cb) -> {
 			List<Predicate> predicates = new ArrayList<>();
 			predicates.add(cb.equal(root.get("rootOrgId"), accessUser.getRootOrgId()));
 
@@ -95,14 +95,14 @@ public class StudentController extends ControllerSupport {
 		PageRequest pageRequest = new PageRequest(curPage, pageSize,
 				new Sort(Direction.DESC, "updateTime"));
 
-		Page<Student> studentList = studentRepo.findAll(specification, pageRequest);
+		Page<StudentEntity> studentList = studentRepo.findAll(specification, pageRequest);
 		return studentList;
 	}
 
 	@ApiOperation(value = "查询所有学生", notes = "不分页")
 	@GetMapping
 	public ResponseEntity getAllStudent(HttpServletRequest request,
-			@ModelAttribute Student studentCriteria) {
+			@ModelAttribute StudentEntity studentCriteria) {
 		cn.com.qmth.examcloud.commons.web.security.bean.User accessUser = getAccessUser();
 		if (accessUser != null) {
 			if (accessUser.getRootOrgId().longValue() == accessUser.getOrgId().longValue()) {
@@ -123,8 +123,8 @@ public class StudentController extends ControllerSupport {
 	 */
 	@ApiOperation(value = "按ID查询学生", notes = "ID查询")
 	@GetMapping("/{id}")
-	public Student getStudentById(@PathVariable Long id) {
-		Student s = studentRepo.findOne(id);
+	public StudentEntity getStudentById(@PathVariable Long id) {
+		StudentEntity s = studentRepo.findOne(id);
 		return s;
 	}
 
@@ -156,7 +156,7 @@ public class StudentController extends ControllerSupport {
 				.collect(Collectors.toList());
 		List<String> ret = Lists.newArrayList();
 		for (Long cur : studentIds) {
-			Student s = studentRepo.findOne(cur);
+			StudentEntity s = studentRepo.findOne(cur);
 			s.setEnable(true);
 			studentRepo.save(s);
 			ret.add(s.getId() + ":" + s.getName());
@@ -178,7 +178,7 @@ public class StudentController extends ControllerSupport {
 				.collect(Collectors.toList());
 		List<String> ret = Lists.newArrayList();
 		for (Long cur : studentIds) {
-			Student s = studentRepo.findOne(cur);
+			StudentEntity s = studentRepo.findOne(cur);
 			s.setEnable(false);
 			studentRepo.save(s);
 			ret.add(s.getId() + ":" + s.getName());
@@ -192,7 +192,7 @@ public class StudentController extends ControllerSupport {
 		List<Long> studentIds = Stream.of(ids.split(",")).map(s -> Long.parseLong(s.trim()))
 				.collect(Collectors.toList());
 		for (Long cur : studentIds) {
-			Student s = studentRepo.findOne(cur);
+			StudentEntity s = studentRepo.findOne(cur);
 			if (null == s) {
 				throw new StatusException("B-450110", "学生不存在");
 			}
@@ -231,7 +231,7 @@ public class StudentController extends ControllerSupport {
 			throw new StatusException("B-450111", "密码必须是6至18位字母或数字");
 		}
 
-		Student s = studentRepo.findOne(accessUser.getStudentId());
+		StudentEntity s = studentRepo.findOne(accessUser.getStudentId());
 
 		if (StringUtils.isNotBlank(s.getPassword()) && !s.getPassword().equals(password)) {
 			throw new StatusException("B-450111", "当前密码错误");

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

@@ -20,8 +20,8 @@ import cn.com.qmth.examcloud.core.basic.api.request.SaveStudentFaceInfoReq;
 import cn.com.qmth.examcloud.core.basic.api.response.SaveStudentFaceInfoResp;
 import cn.com.qmth.examcloud.core.basic.dao.StudentFaceInfoRepo;
 import cn.com.qmth.examcloud.core.basic.dao.StudentRepo;
-import cn.com.qmth.examcloud.core.basic.dao.entity.Student;
-import cn.com.qmth.examcloud.core.basic.dao.entity.StudentFaceInfo;
+import cn.com.qmth.examcloud.core.basic.dao.entity.StudentEntity;
+import cn.com.qmth.examcloud.core.basic.dao.entity.StudentFaceEntity;
 import cn.com.qmth.examcloud.core.basic.service.impl.StudentFaceInfoService;
 import io.swagger.annotations.ApiOperation;
 
@@ -47,33 +47,33 @@ public class StudentFaceInfoController extends ControllerSupport {
 
 	@ApiOperation(value = "按身份证查询", notes = "查询")
 	@GetMapping("/identityNumber")
-	public StudentFaceInfo findByIdentityNumber(@RequestParam String identityNumber,
+	public StudentFaceEntity findByIdentityNumber(@RequestParam String identityNumber,
 			@RequestParam Long orgId) {
-		Student student = studentRepo.findByIdentityNumberAndRootOrgId(identityNumber, orgId);
+		StudentEntity student = studentRepo.findByIdentityNumberAndRootOrgId(identityNumber, orgId);
 		if (student == null) {
 			throw new StatusException("B-520110", "该学生不存在");
 		}
-		StudentFaceInfo studentFaceInfo = studentFaceInfoRepo.findByStudentId(student.getId());
-		if (studentFaceInfo == null) {
-			studentFaceInfo = new StudentFaceInfo();
-			studentFaceInfo.setStudent(student);
-		}
+		StudentFaceEntity studentFaceInfo = studentFaceInfoRepo.findByStudentId(student.getId());
+//		if (studentFaceInfo == null) {
+//			studentFaceInfo = new StudentFaceInfo();
+//			studentFaceInfo.setStudent(student);
+//		}
 		return studentFaceInfo;
 	}
 
 	@ApiOperation(value = "按学号查询", notes = "查询")
 	@GetMapping("/studentCode")
-	public StudentFaceInfo findByStudentCode(@RequestParam Long orgId,
+	public StudentFaceEntity findByStudentCode(@RequestParam Long orgId,
 			@RequestParam String studentCode) {
-		Student student = studentRepo.findByStudentCodeAndRootOrgId(studentCode, orgId);
+		StudentEntity student = studentRepo.findByStudentCodeAndRootOrgId(studentCode, orgId);
 		if (student == null) {
 			throw new StatusException("B-450121", "学生不存在");
 		}
-		StudentFaceInfo studentFaceInfo = studentFaceInfoRepo.findByStudentId(student.getId());
-		if (studentFaceInfo == null) {
-			studentFaceInfo = new StudentFaceInfo();
-			studentFaceInfo.setStudent(student);
-		}
+		StudentFaceEntity studentFaceInfo = studentFaceInfoRepo.findByStudentId(student.getId());
+//		if (studentFaceInfo == null) {
+//			studentFaceInfo = new StudentFaceInfo();
+//			studentFaceInfo.setStudent(student);
+//		}
 		return studentFaceInfo;
 	}
 

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

@@ -20,7 +20,7 @@ import cn.com.qmth.examcloud.core.basic.dao.OrgRepo;
 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.Org;
-import cn.com.qmth.examcloud.core.basic.dao.entity.Student;
+import cn.com.qmth.examcloud.core.basic.dao.entity.StudentEntity;
 import cn.com.qmth.examcloud.core.basic.service.bean.StudentInfo;
 import cn.com.qmth.examcloud.core.basic.service.impl.StudentServiceImpl;
 import io.swagger.annotations.ApiOperation;
@@ -73,7 +73,7 @@ public class StudentCloudServiceProvider extends ControllerSupport implements St
 		studentInfo.setPhotoPath(req.getPhotoPath());
 		studentInfo.setRemark(req.getRemark());
 
-		Student student = studentService.insertOrUpdateStudent(studentInfo);
+		StudentEntity student = studentService.insertOrUpdateStudent(studentInfo);
 
 		InsertOrUpdateStudentResp resp = new InsertOrUpdateStudentResp();
 		resp.setStudentId(student.getId());
@@ -109,7 +109,7 @@ public class StudentCloudServiceProvider extends ControllerSupport implements St
 			throw new StatusException("B-150002", "机构错误");
 		}
 
-		Student student = studentRepo.findByIdentityNumberAndRootOrgId(identityNumber, rootOrgId);
+		StudentEntity student = studentRepo.findByIdentityNumberAndRootOrgId(identityNumber, rootOrgId);
 
 		if (null == student) {
 			throw new StatusException("B-150005", "学生不存在");

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

@@ -15,8 +15,8 @@ import cn.com.qmth.examcloud.core.basic.api.request.SaveStudentFaceInfoReq;
 import cn.com.qmth.examcloud.core.basic.api.response.SaveStudentFaceInfoResp;
 import cn.com.qmth.examcloud.core.basic.dao.StudentFaceInfoRepo;
 import cn.com.qmth.examcloud.core.basic.dao.StudentRepo;
-import cn.com.qmth.examcloud.core.basic.dao.entity.Student;
-import cn.com.qmth.examcloud.core.basic.dao.entity.StudentFaceInfo;
+import cn.com.qmth.examcloud.core.basic.dao.entity.StudentEntity;
+import cn.com.qmth.examcloud.core.basic.dao.entity.StudentFaceEntity;
 import io.swagger.annotations.ApiOperation;
 
 /**
@@ -46,32 +46,32 @@ public class StudentFaceCloudServiceProvider extends ControllerSupport
 	@Override
 	public SaveStudentFaceInfoResp saveStudentFaceInfo(@RequestBody SaveStudentFaceInfoReq req) {
 
-		String photoPath = req.getPhotoPath();
-
-		if (StringUtils.isBlank(photoPath)) {
-			throw new StatusException("B-412001", "photoPath is blank");
-		}
-
-		Long studentId = req.getStudentId();
-		Student student = studentRepo.findOne(studentId);
-		student.setPhotoPath(req.getPhotoPath());
-		String operator = req.getOperator();
-
-		StudentFaceInfo studentFaceInfo = studentFaceInfoRepo.findByStudentId(student.getId());
-		if (studentFaceInfo == null) {
-			studentFaceInfo = new StudentFaceInfo();
-			studentFaceInfo.setStudent(student);
-			studentFaceInfo.setCreateUser(operator);
-		}
-
-		studentFaceInfo.setUpdateUser(operator);
-		studentFaceInfo.setFaceSetToken(req.getFaceSetToken());
-		studentFaceInfo.setFaceToken(req.getFaceToken());
-		StudentFaceInfo studentFaceInfoSave = studentFaceInfoRepo.save(studentFaceInfo);
-
-		SaveStudentFaceInfoResp resp = new SaveStudentFaceInfoResp();
-		resp.setId(studentFaceInfoSave.getId());
-		return resp;
+//		String photoPath = req.getPhotoPath();
+//
+//		if (StringUtils.isBlank(photoPath)) {
+//			throw new StatusException("B-412001", "photoPath is blank");
+//		}
+//
+//		Long studentId = req.getStudentId();
+//		StudentEntity student = studentRepo.findOne(studentId);
+//		student.setPhotoPath(req.getPhotoPath());
+//		String operator = req.getOperator();
+//
+//		StudentFaceInfo studentFaceInfo = studentFaceInfoRepo.findByStudentId(student.getId());
+//		if (studentFaceInfo == null) {
+//			studentFaceInfo = new StudentFaceInfo();
+//			studentFaceInfo.setStudent(student);
+//			studentFaceInfo.setCreateUser(operator);
+//		}
+//
+//		studentFaceInfo.setUpdateUser(operator);
+//		studentFaceInfo.setFaceSetToken(req.getFaceSetToken());
+//		studentFaceInfo.setFaceToken(req.getFaceToken());
+//		StudentFaceInfo studentFaceInfoSave = studentFaceInfoRepo.save(studentFaceInfo);
+//
+//		SaveStudentFaceInfoResp resp = new SaveStudentFaceInfoResp();
+//		resp.setId(studentFaceInfoSave.getId());
+		return null;
 	}
 
 }

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

@@ -6,14 +6,14 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.core.basic.dao.entity.StudentFaceInfo;
+import cn.com.qmth.examcloud.core.basic.dao.entity.StudentFaceEntity;
 
-public interface StudentFaceInfoRepo extends JpaRepository<StudentFaceInfo,Long>,QueryByExampleExecutor<StudentFaceInfo>{
+public interface StudentFaceInfoRepo extends JpaRepository<StudentFaceEntity,Long>,QueryByExampleExecutor<StudentFaceEntity>{
 
-	StudentFaceInfo findByStudentId(Long studentId);
+	StudentFaceEntity findByStudentId(Long studentId);
 
 	
-	List<StudentFaceInfo> findByFaceSetToken(String faceSetToken);
+	List<StudentFaceEntity> findByFaceSetToken(String faceSetToken);
 
 	@Query(nativeQuery = true,value = "select count(*) from ecs_core_student_face_info t where t.face_set_token = ?1")
 	Long countByFaceSetToken(String faceSet);

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

@@ -6,32 +6,32 @@ 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.Student;
+import cn.com.qmth.examcloud.core.basic.dao.entity.StudentEntity;
 
 /**
  * Created by songyue on 17/1/13.
  */
 public interface StudentRepo
 		extends
-			JpaRepository<Student, Long>,
-			QueryByExampleExecutor<Student>,
-			JpaSpecificationExecutor<Student> {
+			JpaRepository<StudentEntity, Long>,
+			QueryByExampleExecutor<StudentEntity>,
+			JpaSpecificationExecutor<StudentEntity> {
 
-	Student findByIdentityNumber(String identityNumber);
+	StudentEntity findByIdentityNumber(String identityNumber);
 
-	Student findByIdentityNumberAndStudentCodeAndRootOrgId(String identityNumber,
+	StudentEntity findByIdentityNumberAndStudentCodeAndRootOrgId(String identityNumber,
 			String studentCode, Long rootOrgId);
 
-	Student findByIdentityNumberAndRootOrgId(String identityNumber, Long rootOrgId);
+	StudentEntity findByIdentityNumberAndRootOrgId(String identityNumber, Long rootOrgId);
 
-	Student findByStudentCodeAndRootOrgId(String studentCode, Long rootOrgId);
+	StudentEntity findByStudentCodeAndRootOrgId(String studentCode, Long rootOrgId);
 
-	Student findBySecurityPhoneAndRootOrgId(String securityPhone, Long rootOrgId);
+	StudentEntity findBySecurityPhoneAndRootOrgId(String securityPhone, Long rootOrgId);
 
-	Student findBySecurityPhone(String securityPhone);
+	StudentEntity findBySecurityPhone(String securityPhone);
 
-	List<Student> findAllByIdentityNumberAndRootOrgId(String identityNumber, Long rootOrgId);
+	List<StudentEntity> findAllByIdentityNumberAndRootOrgId(String identityNumber, Long rootOrgId);
 
-	List<Student> findAllByStudentCodeAndRootOrgId(String studentCode, Long rootOrgId);
+	List<StudentEntity> findAllByStudentCodeAndRootOrgId(String studentCode, Long rootOrgId);
 
 }

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

@@ -10,13 +10,17 @@ import javax.persistence.Table;
 import cn.com.qmth.examcloud.commons.web.jpa.JpaEntity;
 
 /**
- * Created by songyue on 17/1/13.
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年8月22日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
  */
 @Entity
-@Table(name = "ecs_core_student", indexes = {
-		@Index(name = "IDX_B_STUDENT_001001", columnList = "rootOrgId,identityNumber", unique = true),
-		@Index(name = "IDX_B_STUDENT_001002", columnList = "rootOrgId,studentCode", unique = true)})
-public class Student extends JpaEntity {
+@Table(name = "EC_B_STUDENT", indexes = {
+		@Index(name = "IDX_B_S_002001", columnList = "rootOrgId,identityNumber", unique = true),
+		@Index(name = "IDX_B_S_002002", columnList = "rootOrgId,studentCode", unique = true)})
+public class StudentEntity extends JpaEntity {
 
 	private static final long serialVersionUID = 757531976286006550L;
 
@@ -42,6 +46,7 @@ public class Student extends JpaEntity {
 	@Column(nullable = false)
 	private Boolean enable;
 
+	@Column(nullable = false)
 	private Long orgId;
 
 	@Column(nullable = false)
@@ -58,10 +63,10 @@ public class Student extends JpaEntity {
 	@Column(unique = true, nullable = true)
 	private String securityPhone;
 
-	public Student() {
+	public StudentEntity() {
 	}
 
-	public Student(Long studentId) {
+	public StudentEntity(Long studentId) {
 		this.id = studentId;
 	}
 

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

@@ -0,0 +1,85 @@
+package cn.com.qmth.examcloud.core.basic.dao.entity;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import cn.com.qmth.examcloud.commons.web.jpa.JpaEntity;
+
+/**
+ * 学生人脸识别信息
+ *
+ * @author WANGWEI
+ * @date 2018年8月22日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+@Entity
+@Table(name = "EC_B_STUDENT_FACE")
+public class StudentFaceEntity extends JpaEntity {
+
+	private static final long serialVersionUID = -3722400898212427026L;
+
+	@Id
+	private Long studentId;
+
+	/**
+	 * face++参数
+	 */
+	private String faceToken;
+
+	/**
+	 * face++参数
+	 */
+	private String faceSetToken;
+
+	/**
+	 * 创建人
+	 */
+	private String creator;
+
+	/**
+	 * 更新人
+	 */
+	private String modifiedBy;
+
+	public Long getStudentId() {
+		return studentId;
+	}
+
+	public void setStudentId(Long studentId) {
+		this.studentId = studentId;
+	}
+
+	public String getFaceToken() {
+		return faceToken;
+	}
+
+	public void setFaceToken(String faceToken) {
+		this.faceToken = faceToken;
+	}
+
+	public String getFaceSetToken() {
+		return faceSetToken;
+	}
+
+	public void setFaceSetToken(String faceSetToken) {
+		this.faceSetToken = faceSetToken;
+	}
+
+	public String getCreator() {
+		return creator;
+	}
+
+	public void setCreator(String creator) {
+		this.creator = creator;
+	}
+
+	public String getModifiedBy() {
+		return modifiedBy;
+	}
+
+	public void setModifiedBy(String modifiedBy) {
+		this.modifiedBy = modifiedBy;
+	}
+
+}

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

@@ -1,86 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.dao.entity;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
-import cn.com.qmth.examcloud.commons.web.jpa.JpaEntity;
-
-@Entity
-@Table(name = "ecs_core_student_face_info")
-public class StudentFaceInfo extends JpaEntity {
-
-	private static final long serialVersionUID = -4192537584889662390L;
-
-	@Id
-	@GeneratedValue
-	private Long id;
-
-	@OneToOne
-	private Student student;
-
-	private String faceToken;
-
-	private String faceSetToken;
-
-	/**
-	 * 创建人
-	 */
-	private String createUser;
-
-	/**
-	 * 更新人
-	 */
-	private String updateUser;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Student getStudent() {
-		return student;
-	}
-
-	public void setStudent(Student student) {
-		this.student = student;
-	}
-
-	public String getFaceToken() {
-		return faceToken;
-	}
-
-	public void setFaceToken(String faceToken) {
-		this.faceToken = faceToken;
-	}
-
-	public String getFaceSetToken() {
-		return faceSetToken;
-	}
-
-	public void setFaceSetToken(String faceSetToken) {
-		this.faceSetToken = faceSetToken;
-	}
-
-	public String getCreateUser() {
-		return createUser;
-	}
-
-	public void setCreateUser(String createUser) {
-		this.createUser = createUser;
-	}
-
-	public String getUpdateUser() {
-		return updateUser;
-	}
-
-	public void setUpdateUser(String updateUser) {
-		this.updateUser = updateUser;
-	}
-
-}

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

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.service;
 
-import cn.com.qmth.examcloud.core.basic.dao.entity.Student;
+import cn.com.qmth.examcloud.core.basic.dao.entity.StudentEntity;
 import cn.com.qmth.examcloud.core.basic.service.bean.StudentInfo;
 
 /**
@@ -19,7 +19,7 @@ public interface StudentService {
 	 * @param studentInfo
 	 * @return
 	 */
-	Student insertOrUpdateStudent(StudentInfo studentInfo);
+	StudentEntity insertOrUpdateStudent(StudentInfo studentInfo);
 
 	/**
 	 * 查询

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

@@ -35,7 +35,7 @@ import cn.com.qmth.examcloud.core.basic.dao.UserRepo;
 import cn.com.qmth.examcloud.core.basic.dao.UserRoleRelationRepo;
 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.Student;
+import cn.com.qmth.examcloud.core.basic.dao.entity.StudentEntity;
 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;
@@ -85,7 +85,7 @@ public class AuthServiceImpl implements AuthService {
 		String accountValue = loginInfo.getAccountValue();
 		String password = loginInfo.getPassword();
 
-		Student student = null;
+		StudentEntity student = null;
 
 		if (AccountType.STUDENT_PHONE.name().equals(accountType)) {
 			student = studentRepo.findBySecurityPhone(accountValue);

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

@@ -6,8 +6,8 @@ import javax.transaction.Transactional;
 
 import cn.com.qmth.examcloud.core.basic.dao.StudentFaceInfoRepo;
 import cn.com.qmth.examcloud.core.basic.dao.StudentRepo;
-import cn.com.qmth.examcloud.core.basic.dao.entity.Student;
-import cn.com.qmth.examcloud.core.basic.dao.entity.StudentFaceInfo;
+import cn.com.qmth.examcloud.core.basic.dao.entity.StudentEntity;
+import cn.com.qmth.examcloud.core.basic.dao.entity.StudentFaceEntity;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -22,7 +22,7 @@ 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.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.StudentEntity;
 import cn.com.qmth.examcloud.core.basic.dao.enums.OrgType;
 import cn.com.qmth.examcloud.core.basic.service.StudentService;
 import cn.com.qmth.examcloud.core.basic.service.bean.StudentInfo;
@@ -55,11 +55,11 @@ public class StudentServiceImpl implements StudentService {
 	 * @param pageable
 	 * @return
 	 */
-	public Page<Student> getAllStudent(Student studentCriteria, Pageable pageable) {
+	public Page<StudentEntity> getAllStudent(StudentEntity studentCriteria, Pageable pageable) {
 		ExampleMatcher exampleMatcher = ExampleMatcher.matching().withMatcher("name", contains())
 				.withMatcher("studentCode", contains()).withMatcher("identityNumber", contains())
 				.withIgnoreNullValues();
-		Example<Student> studentExample = Example.of(studentCriteria, exampleMatcher);
+		Example<StudentEntity> studentExample = Example.of(studentCriteria, exampleMatcher);
 		return studentRepo.findAll(studentExample, pageable);
 	}
 
@@ -69,9 +69,9 @@ public class StudentServiceImpl implements StudentService {
 	 * @param studentCriteria
 	 * @return
 	 */
-	public List<Student> getAllStudent(Student studentCriteria) {
+	public List<StudentEntity> getAllStudent(StudentEntity studentCriteria) {
 		ExampleMatcher exampleMatcher = ExampleMatcher.matching();
-		Example<Student> studentExample = Example.of(studentCriteria, exampleMatcher);
+		Example<StudentEntity> studentExample = Example.of(studentCriteria, exampleMatcher);
 		return studentRepo.findAll(studentExample);
 	}
 
@@ -86,7 +86,7 @@ public class StudentServiceImpl implements StudentService {
 	 */
 	@Override
 	@Transactional
-	public Student insertOrUpdateStudent(StudentInfo studentInfo) {
+	public StudentEntity insertOrUpdateStudent(StudentInfo studentInfo) {
 		Long rootOrgId = studentInfo.getRootOrgId();
 		Org rootOrg = orgRepo.findOne(rootOrgId);
 
@@ -135,7 +135,7 @@ public class StudentServiceImpl implements StudentService {
 			studentCode = null;
 		}
 
-		List<Student> list = studentRepo.findAllByIdentityNumberAndRootOrgId(identityNumber,
+		List<StudentEntity> list = studentRepo.findAllByIdentityNumberAndRootOrgId(identityNumber,
 				rootOrgId);
 		if (1 < list.size()) {
 			throw new StatusException("B-160007", "已经存在不同考生的身份证号相同的数据. 身份证号: " + identityNumber);
@@ -147,7 +147,7 @@ public class StudentServiceImpl implements StudentService {
 			}
 		}
 
-		Student studentByIdentity = studentRepo.findByIdentityNumberAndRootOrgId(identityNumber,
+		StudentEntity studentByIdentity = studentRepo.findByIdentityNumberAndRootOrgId(identityNumber,
 				rootOrgId);
 
 		if (null != studentByIdentity) {
@@ -158,7 +158,7 @@ public class StudentServiceImpl implements StudentService {
 		}
 
 		if (StringUtils.isNotBlank(studentCode)) {
-			Student studentByCode = studentRepo.findByStudentCodeAndRootOrgId(studentCode,
+			StudentEntity studentByCode = studentRepo.findByStudentCodeAndRootOrgId(studentCode,
 					rootOrgId);
 			if (null != studentByCode) {
 				String curIdentityNumber = studentByCode.getIdentityNumber();
@@ -168,14 +168,14 @@ public class StudentServiceImpl implements StudentService {
 			}
 		}
 
-		Student student = null;
+		StudentEntity student = null;
 		if (null != studentByIdentity) {
 			student = studentByIdentity;
 			if (null == student.getEnable()) {
 				student.setEnable(true);
 			}
 		} else {
-			student = new Student();
+			student = new StudentEntity();
 			if (StringUtils.isNotEmpty(identityNumber)
 					&& identityNumber.matches("[0-9a-zA-Z]{6,}")) {
 				student.setPassword(
@@ -207,7 +207,7 @@ public class StudentServiceImpl implements StudentService {
 		if (null != studentInfo.getEnable()) {
 			student.setEnable(studentInfo.getEnable());
 		}
-		Student saved = studentRepo.saveAndFlush(student);
+		StudentEntity saved = studentRepo.saveAndFlush(student);
 
 		return saved;
 	}
@@ -229,7 +229,7 @@ public class StudentServiceImpl implements StudentService {
 			throw new StatusException("B-160250", "rootOrgId is null");
 		}
 
-		Student s = null;
+		StudentEntity s = null;
 		int count = 0;
 		if (null != studentId) {
 			count++;