..

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

@@ -41,9 +41,7 @@ import io.swagger.annotations.ApiOperation;
 @Transactional
 @RestController
 @RequestMapping("${$rmp.cloud.basic}" + "studentFace")
-public class FaceCloudServiceProvider extends ControllerSupport
-		implements
-			FaceCloudService {
+public class FaceCloudServiceProvider extends ControllerSupport implements FaceCloudService {
 
 	private static final long serialVersionUID = 8674317301051207328L;
 
@@ -63,6 +61,7 @@ public class FaceCloudServiceProvider extends ControllerSupport
 	@PostMapping("saveStudentFace")
 	@Override
 	public SaveStudentFaceResp saveStudentFace(@RequestBody SaveStudentFaceReq req) {
+		trim(req);
 		StudentFaceInfo info = new StudentFaceInfo();
 		info.setFacesetToken(req.getFacesetToken());
 		info.setFaceToken(req.getFaceToken());
@@ -70,6 +69,7 @@ public class FaceCloudServiceProvider extends ControllerSupport
 		info.setPhotoName(req.getPhotoName());
 		info.setRootOrgId(req.getRootOrgId());
 		info.setStudentId(req.getStudentId());
+		info.setFaceCount(req.getFaceCount());
 
 		StudentFaceEntity saved = studentFaceService.saveStudentFace(info);
 		SaveStudentFaceResp resp = new SaveStudentFaceResp();

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

@@ -28,7 +28,7 @@ public class FacesetEntity extends JpaEntity {
 	@Column(nullable = false, unique = true)
 	private String facesetToken;
 
-	private int faceCount;
+	private Long faceCount;
 
 	private String outerId;
 
@@ -52,11 +52,11 @@ public class FacesetEntity extends JpaEntity {
 		this.facesetToken = facesetToken;
 	}
 
-	public int getFaceCount() {
+	public Long getFaceCount() {
 		return faceCount;
 	}
 
-	public void setFaceCount(int faceCount) {
+	public void setFaceCount(Long faceCount) {
 		this.faceCount = faceCount;
 	}
 

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

@@ -25,6 +25,8 @@ public class StudentFaceInfo implements JsonSerializable {
 
 	private String operator;
 
+	private Long faceCount;
+
 	public Long getRootOrgId() {
 		return rootOrgId;
 	}
@@ -73,4 +75,12 @@ public class StudentFaceInfo implements JsonSerializable {
 		this.operator = operator;
 	}
 
+	public Long getFaceCount() {
+		return faceCount;
+	}
+
+	public void setFaceCount(Long faceCount) {
+		this.faceCount = faceCount;
+	}
+
 }

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

@@ -55,6 +55,7 @@ public class FaceServiceImpl implements FaceService {
 		String photoName = info.getPhotoName();
 		Long rootOrgId = info.getRootOrgId();
 		Long studentId = info.getStudentId();
+		Long faceCount = info.getFaceCount();
 
 		if (null == studentId) {
 			throw new StatusException("B-680001", "studentId is null");
@@ -75,6 +76,10 @@ public class FaceServiceImpl implements FaceService {
 			throw new StatusException("B-680006", "photoName is null");
 		}
 
+		if (StringUtils.isBlank(photoName)) {
+			throw new StatusException("B-680006", "photoName is null");
+		}
+
 		StudentEntity studentEntity = studentRepo.findOne(studentId);
 
 		if (null == studentEntity) {
@@ -106,6 +111,11 @@ public class FaceServiceImpl implements FaceService {
 		studentFaceEntity.setFaceToken(faceToken);
 		studentFaceEntity.setModifiedBy(operator);
 
+		if (facesetEntity.getFaceCount() < faceCount) {
+			facesetEntity.setFaceCount(faceCount);
+		}
+
+		facesetRepo.save(facesetEntity);
 		studentRepo.save(studentEntity);
 		StudentFaceEntity saved = studentFaceRepo.save(studentFaceEntity);