bug fix

themis-business/src/main/java/com/qmth/themis/business/dto/response/TEExamActivityDto.java

@@ -220,6 +220,10 @@ public class TEExamActivityDto implements Serializable {
         }
         this.cameraPhotoUpload = cameraPhotoUpload;
         this.entryAuthenticationPolicy = entryAuthenticationPolicy;
+        this.inProcessFaceVerify = inProcessFaceVerify;
+        this.inProcessFaceStrangerIgnore = inProcessFaceStrangerIgnore;
+        this.inProcessLivenessVerify = inProcessLivenessVerify;
+        this.inProcessRealnessVerify = inProcessRealnessVerify;
         if (Objects.nonNull(monitorVideoSource) && !Objects.equals(monitorVideoSource.trim().replaceAll(" ", ""), "")) {
             List<String> videoSources = Arrays.asList(monitorVideoSource.trim().toUpperCase().split(","));
             List<MonitorStreamDto> monitorStreamDtoList = new ArrayList<>();
@@ -232,7 +236,9 @@ public class TEExamActivityDto implements Serializable {
                 this.monitorAudioEnable = true;
             }
             //加入hardwareTest逻辑
-            if (monitorVideoSource.toUpperCase().contains(MonitorVideoSourceEnum.CLIENT_CAMERA.name()) || (Objects.nonNull(this.getEntryAuthenticationPolicy()) && (Objects.equals(this.getEntryAuthenticationPolicy(), EntryAuthenticationPolicyEnum.LIVENESS_VERIFY.name()) || Objects.equals(this.getEntryAuthenticationPolicy(), EntryAuthenticationPolicyEnum.FACE_VERIFY_FORCE.name()))) || (Objects.nonNull(this.getCameraPhotoUpload()) && this.getCameraPhotoUpload() == 1)) {
+            if (monitorVideoSource.toUpperCase().contains(MonitorVideoSourceEnum.CLIENT_CAMERA.name()) || (Objects.nonNull(this.getEntryAuthenticationPolicy()) && (Objects.equals(this.getEntryAuthenticationPolicy(), EntryAuthenticationPolicyEnum.LIVENESS_VERIFY.name()) || Objects.equals(this.getEntryAuthenticationPolicy(), EntryAuthenticationPolicyEnum.FACE_VERIFY_FORCE.name()))) || (Objects.nonNull(this.getCameraPhotoUpload()) && this.getCameraPhotoUpload() == 1)
+                    || Objects.nonNull(this.getInProcessFaceVerify()) && this.getInProcessFaceVerify() == 1
+                    || Objects.nonNull(this.getInProcessLivenessVerify()) && this.getInProcessLivenessVerify() == 1) {
                 if (Objects.isNull(this.hardwareTest)) {
                     this.hardwareTest = new ArrayList<>();
                 }
@@ -247,7 +253,9 @@ public class TEExamActivityDto implements Serializable {
                         EntryAuthenticationPolicyEnum.LIVENESS_VERIFY.name()) || Objects
                         .equals(this.getEntryAuthenticationPolicy(),
                                 EntryAuthenticationPolicyEnum.FACE_VERIFY_FORCE.name()))) || (
-                Objects.nonNull(this.getCameraPhotoUpload()) && this.getCameraPhotoUpload() == 1)) {
+                Objects.nonNull(this.getCameraPhotoUpload()) && this.getCameraPhotoUpload() == 1)
+                || Objects.nonNull(this.getInProcessFaceVerify()) && this.getInProcessFaceVerify() == 1
+                || Objects.nonNull(this.getInProcessLivenessVerify()) && this.getInProcessLivenessVerify() == 1) {
             if (Objects.isNull(this.hardwareTest)) {
                 this.hardwareTest = new ArrayList<>();
             }
@@ -264,10 +272,6 @@ public class TEExamActivityDto implements Serializable {
         this.activityMaxDurationSeconds = maxDurationSeconds;
         this.examCount = ec.getExamCount();
         this.forceFinish = forceFinish;
-        this.inProcessFaceVerify = inProcessFaceVerify;
-        this.inProcessFaceStrangerIgnore = inProcessFaceStrangerIgnore;
-        this.inProcessLivenessVerify = inProcessLivenessVerify;
-        this.inProcessRealnessVerify = inProcessRealnessVerify;
         if (Objects.nonNull(inProcessLivenessFixedRange)) {
             String[] longs = inProcessLivenessFixedRange.trim().split(",");
             List inProcessLivenessFixedRangeList = new ArrayList();

themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamActivityServiceImpl.java

@@ -201,7 +201,9 @@ public class TEExamActivityServiceImpl extends ServiceImpl<TEExamActivityMapper,
                             EntryAuthenticationPolicyEnum.LIVENESS_VERIFY.name()) || Objects
                             .equals(teExamActivityDto.getEntryAuthenticationPolicy(),
                                     EntryAuthenticationPolicyEnum.FACE_VERIFY_FORCE.name()))) || (
-                    Objects.nonNull(teExamActivityDto.getCameraPhotoUpload()) && teExamActivityDto.getCameraPhotoUpload() == 1)) {
+                    Objects.nonNull(teExamActivityDto.getCameraPhotoUpload()) && teExamActivityDto.getCameraPhotoUpload() == 1)
+                    || Objects.nonNull(teExamActivityDto.getInProcessFaceVerify()) && teExamActivityDto.getInProcessFaceVerify() == 1
+                    || Objects.nonNull(teExamActivityDto.getInProcessLivenessVerify()) && teExamActivityDto.getInProcessLivenessVerify() == 1) {
                 List<String> hardwareTest = teExamActivityDto.getHardwareTest();
                 if (Objects.isNull(hardwareTest)) {
                     hardwareTest = new ArrayList<>();
@@ -221,7 +223,9 @@ public class TEExamActivityServiceImpl extends ServiceImpl<TEExamActivityMapper,
                         EntryAuthenticationPolicyEnum.LIVENESS_VERIFY.name()) || Objects
                         .equals(teExamActivityDto.getEntryAuthenticationPolicy(),
                                 EntryAuthenticationPolicyEnum.FACE_VERIFY_FORCE.name()))) || (
-                Objects.nonNull(teExamActivityDto.getCameraPhotoUpload()) && teExamActivityDto.getCameraPhotoUpload() == 1)) {
+                Objects.nonNull(teExamActivityDto.getCameraPhotoUpload()) && teExamActivityDto.getCameraPhotoUpload() == 1)
+                || Objects.nonNull(teExamActivityDto.getInProcessFaceVerify()) && teExamActivityDto.getInProcessFaceVerify() == 1
+                || Objects.nonNull(teExamActivityDto.getInProcessLivenessVerify()) && teExamActivityDto.getInProcessLivenessVerify() == 1) {
             List<String> hardwareTest = teExamActivityDto.getHardwareTest();
             if (Objects.isNull(hardwareTest)) {
                 hardwareTest = new ArrayList<>();