...

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

@@ -1,41 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.api.controller;
-
-import io.swagger.annotations.ApiOperation;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import cn.com.qmth.examcloud.core.basic.service.impl.FaceSetTokenService;
-
-/**
- * @author chenken
- * @date 2018年1月23日 上午11:21:39
- * @company QMTH
- * @description FaceSetTokenApi.java
- */
-@Transactional
-@RestController
-@RequestMapping("${$rmp.ctr.basic}/faceSet")
-public class FaceSetTokenController {
-
-	@Autowired
-	private FaceSetTokenService faceSetTokenService;
-
-	@ApiOperation(value = "查询可用的faceSet", notes = "查询可用的faceSet")
-	@GetMapping("/enableFaceSet")
-	public ResponseEntity<Object> getEnableFaceSet() {
-		try {
-			String faceSet = faceSetTokenService.getEnableFaceSet();
-			return new ResponseEntity<Object>(faceSet, HttpStatus.OK);
-		} catch (Exception e) {
-			e.printStackTrace();
-			return new ResponseEntity<Object>(HttpStatus.INTERNAL_SERVER_ERROR);
-		}
-	}
-
-}

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

@@ -1,102 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.api.controller;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-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.exception.StatusException;
-import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
-import cn.com.qmth.examcloud.core.basic.api.StudentFaceCloudService;
-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.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;
-
-/**
- * 学生照片API
- */
-@Transactional
-@RestController
-@RequestMapping("${$rmp.ctr.basic}/studentFaceInfo")
-public class StudentFaceInfoController extends ControllerSupport {
-
-	@Autowired
-	StudentFaceInfoRepo studentFaceInfoRepo;
-
-	@Autowired
-	StudentFaceInfoService studentFaceInfoService;
-
-	@Autowired
-	StudentRepo studentRepo;
-
-	@Autowired
-	StudentFaceCloudService studentFaceCloudService;
-
-	@ApiOperation(value = "按身份证查询", notes = "查询")
-	@GetMapping("/identityNumber")
-	public StudentFaceEntity findByIdentityNumber(@RequestParam String identityNumber,
-			@RequestParam Long orgId) {
-		StudentEntity student = studentRepo.findByIdentityNumberAndRootOrgId(identityNumber, orgId);
-		if (student == null) {
-			throw new StatusException("B-520110", "该学生不存在");
-		}
-		StudentFaceEntity studentFaceInfo = studentFaceInfoRepo.findByStudentId(student.getId());
-//		if (studentFaceInfo == null) {
-//			studentFaceInfo = new StudentFaceInfo();
-//			studentFaceInfo.setStudent(student);
-//		}
-		return studentFaceInfo;
-	}
-
-	@ApiOperation(value = "按学号查询", notes = "查询")
-	@GetMapping("/studentCode")
-	public StudentFaceEntity findByStudentCode(@RequestParam Long orgId,
-			@RequestParam String studentCode) {
-		StudentEntity student = studentRepo.findByStudentCodeAndRootOrgId(studentCode, orgId);
-		if (student == null) {
-			throw new StatusException("B-450121", "学生不存在");
-		}
-		StudentFaceEntity studentFaceInfo = studentFaceInfoRepo.findByStudentId(student.getId());
-//		if (studentFaceInfo == null) {
-//			studentFaceInfo = new StudentFaceInfo();
-//			studentFaceInfo.setStudent(student);
-//		}
-		return studentFaceInfo;
-	}
-
-	@ApiOperation(value = "按ID查询", notes = "ID查询")
-	@GetMapping("/{id}")
-	public ResponseEntity getById(@PathVariable Long id) {
-		return new ResponseEntity(studentFaceInfoRepo.findOne(id), HttpStatus.OK);
-	}
-
-	@ApiOperation(value = "新增学生照片信息", notes = "新增")
-	@PostMapping
-	public Long add(@RequestBody SaveStudentFaceInfoReq req) {
-		req.setOperator(getAccessUser().getDisplayName());
-		SaveStudentFaceInfoResp resp = studentFaceCloudService.saveStudentFaceInfo(req);
-		return resp.getId();
-	}
-
-	@ApiOperation(value = "更新学生照片信息", notes = "更新")
-	@PutMapping
-	public Long update(@RequestBody SaveStudentFaceInfoReq req) {
-		req.setOperator(getAccessUser().getDisplayName());
-		SaveStudentFaceInfoResp resp = studentFaceCloudService.saveStudentFaceInfo(req);
-		return resp.getId();
-	}
-
-}

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

