bug 修复

examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/bean/CalculateFaceCheckResultInfo.java

@@ -60,20 +60,20 @@ public class CalculateFaceCheckResultInfo implements JsonSerializable {
 		isNoPhotoAndIllegality = noPhotoAndIllegality;
 	}
 
-	public Boolean getIllegality() {
+	public Boolean getIsIllegality() {
 		return isIllegality;
 	}
 
-	public void setIllegality(Boolean illegality) {
-		isIllegality = illegality;
+	public void setIsIllegality(Boolean isIllegality) {
+		this.isIllegality = isIllegality;
 	}
 
-	public Boolean getWarn() {
+	public Boolean getIsWarn() {
 		return isWarn;
 	}
 
-	public void setWarn(Boolean warn) {
-		isWarn = warn;
+	public void setIsWarn(Boolean isWarn) {
+		this.isWarn = isWarn;
 	}
 
 	public Integer getFaceSuccessCount() {

examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/impl/ExamCaptureServiceImpl.java

@@ -460,7 +460,7 @@ public class ExamCaptureServiceImpl implements ExamCaptureService {
 
         //未开启人脸检测,直接认为正常数据
         if (!FaceBiopsyHelper.isFaceEnable(rootOrgId, examId, studentId)) {
-            resultInfo.setWarn(false);
+            resultInfo.setIsWarn(false);
             return resultInfo;
         }
 
@@ -468,8 +468,8 @@ public class ExamCaptureServiceImpl implements ExamCaptureService {
 
         //无照片违纪
         if (examCaptureList == null || examCaptureList.size() == 0) {
-            resultInfo.setWarn(true);//有异常
-            resultInfo.setIllegality(true);//违纪
+            resultInfo.setIsWarn(true);//有异常
+            resultInfo.setIsIllegality(true);//违纪
             resultInfo.setNoPhotoAndIllegality(true);//无照片违纪
             return resultInfo;
         }
@@ -526,7 +526,7 @@ public class ExamCaptureServiceImpl implements ExamCaptureService {
 
         //陌生人个数>0
         if (resultInfo.getFaceStrangerCount() > 0) {
-            resultInfo.setWarn(true);
+            resultInfo.setIsWarn(true);
             return resultInfo;
         }
 
@@ -549,11 +549,11 @@ public class ExamCaptureServiceImpl implements ExamCaptureService {
         double livenessThreshold = Double.parseDouble(liveWarnThresholdStr);
 
         if (warnThreshold == 0d && livenessThreshold > 0d) {
-            resultInfo.setWarn(livenessSuccessPercent < livenessThreshold);
+            resultInfo.setIsWarn(livenessSuccessPercent < livenessThreshold);
         } else if (warnThreshold > 0d && livenessThreshold == 0d) {
-            resultInfo.setWarn(succPercent < warnThreshold);
+            resultInfo.setIsWarn(succPercent < warnThreshold);
         } else if (warnThreshold > 0d && livenessThreshold > 0d) {
-            resultInfo.setWarn(succPercent < warnThreshold || livenessSuccessPercent < livenessThreshold);
+            resultInfo.setIsWarn(succPercent < warnThreshold || livenessSuccessPercent < livenessThreshold);
         }
 
         return resultInfo;

examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/impl/ExamRecordDataServiceImpl.java

@@ -135,19 +135,19 @@ public class ExamRecordDataServiceImpl implements ExamRecordDataService {
                 examRecordData.setIsIllegality(true);//活检失败，直接判定为违纪
             } else {
                 //人脸检测或活栓中有一个判断为违纪，则为违纪
-                boolean bi = (null != faceCheckResult.getIllegality() && faceCheckResult.getIllegality()) ||
-                        (null != calcFaceBiopsyResultResp.getIllegality() && calcFaceBiopsyResultResp.getIllegality());
+                boolean bi = (null != faceCheckResult.getIsIllegality() && faceCheckResult.getIsIllegality()) ||
+                        (null != calcFaceBiopsyResultResp.getIsIllegality() && calcFaceBiopsyResultResp.getIsIllegality());
                 examRecordData.setIsIllegality(bi);
             }
 
             //判断数据是否异常
-            boolean bw = (null != faceCheckResult.getWarn() && faceCheckResult.getWarn()) ||
-                    (null != calcFaceBiopsyResultResp.getWarn() && calcFaceBiopsyResultResp.getWarn());
+            boolean bw = (null != faceCheckResult.getIsWarn() && faceCheckResult.getIsWarn()) ||
+                    (null != calcFaceBiopsyResultResp.getIsWarn() && calcFaceBiopsyResultResp.getIsWarn());
             examRecordData.setIsWarn(bw);//人脸检测或活检中有一个判断为异常，则为异常数据
 
             // 违纪自动审核
             Boolean isAudit = this.calcAutoAuditResult(faceCheckResult.getNoPhotoAndIllegality(),
-                    calcFaceBiopsyResultResp.getFaceVerifyResult(), calcFaceBiopsyResultResp.getIllegality());
+                    calcFaceBiopsyResultResp.getFaceVerifyResult(), calcFaceBiopsyResultResp.getIsIllegality());
             if (null != isAudit) {
                 examRecordData.setIsAudit(isAudit);
             }