瀏覽代碼

字段修改

wangliang 4 年之前
父節點
當前提交
7ce238a80f

+ 0 - 7
themis-backend/src/main/java/com/qmth/themis/backend/api/TBUserController.java

@@ -347,13 +347,7 @@ public class TBUserController {
 //        teExam.setExamCount(5);
 //        teExam.setBreakResumeCount(3);
 //        teExam.setBreakExpireSeconds(30);
-//        teExam.setClientVideoPush(1);
-//        teExam.setClientVideoRecord(1);
-//        teExam.setWxappPhotoUpload(1);
-//        teExam.setWxappVideoPush(1);
-//        teExam.setWxappVideoRecord(1);
 //        teExam.setCameraPhotoUpload(1);
-//        teExam.setWxappPhotoUpload(1);
 //        teExam.setReexamAuditing(1);
 //        teExam.setShowObjectiveScore(1);
 //        teExam.setMode(0);
@@ -367,7 +361,6 @@ public class TBUserController {
 //        teExam.setInProcessFaceStrangerIgnore(1);
 //        teExam.setInProcessLivenessVerify(1);
 //        teExam.setInProcessLivenessIntervalSeconds(30);
-//        teExam.setInProcessLivenessRetryCount(3);
 //        teExam.setInProcessLivenessJudgePolicy(1);
 //        teExam.setRecordSelectStrategy(1);
 //        teExam.setEnableIpLimit(1);

+ 0 - 90
themis-business/src/main/java/com/qmth/themis/business/cache/bean/ExamCacheBean.java

@@ -64,24 +64,9 @@ public class ExamCacheBean implements Serializable {
     //断点续考次数
     private Integer breakResumeCount;
 
-    //是否开启/强制客户端视频监控,0:不开启,1:开启,2:强制开启
-    private Integer clientVideoPush;
-
-    //是否开启客户端视频转录,0:不开启,1:开启
-    private Integer clientVideoRecord;
-
-    //是否开启/强制微信小程序监控,0:不开启,1:开启,2:强制开启
-    private Integer wxappVideoPush;
-
-    //是否开启微信小程序视频转录,0:不开启,1:开启
-    private Integer wxappVideoRecord;
-
     //是否允许使用摄像头拍照答题,0:不允许,1:允许
     private Integer cameraPhotoUpload;
 
-    //是否允许使用微信拍照答题,0:不允许,1:允许
-    private Integer wxappPhotoUpload;
-
     //重考是否审批,0:不审批,1:审批
     private Integer reexamAuditing;
 
@@ -121,9 +106,6 @@ public class ExamCacheBean implements Serializable {
     //考试过程中活体检测间隔时间
     private Integer inProcessLivenessIntervalSeconds;
 
-    //考试过程中活体检测重试次数
-    private Integer inProcessLivenessRetryCount;
-
     //考试过程中活体检测结果判定规则,any:任意一次通过,all:全部都要通过,more:通过次数大于失败次数
     private InProcessLivenessJudgePolicyEnum inProcessLivenessJudgePolicy;
 
@@ -139,12 +121,6 @@ public class ExamCacheBean implements Serializable {
     //算分状态,never:从未算分,calculating:正在算分,finish:算分完成
     private ScoreStatusEnum scoreStatus;
 
-    //是否启用开考口令,0:不启用,1:启用
-    private Integer enableShortCode;
-
-    //是否允许断点续考,0:不允许,1:允许
-    private Integer enableBreak;
-
     //客观题给分策略,equal: 全对给分,partial: 漏选给一半分
     private ObjectiveScorePolicyEnum objectiveScorePolicy;
 
@@ -170,22 +146,6 @@ public class ExamCacheBean implements Serializable {
         this.monitorRecord = monitorRecord;
     }
 
-    public Integer getEnableBreak() {
-        return enableBreak;
-    }
-
-    public void setEnableBreak(Integer enableBreak) {
-        this.enableBreak = enableBreak;
-    }
-
-    public Integer getEnableShortCode() {
-        return enableShortCode;
-    }
-
-    public void setEnableShortCode(Integer enableShortCode) {
-        this.enableShortCode = enableShortCode;
-    }
-
     public ExamModeEnum getMode() {
         return mode;
     }
@@ -274,14 +234,6 @@ public class ExamCacheBean implements Serializable {
         this.inProcessLivenessIntervalSeconds = inProcessLivenessIntervalSeconds;
     }
 
-    public Integer getInProcessLivenessRetryCount() {
-        return inProcessLivenessRetryCount;
-    }
-
-    public void setInProcessLivenessRetryCount(Integer inProcessLivenessRetryCount) {
-        this.inProcessLivenessRetryCount = inProcessLivenessRetryCount;
-    }
-
     public InProcessLivenessJudgePolicyEnum getInProcessLivenessJudgePolicy() {
         return inProcessLivenessJudgePolicy;
     }
@@ -446,38 +398,6 @@ public class ExamCacheBean implements Serializable {
         this.breakResumeCount = breakResumeCount;
     }
 
-    public Integer getClientVideoPush() {
-        return clientVideoPush;
-    }
-
-    public void setClientVideoPush(Integer clientVideoPush) {
-        this.clientVideoPush = clientVideoPush;
-    }
-
-    public Integer getClientVideoRecord() {
-        return clientVideoRecord;
-    }
-
-    public void setClientVideoRecord(Integer clientVideoRecord) {
-        this.clientVideoRecord = clientVideoRecord;
-    }
-
-    public Integer getWxappVideoPush() {
-        return wxappVideoPush;
-    }
-
-    public void setWxappVideoPush(Integer wxappVideoPush) {
-        this.wxappVideoPush = wxappVideoPush;
-    }
-
-    public Integer getWxappVideoRecord() {
-        return wxappVideoRecord;
-    }
-
-    public void setWxappVideoRecord(Integer wxappVideoRecord) {
-        this.wxappVideoRecord = wxappVideoRecord;
-    }
-
     public Integer getCameraPhotoUpload() {
         return cameraPhotoUpload;
     }
@@ -486,14 +406,6 @@ public class ExamCacheBean implements Serializable {
         this.cameraPhotoUpload = cameraPhotoUpload;
     }
 
-    public Integer getWxappPhotoUpload() {
-        return wxappPhotoUpload;
-    }
-
-    public void setWxappPhotoUpload(Integer wxappPhotoUpload) {
-        this.wxappPhotoUpload = wxappPhotoUpload;
-    }
-
     public Integer getReexamAuditing() {
         return reexamAuditing;
     }
@@ -525,6 +437,4 @@ public class ExamCacheBean implements Serializable {
 	public void setId(Long id) {
 		this.id = id;
 	}
-    
-    
 }

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

@@ -40,12 +40,7 @@ public class TEExamActivityDto implements Serializable {
     private String inProcessLivenessFixedRangeStr;
     private List<Long> inProcessLivenessFixedRange;//考试过程中活体检测间隔时间
     private String inProcessLivenessJudgePolicy;//考试过程中活体检测结果判定规则,any:任意一次通过,all:全部都要通过,more:通过次数大于失败次数
-    private Integer inProcessLivenessRetryCount;//考试过程中活体检测重试次数
-    private Integer clientVideoPush;//是否开启/强制客户端视频监控,0:不开启,1:开启,2:强制开启
-    private Integer wxappVideoPush;//是否开启/强制微信小程序监控,0:不开启,1:开启,2:强制开启
     private Integer cameraPhotoUpload;//是否允许使用摄像头拍照答题,0:不允许,1:允许
-    private Integer wxappPhotoUpload;//是否允许使用微信拍照答题,0:不允许,1:允许
-    private Integer wxappVideoRecord;//是否开启微信小程序视频转录,0:不开启,1:开启
     private Date startTime;//考场开始时间
     private Date finishTime;//考场结束时间
     private Integer leftExamCount;//剩余考试次数
@@ -274,30 +269,6 @@ public class TEExamActivityDto implements Serializable {
         this.inProcessLivenessJudgePolicy = inProcessLivenessJudgePolicy;
     }
 
-    public Integer getInProcessLivenessRetryCount() {
-        return inProcessLivenessRetryCount;
-    }
-
-    public void setInProcessLivenessRetryCount(Integer inProcessLivenessRetryCount) {
-        this.inProcessLivenessRetryCount = inProcessLivenessRetryCount;
-    }
-
-    public Integer getClientVideoPush() {
-        return clientVideoPush;
-    }
-
-    public void setClientVideoPush(Integer clientVideoPush) {
-        this.clientVideoPush = clientVideoPush;
-    }
-
-    public Integer getWxappVideoPush() {
-        return wxappVideoPush;
-    }
-
-    public void setWxappVideoPush(Integer wxappVideoPush) {
-        this.wxappVideoPush = wxappVideoPush;
-    }
-
     public Integer getCameraPhotoUpload() {
         return cameraPhotoUpload;
     }
@@ -306,22 +277,6 @@ public class TEExamActivityDto implements Serializable {
         this.cameraPhotoUpload = cameraPhotoUpload;
     }
 
-    public Integer getWxappPhotoUpload() {
-        return wxappPhotoUpload;
-    }
-
-    public void setWxappPhotoUpload(Integer wxappPhotoUpload) {
-        this.wxappPhotoUpload = wxappPhotoUpload;
-    }
-
-    public Integer getWxappVideoRecord() {
-        return wxappVideoRecord;
-    }
-
-    public void setWxappVideoRecord(Integer wxappVideoRecord) {
-        this.wxappVideoRecord = wxappVideoRecord;
-    }
-
     public Date getStartTime() {
         return startTime;
     }

+ 0 - 45
themis-business/src/main/java/com/qmth/themis/business/dto/response/TEExamUnFinishDto.java

@@ -40,12 +40,7 @@ public class TEExamUnFinishDto implements Serializable {
     private Integer inProcessLivenessVerify;//考试过程中是否启用活体检测 ,0:不启用,1:启用
     private String inProcessLivenessFixedRange;//考试过程中活体检测间隔时间
     private String inProcessLivenessJudgePolicy;//考试过程中活体检测结果判定规则,any:任意一次通过,all:全部都要通过,more:通过次数大于失败次数
-    private Integer inProcessLivenessRetryCount;//考试过程中活体检测重试次数
-    private Integer clientVideoPush;//是否开启/强制客户端视频监控,0:不开启,1:开启,2:强制开启
-    private Integer wxappVideoPush;//是否开启/强制微信小程序监控,0:不开启,1:开启,2:强制开启
     private Integer cameraPhotoUpload;//是否允许使用摄像头拍照答题,0:不允许,1:允许
-    private Integer wxappPhotoUpload;//是否允许使用微信拍照答题,0:不允许,1:允许
-    private Integer wxappVideoRecord;//是否开启微信小程序视频转录,0:不开启,1:开启
     private Integer breakExpireSeconds;//断点失效时间(秒)
     private Integer breakResumeCount;//断点续考次数
     private Integer durationSeconds;//累计考试用时
@@ -307,30 +302,6 @@ public class TEExamUnFinishDto implements Serializable {
         this.inProcessLivenessJudgePolicy = inProcessLivenessJudgePolicy;
     }
 
-    public Integer getInProcessLivenessRetryCount() {
-        return inProcessLivenessRetryCount;
-    }
-
-    public void setInProcessLivenessRetryCount(Integer inProcessLivenessRetryCount) {
-        this.inProcessLivenessRetryCount = inProcessLivenessRetryCount;
-    }
-
-    public Integer getClientVideoPush() {
-        return clientVideoPush;
-    }
-
-    public void setClientVideoPush(Integer clientVideoPush) {
-        this.clientVideoPush = clientVideoPush;
-    }
-
-    public Integer getWxappVideoPush() {
-        return wxappVideoPush;
-    }
-
-    public void setWxappVideoPush(Integer wxappVideoPush) {
-        this.wxappVideoPush = wxappVideoPush;
-    }
-
     public Integer getCameraPhotoUpload() {
         return cameraPhotoUpload;
     }
@@ -338,20 +309,4 @@ public class TEExamUnFinishDto implements Serializable {
     public void setCameraPhotoUpload(Integer cameraPhotoUpload) {
         this.cameraPhotoUpload = cameraPhotoUpload;
     }
-
-    public Integer getWxappPhotoUpload() {
-        return wxappPhotoUpload;
-    }
-
-    public void setWxappPhotoUpload(Integer wxappPhotoUpload) {
-        this.wxappPhotoUpload = wxappPhotoUpload;
-    }
-
-    public Integer getWxappVideoRecord() {
-        return wxappVideoRecord;
-    }
-
-    public void setWxappVideoRecord(Integer wxappVideoRecord) {
-        this.wxappVideoRecord = wxappVideoRecord;
-    }
 }

+ 2 - 107
themis-business/src/main/java/com/qmth/themis/business/entity/TEExam.java

@@ -1,14 +1,13 @@
 package com.qmth.themis.business.entity;
 
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.qmth.themis.business.base.BaseEntity;
-
 import com.qmth.themis.business.enums.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.Date;
+
 /**
  * @Description: 考试批次
  * @Param:
@@ -80,30 +79,10 @@ public class TEExam extends BaseEntity {
     @TableField(value = "break_resume_count")
     private Integer breakResumeCount;
 
-    @ApiModelProperty(value = "是否开启/强制客户端视频监控,0:不开启,1:开启,2:强制开启")
-    @TableField(value = "client_video_push")
-    private Integer clientVideoPush;
-
-    @ApiModelProperty(value = "是否开启客户端视频转录,0:不开启,1:开启")
-    @TableField(value = "client_video_record")
-    private Integer clientVideoRecord;
-
-    @ApiModelProperty(value = "是否开启/强制微信小程序监控,0:不开启,1:开启,2:强制开启")
-    @TableField(value = "wxapp_video_push")
-    private Integer wxappVideoPush;
-
-    @ApiModelProperty(value = "是否开启微信小程序视频转录,0:不开启,1:开启")
-    @TableField(value = "wxapp_video_record")
-    private Integer wxappVideoRecord;
-
     @ApiModelProperty(value = "是否允许使用摄像头拍照答题,0:不允许,1:允许")
     @TableField(value = "camera_photo_upload")
     private Integer cameraPhotoUpload;
 
-    @ApiModelProperty(value = "是否允许使用微信拍照答题,0:不允许,1:允许")
-    @TableField(value = "wxapp_photo_upload")
-    private Integer wxappPhotoUpload;
-
     @ApiModelProperty(value = "重考是否审批,0:不审批,1:审批")
     @TableField(value = "reexam_auditing")
     private Integer reexamAuditing;
@@ -156,10 +135,6 @@ public class TEExam extends BaseEntity {
     @TableField(value = "in_process_liveness_fixed_range")
     private String inProcessLivenessFixedRange;
 
-    @ApiModelProperty(value = "考试过程中活体检测重试次数")
-    @TableField(value = "in_process_liveness_retry_count")
-    private Integer inProcessLivenessRetryCount;
-
     @ApiModelProperty(value = "考试过程中活体检测结果判定规则,any:任意一次通过,all:全部都要通过,more:通过次数大于失败次数")
     @TableField(value = "in_process_liveness_judge_policy")
     private InProcessLivenessJudgePolicyEnum inProcessLivenessJudgePolicy;
@@ -180,14 +155,6 @@ public class TEExam extends BaseEntity {
     @TableField(value = "score_status")
     private ScoreStatusEnum scoreStatus;
 
-    @ApiModelProperty(value = "是否启用开考口令,0:不启用,1:启用")
-    @TableField(value = "enable_short_code")
-    private Integer enableShortCode;
-
-    @ApiModelProperty(value = "是否允许断点续考,0:不允许,1:允许")
-    @TableField(value = "enable_break")
-    private Integer enableBreak;
-
     @ApiModelProperty(value = "客观题给分策略,equal: 全对给分,partial: 漏选给一半分")
     @TableField(value = "objective_score_policy")
     private ObjectiveScorePolicyEnum objectiveScorePolicy;
@@ -228,22 +195,6 @@ public class TEExam extends BaseEntity {
         this.monitorRecord = monitorRecord;
     }
 
-    public Integer getEnableBreak() {
-        return enableBreak;
-    }
-
-    public void setEnableBreak(Integer enableBreak) {
-        this.enableBreak = enableBreak;
-    }
-
-    public Integer getEnableShortCode() {
-        return enableShortCode;
-    }
-
-    public void setEnableShortCode(Integer enableShortCode) {
-        this.enableShortCode = enableShortCode;
-    }
-
     public ExamModeEnum getMode() {
         return mode;
     }
@@ -332,14 +283,6 @@ public class TEExam extends BaseEntity {
         this.inProcessLivenessFixedRange = inProcessLivenessFixedRange;
     }
 
-    public Integer getInProcessLivenessRetryCount() {
-        return inProcessLivenessRetryCount;
-    }
-
-    public void setInProcessLivenessRetryCount(Integer inProcessLivenessRetryCount) {
-        this.inProcessLivenessRetryCount = inProcessLivenessRetryCount;
-    }
-
     public InProcessLivenessJudgePolicyEnum getInProcessLivenessJudgePolicy() {
         return inProcessLivenessJudgePolicy;
     }
@@ -504,54 +447,6 @@ public class TEExam extends BaseEntity {
         this.breakResumeCount = breakResumeCount;
     }
 
-    public Integer getClientVideoPush() {
-        return clientVideoPush;
-    }
-
-    public void setClientVideoPush(Integer clientVideoPush) {
-        this.clientVideoPush = clientVideoPush;
-    }
-
-    public Integer getClientVideoRecord() {
-        return clientVideoRecord;
-    }
-
-    public void setClientVideoRecord(Integer clientVideoRecord) {
-        this.clientVideoRecord = clientVideoRecord;
-    }
-
-    public Integer getWxappVideoPush() {
-        return wxappVideoPush;
-    }
-
-    public void setWxappVideoPush(Integer wxappVideoPush) {
-        this.wxappVideoPush = wxappVideoPush;
-    }
-
-    public Integer getWxappVideoRecord() {
-        return wxappVideoRecord;
-    }
-
-    public void setWxappVideoRecord(Integer wxappVideoRecord) {
-        this.wxappVideoRecord = wxappVideoRecord;
-    }
-
-    public Integer getCameraPhotoUpload() {
-        return cameraPhotoUpload;
-    }
-
-    public void setCameraPhotoUpload(Integer cameraPhotoUpload) {
-        this.cameraPhotoUpload = cameraPhotoUpload;
-    }
-
-    public Integer getWxappPhotoUpload() {
-        return wxappPhotoUpload;
-    }
-
-    public void setWxappPhotoUpload(Integer wxappPhotoUpload) {
-        this.wxappPhotoUpload = wxappPhotoUpload;
-    }
-
     public Integer getReexamAuditing() {
         return reexamAuditing;
     }

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

@@ -40,10 +40,6 @@ public class TOeExamRecord implements Serializable {
     @TableField(value = "paper_id")
     private Long paperId;
 
-    @ApiModelProperty(value = "全部作答保存地址")
-    @TableField(value = "answer_path")
-    private String answerPath;
-
     @ApiModelProperty(value = "考试状态,first_prepare:首次候考,answering:正在答题,break_off:已中断,resume_prepare:断点恢复候考,finished:已结束考试,persisted:数据已保存")
     @TableField(value = "status")
     private ExamRecordStatusEnum status;
@@ -88,34 +84,6 @@ public class TOeExamRecord implements Serializable {
     @TableField(value = "client_last_sync_time")
     private Date clientLastSyncTime;
 
-    @ApiModelProperty(value = "微信小程序websocket状态")
-    @TableField(value = "wxapp_websocket_status")
-    private Integer wxappWebsocketStatus;
-
-    @ApiModelProperty(value = "微信小程序websocket连接标识")
-    @TableField(value = "wxapp_websocket_id")
-    private String wxappWebsocketId;
-
-    @ApiModelProperty(value = "微信小程序最近同步时间")
-    @TableField(value = "wxapp_last_sync_time")
-    private Date wxappLastSyncTime;
-
-    @ApiModelProperty(value = "客户端推流状态")
-    @TableField(value = "client_video_push_status")
-    private Integer clientVideoPushStatus;
-
-    @ApiModelProperty(value = "客户端推流地址")
-    @TableField(value = "client_video_push_key")
-    private String clientVideoPushKey;
-
-    @ApiModelProperty(value = "微信小程序推流状态")
-    @TableField(value = "wxapp_video_push_status")
-    private Integer wxappVideoPushStatus;
-
-    @ApiModelProperty(value = "微信小程序推流地址")
-    @TableField(value = "wxapp_video_push_key")
-    private String wxappVideoPushKey;
-
     @ApiModelProperty(value = "答题进度")
     @TableField(value = "answer_progress")
     private Double answerProgress;
@@ -153,8 +121,8 @@ public class TOeExamRecord implements Serializable {
     private Integer breachStatus;
 
     @ApiModelProperty(value = "个人试卷结构")
-    @TableField(value = "paper_struct")
-    private String paperStruct;
+    @TableField(value = "paper_struct_path")
+    private String paperStructPath;
 
     @ApiModelProperty(value = "个人试卷结构是否已上传,0:未上传,1:已上传")
     @TableField(value = "paper_struct_upload")
@@ -280,14 +248,6 @@ public class TOeExamRecord implements Serializable {
         this.paperId = paperId;
     }
 
-    public String getAnswerPath() {
-        return answerPath;
-    }
-
-    public void setAnswerPath(String answerPath) {
-        this.answerPath = answerPath;
-    }
-
     public ExamRecordStatusEnum getStatus() {
         return status;
     }
@@ -376,62 +336,6 @@ public class TOeExamRecord implements Serializable {
         this.clientLastSyncTime = clientLastSyncTime;
     }
 
-    public Integer getWxappWebsocketStatus() {
-        return wxappWebsocketStatus;
-    }
-
-    public void setWxappWebsocketStatus(Integer wxappWebsocketStatus) {
-        this.wxappWebsocketStatus = wxappWebsocketStatus;
-    }
-
-    public String getWxappWebsocketId() {
-        return wxappWebsocketId;
-    }
-
-    public void setWxappWebsocketId(String wxappWebsocketId) {
-        this.wxappWebsocketId = wxappWebsocketId;
-    }
-
-    public Date getWxappLastSyncTime() {
-        return wxappLastSyncTime;
-    }
-
-    public void setWxappLastSyncTime(Date wxappLastSyncTime) {
-        this.wxappLastSyncTime = wxappLastSyncTime;
-    }
-
-    public Integer getClientVideoPushStatus() {
-        return clientVideoPushStatus;
-    }
-
-    public void setClientVideoPushStatus(Integer clientVideoPushStatus) {
-        this.clientVideoPushStatus = clientVideoPushStatus;
-    }
-
-    public String getClientVideoPushKey() {
-        return clientVideoPushKey;
-    }
-
-    public void setClientVideoPushKey(String clientVideoPushKey) {
-        this.clientVideoPushKey = clientVideoPushKey;
-    }
-
-    public Integer getWxappVideoPushStatus() {
-        return wxappVideoPushStatus;
-    }
-
-    public void setWxappVideoPushStatus(Integer wxappVideoPushStatus) {
-        this.wxappVideoPushStatus = wxappVideoPushStatus;
-    }
-
-    public String getWxappVideoPushKey() {
-        return wxappVideoPushKey;
-    }
-
-    public void setWxappVideoPushKey(String wxappVideoPushKey) {
-        this.wxappVideoPushKey = wxappVideoPushKey;
-    }
-
     public Double getAnswerProgress() {
         return answerProgress;
     }
@@ -504,12 +408,12 @@ public class TOeExamRecord implements Serializable {
         this.breachStatus = breachStatus;
     }
 
-    public String getPaperStruct() {
-        return paperStruct;
+    public String getPaperStructPath() {
+        return paperStructPath;
     }
 
-    public void setPaperStruct(String paperStruct) {
-        this.paperStruct = paperStruct;
+    public void setPaperStructPath(String paperStructPath) {
+        this.paperStructPath = paperStructPath;
     }
 
     public Integer getPaperStructUpload() {

+ 1 - 6
themis-business/src/main/java/com/qmth/themis/business/service/impl/TOeExamRecordServiceImpl.java

@@ -104,18 +104,13 @@ public class TOeExamRecordServiceImpl extends ServiceImpl<TOeExamRecordMapper, T
             Map<String, Object> activityMap = new HashMap();
             activityMap.put("recordId", teExamUnFinishDto.getRecordId());
             activityMap.put("minDurationSeconds", teExamUnFinishDto.getMinDurationSeconds());
-            activityMap.put("clientVideoPush", teExamUnFinishDto.getClientVideoPush());
             activityMap.put("cameraPhotoUpload", teExamUnFinishDto.getCameraPhotoUpload());
             activityMap.put("courseCode", teExamUnFinishDto.getCourseCode());
-            activityMap.put("wxappPhotoUpload", teExamUnFinishDto.getWxappPhotoUpload());
-            activityMap.put("inProcessLivenessRetryCount", teExamUnFinishDto.getInProcessLivenessRetryCount());
             activityMap.put("examStudentId", teExamUnFinishDto.getExamStudentId());
             activityMap.put("inProcessLivenessVerify", teExamUnFinishDto.getInProcessLivenessVerify());
             activityMap.put("inProcessFaceStrangerIgnore", teExamUnFinishDto.getInProcessFaceStrangerIgnore());
-            activityMap.put("wxappVideoRecord", teExamUnFinishDto.getWxappVideoRecord());
             activityMap.put("inProcessFaceVerify", teExamUnFinishDto.getInProcessFaceVerify());
             activityMap.put("courseName", teExamUnFinishDto.getCourseName());
-            activityMap.put("wxappVideoPush", teExamUnFinishDto.getWxappVideoPush());
             activityMap.put("inProcessLivenessFixedRange", teExamUnFinishDto.getInProcessLivenessFixedRange());
             activityMap.put("prepareSeconds", teExamUnFinishDto.getPrepareSeconds());
             activityMap.put("fouceFinish", teExamUnFinishDto.getFouceFinish());
@@ -305,7 +300,7 @@ public class TOeExamRecordServiceImpl extends ServiceImpl<TOeExamRecordMapper, T
         	Map<String,Object> record=redisUtil.getHashEntries(RedisKeyHelper.examRecordCacheKey(recordId));
         	TOeExamRecord er=SimpleBeanUtil.mapToObject(record, TOeExamRecord.class);
         	er.setStatus(ExamRecordStatusEnum.PERSISTED);
-        	er.setPaperStruct(structFilePath);
+        	er.setPaperStructPath(structFilePath);
         	er.setPaperStructUpload(1);
         	saveOrUpdate(er);
         	//保存作答

+ 0 - 5
themis-business/src/main/resources/mapper/TEExamActivityMapper.xml

@@ -105,12 +105,7 @@
             tee.in_process_liveness_verify as inProcessLivenessVerify,
             tee.in_process_liveness_fixed_range as inProcessLivenessFixedRangeStr,
             tee.in_process_liveness_judge_policy as inProcessLivenessJudgePolicy,
-            tee.in_process_liveness_retry_count as inProcessLivenessRetryCount,
-            tee.client_video_push as clientVideoPush,
-            tee.wxapp_video_push as wxappVideoPush,
             tee.camera_photo_upload as cameraPhotoUpload,
-            tee.wxapp_photo_upload as wxappPhotoUpload,
-            tee.wxapp_video_record as wxappVideoRecord,
             teea.start_time as startTime,
             teea.finish_time as finishTime,
             tees.left_exam_count as leftExamCount

+ 0 - 5
themis-business/src/main/resources/mapper/TEExamMapper.xml

@@ -114,12 +114,7 @@
 <!--            tee.in_process_liveness_verify as inProcessLivenessVerify,-->
 <!--            tee.in_process_liveness_fixed_range as inProcessLivenessFixedRange,-->
 <!--            tee.in_process_liveness_judge_policy as inProcessLivenessJudgePolicy,-->
-<!--            tee.in_process_liveness_retry_count as inProcessLivenessRetryCount,-->
-<!--            tee.client_video_push as clientVideoPush,-->
-<!--            tee.wxapp_video_push as wxappVideoPush,-->
 <!--            tee.camera_photo_upload as cameraPhotoUpload,-->
-<!--            tee.wxapp_photo_upload as wxappPhotoUpload,-->
-<!--            tee.wxapp_video_record as wxappVideoRecord,-->
 <!--            teea.id as activityId,-->
 <!--            teea.code as activityCode,-->
 <!--            teea.opening_seconds as activityOpeningSeconds,-->

+ 0 - 5
themis-business/src/main/resources/mapper/TOeExamRecordMapper.xml

@@ -32,12 +32,7 @@
             tee.in_process_liveness_verify as inProcessLivenessVerify,
             tee.in_process_liveness_fixed_range as inProcessLivenessFixedRange,
             tee.in_process_liveness_judge_policy as inProcessLivenessJudgePolicy,
-            tee.in_process_liveness_retry_count as inProcessLivenessRetryCount,
-            tee.client_video_push as clientVideoPush,
-            tee.wxapp_video_push as wxappVideoPush,
             tee.camera_photo_upload as cameraPhotoUpload,
-            tee.wxapp_photo_upload as wxappPhotoUpload,
-            tee.wxapp_video_record as wxappVideoRecord,
             tee.break_expire_seconds as breakExpireSeconds,
             tee.break_resume_count as breakResumeCount,
             toer.duration_seconds as durationSeconds,