活体验证错误去掉次数

themis-mq/src/main/java/com/qmth/themis/mq/service/impl/MqLogicServiceImpl.java

@@ -587,57 +587,57 @@ public class MqLogicServiceImpl implements MqLogicService {
                 if (Objects.equals(VerifyExceptionEnum.NONE, warningEnum)) {//无异常，往考生日志表里插一条
                     livenessVerifyHistoryService.save(id, recordId, type, actions, retry, startTime, finishTime, exception, null);
                 } else {
-                    if (Objects.equals(VerifyExceptionEnum.FACE_COUNT_ERROR, warningEnum)) {//人脸数量异常
+                    if (Objects.equals(VerifyExceptionEnum.FACE_COMPARE_ERROR, warningEnum) || Objects.equals(VerifyExceptionEnum.FACE_COUNT_ERROR, warningEnum)) {//人脸数量异常
                         Integer faceCount = Integer.parseInt(String.valueOf(jsonObject.get("faceCount")));
                         WarningDto warningDto = new WarningDto(warningEnum, faceCount, null, recordId, String.valueOf(jsonObject.get("photoUrl")));
-                        if (faceCount > 1) {//多张人脸
-                            String multipleFaceRandom = ExamRecordCacheUtil.getMultipleFaceCountErrorRandom(recordId);
-                            if (Objects.isNull(multipleFaceRandom)) {
-                                multipleFaceRandom = SystemConstant.getNanoId();
-                                ExamRecordCacheUtil.setMultipleFaceCountErrorRandom(recordId, multipleFaceRandom);
-                            }
-                            ExamRecordCacheUtil.setMultipleFaceCountErrorNum(recordId, new AtomicInteger(ExamRecordCacheUtil.getMultipleFaceCountErrorNum(recordId).incrementAndGet()));
-                            warningDto.setRandom(multipleFaceRandom);
-                            livenessVerifyHistoryService.save(id, recordId, type, actions, retry, startTime, finishTime, exception, multipleFaceRandom);
-                            Integer count = ExamRecordCacheUtil.getMultipleFaceCountErrorNum(recordId).get();
-                            if (count > teConfig.getMultipleFaceCountError()) {
-                                ExamRecordCacheUtil.setMultipleFaceCountErrorRandom(recordId, SystemConstant.getNanoId());
-                                ExamRecordCacheUtil.setMultipleFaceCountErrorNum(recordId, new AtomicInteger(0));
-                                warningService.faceCountError(warningDto);
-                            }
-                        } else if (faceCount <= 0) {
-                            String noFaceRandom = ExamRecordCacheUtil.getNoFaceCountErrorRandom(recordId);
-                            if (Objects.isNull(noFaceRandom)) {
-                                noFaceRandom = SystemConstant.getNanoId();
-                                ExamRecordCacheUtil.setNoFaceCountErrorRandom(recordId, noFaceRandom);
-                            }
-                            ExamRecordCacheUtil.setNoFaceCountErrorNum(recordId, new AtomicInteger(ExamRecordCacheUtil.getMultipleFaceCountErrorNum(recordId).incrementAndGet()));
-                            warningDto.setRandom(noFaceRandom);
-                            livenessVerifyHistoryService.save(id, recordId, type, actions, retry, startTime, finishTime, exception, noFaceRandom);
-                            Integer count = ExamRecordCacheUtil.getNoFaceCountErrorNum(recordId).get();
-                            if (count > teConfig.getNoFaceCountError()) {
-                                ExamRecordCacheUtil.setNoFaceCountErrorRandom(recordId, SystemConstant.getNanoId());
-                                ExamRecordCacheUtil.setNoFaceCountErrorNum(recordId, new AtomicInteger(0));
-                                warningService.faceCountError(warningDto);
-                            }
-                        }
-                    } else if (Objects.equals(VerifyExceptionEnum.FACE_COMPARE_ERROR, warningEnum)) {//人脸比对异常
-                        WarningDto warningDto = new WarningDto(warningEnum, null, null, recordId, String.valueOf(jsonObject.get("photoUrl")));
-                        String faceCompareErrorRandom = ExamRecordCacheUtil.getFaceCompareErrorRandom(recordId);
-                        if (Objects.isNull(faceCompareErrorRandom)) {
-                            faceCompareErrorRandom = SystemConstant.getNanoId();
-                            ExamRecordCacheUtil.setFaceCompareErrorRandom(recordId, faceCompareErrorRandom);
-                        }
-                        ExamRecordCacheUtil.setFaceCompareErrorNum(recordId, new AtomicInteger(ExamRecordCacheUtil.getFaceCompareErrorNum(recordId).incrementAndGet()));
-                        warningDto.setRandom(faceCompareErrorRandom);
-                        livenessVerifyHistoryService.save(id, recordId, type, actions, retry, startTime, finishTime, exception, faceCompareErrorRandom);
-                        Integer count = ExamRecordCacheUtil.getFaceCompareErrorNum(recordId).get();
-                        if (count > teConfig.getTotalFaceCompareErrorCount()) {
-                            ExamRecordCacheUtil.setFaceCompareErrorRandom(recordId, SystemConstant.getNanoId());
-                            ExamRecordCacheUtil.setFaceCompareErrorNum(recordId, new AtomicInteger(0));
-                            warningService.faceCompareError(warningDto);
-                        }
-                    } else if (Objects.equals(VerifyExceptionEnum.LIVENESS_ACTION_ERROR, warningEnum)) {//活检动作错误
+//                        if (faceCount > 1) {//多张人脸
+//                            String multipleFaceRandom = ExamRecordCacheUtil.getMultipleFaceCountErrorRandom(recordId);
+//                            if (Objects.isNull(multipleFaceRandom)) {
+//                                multipleFaceRandom = SystemConstant.getNanoId();
+//                                ExamRecordCacheUtil.setMultipleFaceCountErrorRandom(recordId, multipleFaceRandom);
+//                            }
+//                            ExamRecordCacheUtil.setMultipleFaceCountErrorNum(recordId, new AtomicInteger(ExamRecordCacheUtil.getMultipleFaceCountErrorNum(recordId).incrementAndGet()));
+//                            warningDto.setRandom(multipleFaceRandom);
+//                            livenessVerifyHistoryService.save(id, recordId, type, actions, retry, startTime, finishTime, exception, null);
+//                            Integer count = ExamRecordCacheUtil.getMultipleFaceCountErrorNum(recordId).get();
+//                            if (count > teConfig.getMultipleFaceCountError()) {
+//                                ExamRecordCacheUtil.setMultipleFaceCountErrorRandom(recordId, SystemConstant.getNanoId());
+//                                ExamRecordCacheUtil.setMultipleFaceCountErrorNum(recordId, new AtomicInteger(0));
+//                            warningService.livenessActionError(warningDto);
+//                            }
+//                        } else if (faceCount <= 0) {
+//                            String noFaceRandom = ExamRecordCacheUtil.getNoFaceCountErrorRandom(recordId);
+//                            if (Objects.isNull(noFaceRandom)) {
+//                                noFaceRandom = SystemConstant.getNanoId();
+//                                ExamRecordCacheUtil.setNoFaceCountErrorRandom(recordId, noFaceRandom);
+//                            }
+//                            ExamRecordCacheUtil.setNoFaceCountErrorNum(recordId, new AtomicInteger(ExamRecordCacheUtil.getMultipleFaceCountErrorNum(recordId).incrementAndGet()));
+//                            warningDto.setRandom(noFaceRandom);
+                        livenessVerifyHistoryService.save(id, recordId, type, actions, retry, startTime, finishTime, exception, null);
+//                            Integer count = ExamRecordCacheUtil.getNoFaceCountErrorNum(recordId).get();
+//                            if (count > teConfig.getNoFaceCountError()) {
+//                                ExamRecordCacheUtil.setNoFaceCountErrorRandom(recordId, SystemConstant.getNanoId());
+//                                ExamRecordCacheUtil.setNoFaceCountErrorNum(recordId, new AtomicInteger(0));
+                        warningService.livenessActionError(warningDto);
+//                            }
+//                        }
+//                    } else if (Objects.equals(VerifyExceptionEnum.FACE_COMPARE_ERROR, warningEnum)) {//人脸比对异常
+//                        WarningDto warningDto = new WarningDto(warningEnum, null, null, recordId, String.valueOf(jsonObject.get("photoUrl")));
+//                        String faceCompareErrorRandom = ExamRecordCacheUtil.getFaceCompareErrorRandom(recordId);
+//                        if (Objects.isNull(faceCompareErrorRandom)) {
+//                            faceCompareErrorRandom = SystemConstant.getNanoId();
+//                            ExamRecordCacheUtil.setFaceCompareErrorRandom(recordId, faceCompareErrorRandom);
+//                        }
+//                        ExamRecordCacheUtil.setFaceCompareErrorNum(recordId, new AtomicInteger(ExamRecordCacheUtil.getFaceCompareErrorNum(recordId).incrementAndGet()));
+//                        warningDto.setRandom(faceCompareErrorRandom);
+//                        livenessVerifyHistoryService.save(id, recordId, type, actions, retry, startTime, finishTime, exception, null);
+//                        Integer count = ExamRecordCacheUtil.getFaceCompareErrorNum(recordId).get();
+//                        if (count > teConfig.getTotalFaceCompareErrorCount()) {
+//                            ExamRecordCacheUtil.setFaceCompareErrorRandom(recordId, SystemConstant.getNanoId());
+//                            ExamRecordCacheUtil.setFaceCompareErrorNum(recordId, new AtomicInteger(0));
+//                        warningService.livenessActionError(warningDto);
+//                        }
+                    } else if (Objects.equals(VerifyExceptionEnum.FACE_COMPARE_ERROR, warningEnum) || Objects.equals(VerifyExceptionEnum.LIVENESS_ACTION_ERROR, warningEnum)) {//活检动作错误
                         WarningDto warningDto = new WarningDto(warningEnum, null, null, recordId, String.valueOf(jsonObject.get("photoUrl")));
                         livenessVerifyHistoryService.save(id, recordId, type, actions, retry, startTime, finishTime, exception, null);
                         warningService.livenessActionError(warningDto);