@@ -13,7 +13,7 @@ import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.basic.api.StudentFaceCloudService;
 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.StudentFaceRepo;
 import cn.com.qmth.examcloud.core.basic.dao.StudentRepo;
 import cn.com.qmth.examcloud.core.basic.dao.entity.StudentEntity;
 import cn.com.qmth.examcloud.core.basic.dao.entity.StudentFaceEntity;
@@ -36,7 +36,7 @@ public class StudentFaceCloudServiceProvider extends ControllerSupport
 	private static final long serialVersionUID = 8674317301051207328L;
 
 	@Autowired
-	StudentFaceInfoRepo studentFaceInfoRepo;
+	StudentFaceRepo studentFaceInfoRepo;
 
 	@Autowired
 	StudentRepo studentRepo;

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

@@ -1,20 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.dao;
-
-import java.util.List;
-
-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.StudentFaceEntity;
-
-public interface StudentFaceInfoRepo extends JpaRepository<StudentFaceEntity,Long>,QueryByExampleExecutor<StudentFaceEntity>{
-
-	StudentFaceEntity findByStudentId(Long studentId);
-
-	
-	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/StudentFaceRepo.java

@@ -0,0 +1,15 @@
+package cn.com.qmth.examcloud.core.basic.dao;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.repository.query.QueryByExampleExecutor;
+
+import cn.com.qmth.examcloud.core.basic.dao.entity.StudentFaceEntity;
+
+public interface StudentFaceRepo
+		extends
+			JpaRepository<StudentFaceEntity, Long>,
+			QueryByExampleExecutor<StudentFaceEntity> {
+
+	StudentFaceEntity findByStudentId(Long studentId);
+
+}

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

@@ -1,42 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.service.impl;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import cn.com.qmth.examcloud.core.basic.dao.FaceSetTokenRepo;
-import cn.com.qmth.examcloud.core.basic.dao.entity.FaceSetToken;
-
-/**
- * @author  	chenken
- * @date    	2018年1月23日 上午11:05:49
- * @company 	QMTH
- * @description FaceSetTokenService.java
- */
-@Service("faceSetTokenService")
-public class FaceSetTokenService {
-	
-	@Autowired
-	private FaceSetTokenRepo faceSetTokenRepo;
-	
-	@Autowired
-	private StudentFaceInfoService studentFaceInfoService;
-	
-	/**
-	 * 获取可用的faceSet
-	 * @return
-	 */
-	public String getEnableFaceSet(){
-		List<FaceSetToken> faceSetList = faceSetTokenRepo.findAll();
-		for(FaceSetToken faceSetToken:faceSetList){
-			String faceSet = faceSetToken.getFaceSetToken();
-			if(studentFaceInfoService.judgeFaceSetIsAvailable(faceSet)){
-				return faceSet;
-			}
-		}
-		return null;
-	}
-	
-}
-

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

@@ -1,39 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.service.impl;
-
-import java.util.Date;
-
-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.StudentEntity;
-import cn.com.qmth.examcloud.core.basic.dao.entity.StudentFaceEntity;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class StudentFaceInfoService {
-
-	@Autowired
-	StudentFaceInfoRepo studentFaceInfoRepo;
-
-	@Autowired
-	StudentRepo studentRepo;
-
-	/**
-	 * 判断faceSet是否可用 faceSet在ecs_core_student_face_info表中的记录数不允许超过8000
-	 * 
-	 * @param faceSet
-	 * @return
-	 */
-	public boolean judgeFaceSetIsAvailable(String faceSet) {
-		if (StringUtils.isBlank(faceSet)) {
-			return false;
-		}
-		Long size = studentFaceInfoRepo.countByFaceSetToken(faceSet);
-		return size <= 8000 ? true : false;
-	}
-
-}