考务entity修改

themis-business/src/main/java/com/qmth/themis/business/entity/TOeExamAnswer.java

@@ -51,9 +51,13 @@ public class TOeExamAnswer implements Serializable {
     private String history;
 
     @ApiModelProperty(value = "作答时长")
-    @TableId(value = "id")
+    @TableId(value = "duration_seconds")
     private Integer duration_seconds;
 
+    @ApiModelProperty(value = "分数")
+    @TableId(value = "score")
+    private Double score;
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
@@ -129,4 +133,12 @@ public class TOeExamAnswer implements Serializable {
     public void setDuration_seconds(Integer duration_seconds) {
         this.duration_seconds = duration_seconds;
     }
+
+    public Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
 }

themis-business/src/main/java/com/qmth/themis/business/entity/TOeExamBreakHistory.java

@@ -16,7 +16,6 @@ import java.util.Date;
  */
 @ApiModel(value = "t_oe_exam_break_history", description = "考试断点记录")
 public class TOeExamBreakHistory implements Serializable {
-
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键")
@@ -47,21 +46,13 @@ public class TOeExamBreakHistory implements Serializable {
     @TableId(value = "start_time")
     private Date startTime;
 
-    @ApiModelProperty(value = "恢复开考人脸验证结果")
-    @TableId(value = "entry_face_verify_result")
-    private Integer entryFaceVerifyResult;
-
-    @ApiModelProperty(value = "恢复开考人脸验证记录ID")
-    @TableId(value = "entry_face_verify_history_id")
-    private Long entryFaceVerifyHistoryId;
-
-    @ApiModelProperty(value = "恢复开考活体验证结果")
-    @TableId(value = "entry_liveness_verify_result")
-    private Integer entryLivenessVerifyResult;
+    @ApiModelProperty(value = "恢复开考身份验证结果")
+    @TableId(value = "entry_authentication_result")
+    private Integer entryAuthenticationResult;
 
-    @ApiModelProperty(value = "恢复开考活体验证记录ID")
-    @TableId(value = "entry_liveness_verify_history_id")
-    private Long entryLivenessVerifyHistoryId;
+    @ApiModelProperty(value = "恢复开考身份验证记录ID")
+    @TableId(value = "entry_authentication_id")
+    private Long entryAuthenticationId;
 
     public static long getSerialVersionUID() {
         return serialVersionUID;
@@ -123,35 +114,19 @@ public class TOeExamBreakHistory implements Serializable {
         this.startTime = startTime;
     }
 
-    public Integer getEntryFaceVerifyResult() {
-        return entryFaceVerifyResult;
-    }
-
-    public void setEntryFaceVerifyResult(Integer entryFaceVerifyResult) {
-        this.entryFaceVerifyResult = entryFaceVerifyResult;
-    }
-
-    public Long getEntryFaceVerifyHistoryId() {
-        return entryFaceVerifyHistoryId;
-    }
-
-    public void setEntryFaceVerifyHistoryId(Long entryFaceVerifyHistoryId) {
-        this.entryFaceVerifyHistoryId = entryFaceVerifyHistoryId;
-    }
-
-    public Integer getEntryLivenessVerifyResult() {
-        return entryLivenessVerifyResult;
+    public Integer getEntryAuthenticationResult() {
+        return entryAuthenticationResult;
     }
 
-    public void setEntryLivenessVerifyResult(Integer entryLivenessVerifyResult) {
-        this.entryLivenessVerifyResult = entryLivenessVerifyResult;
+    public void setEntryAuthenticationResult(Integer entryAuthenticationResult) {
+        this.entryAuthenticationResult = entryAuthenticationResult;
     }
 
-    public Long getEntryLivenessVerifyHistoryId() {
-        return entryLivenessVerifyHistoryId;
+    public Long getEntryAuthenticationId() {
+        return entryAuthenticationId;
     }
 
-    public void setEntryLivenessVerifyHistoryId(Long entryLivenessVerifyHistoryId) {
-        this.entryLivenessVerifyHistoryId = entryLivenessVerifyHistoryId;
+    public void setEntryAuthenticationId(Long entryAuthenticationId) {
+        this.entryAuthenticationId = entryAuthenticationId;
     }
 }

themis-business/src/main/java/com/qmth/themis/business/entity/TOeExamRecord.java

@@ -16,7 +16,6 @@ import java.util.Date;
  */
 @ApiModel(value = "t_oe_exam_record", description = "考试记录")
 public class TOeExamRecord implements Serializable {
-
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键")
@@ -39,10 +38,6 @@ public class TOeExamRecord implements Serializable {
     @TableId(value = "paper_id")
     private Long paperId;
 
-    @ApiModelProperty(value = "个人试卷结构保存地址")
-    @TableId(value = "paper_struct_path")
-    private String paperStructPath;
-
     @ApiModelProperty(value = "全部作答保存地址")
     @TableId(value = "answer_path")
     private String answerPath;
@@ -79,38 +74,6 @@ public class TOeExamRecord implements Serializable {
     @TableId(value = "left_break_resume_count")
     private Integer leftBreakResumeCount;
 
-    @ApiModelProperty(value = "开考人脸验证结果")
-    @TableId(value = "entry_face_verify_result")
-    private Integer entryFaceVerifyResult;
-
-    @ApiModelProperty(value = "开考人脸验证记录ID")
-    @TableId(value = "entry_face_verify_history_id")
-    private Long entryFaceVerifyHistoryId;
-
-    @ApiModelProperty(value = "开考活体验证结果")
-    @TableId(value = "entry_liveness_verify_result")
-    private Integer entryLivenessVerifyResult;
-
-    @ApiModelProperty(value = "开考活体验证记录ID")
-    @TableId(value = "entry_liveness_verify_history_id")
-    private Long entryLivenessVerifyHistoryId;
-
-    @ApiModelProperty(value = "最近过程人脸验证结果")
-    @TableId(value = "last_face_verify_result")
-    private Integer lastFaceVerifyResult;
-
-    @ApiModelProperty(value = "最近过程人脸验证记录ID")
-    @TableId(value = "last_face_verify_history_id")
-    private Long lastFaceVerifyHistoryId;
-
-    @ApiModelProperty(value = "最近活体验证结果")
-    @TableId(value = "last_liveness_verify_result")
-    private Integer lastLivenessVerifyResult;
-
-    @ApiModelProperty(value = "最近活体验证记录ID")
-    @TableId(value = "last_liveness_verify_history_id")
-    private Long lastLivenessVerifyHistoryId;
-
     @ApiModelProperty(value = "客户端当前IP地址")
     @TableId(value = "client_current_ip")
     private String clientCurrentIp;
@@ -191,6 +154,42 @@ public class TOeExamRecord implements Serializable {
     @TableId(value = "breach_status")
     private Integer breachStatus;
 
+    @ApiModelProperty(value = "个人试卷结构")
+    @TableId(value = "paper_struct")
+    private String paperStruct;
+
+    @ApiModelProperty(value = "个人试卷结构是否已上传")
+    @TableId(value = "paper_struct_upload")
+    private Integer paperStructUpload;
+
+    @ApiModelProperty(value = "第几次考试")
+    @TableId(value = "serial_number")
+    private Integer serialNumber;
+
+    @ApiModelProperty(value = "最近断点记录ID")
+    @TableId(value = "last_break_id")
+    private Long lastBreakId;
+
+    @ApiModelProperty(value = "开考身份验证结果")
+    @TableId(value = "entry_authentication_result")
+    private Integer entryAuthenticationResult;
+
+    @ApiModelProperty(value = "开考身份验证记录ID")
+    @TableId(value = "entry_authentication_id")
+    private Long entryAuthenticationId;
+
+    @ApiModelProperty(value = "当前过程人脸检测状态")
+    @TableId(value = "in_process_face_verify_status")
+    private Integer inProcessFaceVerifyStatus;
+
+    @ApiModelProperty(value = "当前过程活体验证状态")
+    @TableId(value = "in_process_liveness_verify_status")
+    private Integer inProcessLivenessVerifyStatus;
+
+    @ApiModelProperty(value = "已完成过程活体验证次数")
+    @TableId(value = "in_process_liveness_verify_count")
+    private Integer inProcessLivenessVerifyCount;
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
@@ -235,14 +234,6 @@ public class TOeExamRecord implements Serializable {
         this.paperId = paperId;
     }
 
-    public String getPaperStructPath() {
-        return paperStructPath;
-    }
-
-    public void setPaperStructPath(String paperStructPath) {
-        this.paperStructPath = paperStructPath;
-    }
-
     public String getAnswerPath() {
         return answerPath;
     }
@@ -315,70 +306,6 @@ public class TOeExamRecord implements Serializable {
         this.leftBreakResumeCount = leftBreakResumeCount;
     }
 
-    public Integer getEntryFaceVerifyResult() {
-        return entryFaceVerifyResult;
-    }
-
-    public void setEntryFaceVerifyResult(Integer entryFaceVerifyResult) {
-        this.entryFaceVerifyResult = entryFaceVerifyResult;
-    }
-
-    public Long getEntryFaceVerifyHistoryId() {
-        return entryFaceVerifyHistoryId;
-    }
-
-    public void setEntryFaceVerifyHistoryId(Long entryFaceVerifyHistoryId) {
-        this.entryFaceVerifyHistoryId = entryFaceVerifyHistoryId;
-    }
-
-    public Integer getEntryLivenessVerifyResult() {
-        return entryLivenessVerifyResult;
-    }
-
-    public void setEntryLivenessVerifyResult(Integer entryLivenessVerifyResult) {
-        this.entryLivenessVerifyResult = entryLivenessVerifyResult;
-    }
-
-    public Long getEntryLivenessVerifyHistoryId() {
-        return entryLivenessVerifyHistoryId;
-    }
-
-    public void setEntryLivenessVerifyHistoryId(Long entryLivenessVerifyHistoryId) {
-        this.entryLivenessVerifyHistoryId = entryLivenessVerifyHistoryId;
-    }
-
-    public Integer getLastFaceVerifyResult() {
-        return lastFaceVerifyResult;
-    }
-
-    public void setLastFaceVerifyResult(Integer lastFaceVerifyResult) {
-        this.lastFaceVerifyResult = lastFaceVerifyResult;
-    }
-
-    public Long getLastFaceVerifyHistoryId() {
-        return lastFaceVerifyHistoryId;
-    }
-
-    public void setLastFaceVerifyHistoryId(Long lastFaceVerifyHistoryId) {
-        this.lastFaceVerifyHistoryId = lastFaceVerifyHistoryId;
-    }
-
-    public Integer getLastLivenessVerifyResult() {
-        return lastLivenessVerifyResult;
-    }
-
-    public void setLastLivenessVerifyResult(Integer lastLivenessVerifyResult) {
-        this.lastLivenessVerifyResult = lastLivenessVerifyResult;
-    }
-
-    public Long getLastLivenessVerifyHistoryId() {
-        return lastLivenessVerifyHistoryId;
-    }
-
-    public void setLastLivenessVerifyHistoryId(Long lastLivenessVerifyHistoryId) {
-        this.lastLivenessVerifyHistoryId = lastLivenessVerifyHistoryId;
-    }
-
     public String getClientCurrentIp() {
         return clientCurrentIp;
     }
@@ -538,4 +465,76 @@ public class TOeExamRecord implements Serializable {
     public void setBreachStatus(Integer breachStatus) {
         this.breachStatus = breachStatus;
     }
+
+    public String getPaperStruct() {
+        return paperStruct;
+    }
+
+    public void setPaperStruct(String paperStruct) {
+        this.paperStruct = paperStruct;
+    }
+
+    public Integer getPaperStructUpload() {
+        return paperStructUpload;
+    }
+
+    public void setPaperStructUpload(Integer paperStructUpload) {
+        this.paperStructUpload = paperStructUpload;
+    }
+
+    public Integer getSerialNumber() {
+        return serialNumber;
+    }
+
+    public void setSerialNumber(Integer serialNumber) {
+        this.serialNumber = serialNumber;
+    }
+
+    public Long getLastBreakId() {
+        return lastBreakId;
+    }
+
+    public void setLastBreakId(Long lastBreakId) {
+        this.lastBreakId = lastBreakId;
+    }
+
+    public Integer getEntryAuthenticationResult() {
+        return entryAuthenticationResult;
+    }
+
+    public void setEntryAuthenticationResult(Integer entryAuthenticationResult) {
+        this.entryAuthenticationResult = entryAuthenticationResult;
+    }
+
+    public Long getEntryAuthenticationId() {
+        return entryAuthenticationId;
+    }
+
+    public void setEntryAuthenticationId(Long entryAuthenticationId) {
+        this.entryAuthenticationId = entryAuthenticationId;
+    }
+
+    public Integer getInProcessFaceVerifyStatus() {
+        return inProcessFaceVerifyStatus;
+    }
+
+    public void setInProcessFaceVerifyStatus(Integer inProcessFaceVerifyStatus) {
+        this.inProcessFaceVerifyStatus = inProcessFaceVerifyStatus;
+    }
+
+    public Integer getInProcessLivenessVerifyStatus() {
+        return inProcessLivenessVerifyStatus;
+    }
+
+    public void setInProcessLivenessVerifyStatus(Integer inProcessLivenessVerifyStatus) {
+        this.inProcessLivenessVerifyStatus = inProcessLivenessVerifyStatus;
+    }
+
+    public Integer getInProcessLivenessVerifyCount() {
+        return inProcessLivenessVerifyCount;
+    }
+
+    public void setInProcessLivenessVerifyCount(Integer inProcessLivenessVerifyCount) {
+        this.inProcessLivenessVerifyCount = inProcessLivenessVerifyCount;
+    }
 }

themis-business/src/main/java/com/qmth/themis/business/entity/TOeFaceVerifyHistory.java

@@ -16,7 +16,6 @@ import java.util.Date;
  */
 @ApiModel(value = "t_oe_face_verify_history", description = "人脸验证记录")
 public class TOeFaceVerifyHistory implements Serializable {
-
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键")
@@ -27,10 +26,6 @@ public class TOeFaceVerifyHistory implements Serializable {
     @TableId(value = "exam_record_id")
     private Long examRecordId;
 
-    @ApiModelProperty(value = "图片保存路径")
-    @TableId(value = "photo_path")
-    private String photoPath;
-
     @ApiModelProperty(value = "相似度分数")
     @TableId(value = "similarity")
     private Double similarity;
@@ -39,10 +34,6 @@ public class TOeFaceVerifyHistory implements Serializable {
     @TableId(value = "realness")
     private Integer realness;
 
-    @ApiModelProperty(value = "本地验证是否通过")
-    @TableId(value = "local_pass")
-    private Integer localPass;
-
     @ApiModelProperty(value = "创建时间")
     @TableId(value = "create_time")
     private Date createTime;
@@ -51,6 +42,18 @@ public class TOeFaceVerifyHistory implements Serializable {
     @TableId(value = "update_time")
     private Date updateTime;
 
+    @ApiModelProperty(value = "初次开考、恢复开考、过程中")
+    @TableId(value = "type")
+    private Integer type;
+
+    @ApiModelProperty(value = "图片保存路径")
+    @TableId(value = "photo_url")
+    private String photoUrl;
+
+    @ApiModelProperty(value = "本地验证是否通过")
+    @TableId(value = "pass")
+    private Integer pass;
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
@@ -71,14 +74,6 @@ public class TOeFaceVerifyHistory implements Serializable {
         this.examRecordId = examRecordId;
     }
 
-    public String getPhotoPath() {
-        return photoPath;
-    }
-
-    public void setPhotoPath(String photoPath) {
-        this.photoPath = photoPath;
-    }
-
     public Double getSimilarity() {
         return similarity;
     }
@@ -95,14 +90,6 @@ public class TOeFaceVerifyHistory implements Serializable {
         this.realness = realness;
     }
 
-    public Integer getLocalPass() {
-        return localPass;
-    }
-
-    public void setLocalPass(Integer localPass) {
-        this.localPass = localPass;
-    }
-
     public Date getCreateTime() {
         return createTime;
     }
@@ -118,4 +105,28 @@ public class TOeFaceVerifyHistory implements Serializable {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getPhotoUrl() {
+        return photoUrl;
+    }
+
+    public void setPhotoUrl(String photoUrl) {
+        this.photoUrl = photoUrl;
+    }
+
+    public Integer getPass() {
+        return pass;
+    }
+
+    public void setPass(Integer pass) {
+        this.pass = pass;
+    }
 }

themis-business/src/main/java/com/qmth/themis/business/entity/TOeLivenessVerifyHistory.java

@@ -16,7 +16,6 @@ import java.util.Date;
  */
 @ApiModel(value = "t_oe_liveness_verify_history", description = "活体验证记录")
 public class TOeLivenessVerifyHistory implements Serializable {
-
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键")
@@ -39,9 +38,21 @@ public class TOeLivenessVerifyHistory implements Serializable {
     @TableId(value = "result")
     private Integer result;
 
+    @ApiModelProperty(value = "重试次数")
+    @TableId(value = "retry")
+    private Integer retry;
+
+    @ApiModelProperty(value = "本地验证是否通过")
+    @TableId(value = "pass")
+    private Integer pass;
+
+    @ApiModelProperty(value = "开始时间")
+    @TableId(value = "start_time")
+    private Date startTime;
+
     @ApiModelProperty(value = "完成时间")
-    @TableId(value = "create_time")
-    private Date createTime;
+    @TableId(value = "finish_time")
+    private Date finishTime;
 
     public static long getSerialVersionUID() {
         return serialVersionUID;
@@ -87,11 +98,35 @@ public class TOeLivenessVerifyHistory implements Serializable {
         this.result = result;
     }
 
-    public Date getCreateTime() {
-        return createTime;
+    public Integer getRetry() {
+        return retry;
+    }
+
+    public void setRetry(Integer retry) {
+        this.retry = retry;
+    }
+
+    public Integer getPass() {
+        return pass;
+    }
+
+    public void setPass(Integer pass) {
+        this.pass = pass;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getFinishTime() {
+        return finishTime;
     }
 
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
+    public void setFinishTime(Date finishTime) {
+        this.finishTime = finishTime;
     }
 }