在线练习相关代码重构及优化

examcloud-core-oe-student-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/controller/ExamQuestionController.java

@@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.RestController;
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.commons.util.JsonUtil;
-import cn.com.qmth.examcloud.core.oe.student.base.bean.ExamQuestion;
-import cn.com.qmth.examcloud.core.oe.student.base.bean.ExamRecordQuestions;
+import cn.com.qmth.examcloud.support.examing.ExamQuestion;
+import cn.com.qmth.examcloud.support.examing.ExamRecordQuestions;
 import cn.com.qmth.examcloud.core.oe.student.base.utils.Check;
 import cn.com.qmth.examcloud.core.oe.student.bean.ExamStudentQuestionInfo;
 import cn.com.qmth.examcloud.core.oe.student.service.ExamRecordQuestionsService;

examcloud-core-oe-student-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/controller/ExamRecordPaperStructController.java

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import cn.com.qmth.examcloud.core.oe.student.base.utils.Check;
-import cn.com.qmth.examcloud.core.oe.student.bean.ExamRecordPaperStruct;
+import cn.com.qmth.examcloud.support.examing.ExamRecordPaperStruct;
 import cn.com.qmth.examcloud.core.oe.student.service.ExamRecordPaperStructService;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.Api;

examcloud-core-oe-student-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/provider/ExamRecordDataCloudServiceProvider.java

@@ -5,9 +5,9 @@ import cn.com.qmth.examcloud.core.oe.student.api.ExamRecordDataCloudService;
 import cn.com.qmth.examcloud.core.oe.student.api.bean.*;
 import cn.com.qmth.examcloud.core.oe.student.api.request.*;
 import cn.com.qmth.examcloud.core.oe.student.api.response.*;
-import cn.com.qmth.examcloud.core.oe.student.base.bean.ExamQuestion;
-import cn.com.qmth.examcloud.core.oe.student.base.bean.ExamRecordQuestions;
-import cn.com.qmth.examcloud.core.oe.student.bean.ExamRecordPaperStruct;
+import cn.com.qmth.examcloud.support.examing.ExamQuestion;
+import cn.com.qmth.examcloud.support.examing.ExamRecordQuestions;
+import cn.com.qmth.examcloud.support.examing.ExamRecordPaperStruct;
 import cn.com.qmth.examcloud.core.oe.student.dao.*;
 import cn.com.qmth.examcloud.core.oe.student.dao.entity.*;
 import cn.com.qmth.examcloud.core.oe.student.service.ExamRecordDataService;

examcloud-core-oe-student-base/src/main/java/cn/com/qmth/examcloud/core/oe/student/base/bean/ExamQuestion.java

@@ -1,229 +0,0 @@
-package cn.com.qmth.examcloud.core.oe.student.base.bean;
-
-import java.io.Serializable;
-
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-
-import cn.com.qmth.examcloud.question.commons.core.question.AnswerType;
-import cn.com.qmth.examcloud.question.commons.core.question.QuestionType;
-
-/**
- * @author chenken
- * @date 2018/8/17 10:18
- * @company QMTH
- * @description 考生单题作答记录
- */
-public class ExamQuestion implements Serializable{
-
-    /**
-	 * 
-	 */
-	private static final long serialVersionUID = -6141069483774400912L;
-	
-	/**
-     * 作答记录是否在mongo
-     */
-    private Boolean isInMongo;
-    
-    /**
-     * 作答记录在mongo中的id
-     */
-    private String examQuestionTempId;
-	
-	/**
-	 * 考试记录Data Id
-	 */
-    private Long examRecordDataId;
-    /**
-     * 大题号
-     */
-    private Integer mainNumber;
-    /**
-     * 原题ID
-     */
-    private String questionId;
-    /**
-     * 顺序
-     */
-    private Integer order;
-    /**
-     * 小题分数
-     */
-    private Double questionScore;
-    /**
-     * 小题类型
-     */
-    private QuestionType questionType;
-    /**
-     * 标准答案
-     */
-    private String correctAnswer;
-    /**
-     * 考生作答
-     */
-    private String studentAnswer;
-    /**
-     * 学生小题得分
-     */
-    private Double studentScore;
-    /**
-     * 是否作答
-     */
-    private Boolean isAnswer;
-    /**
-     * 是否标记
-     */
-    private Boolean isSign;
-    
-    /**
-	 * 选项排序值
-	 */
-	private Integer[] optionPermutation;
-	
-	/**
-	 * 音频播放次数
-	 */
-	private String audioPlayTimes;
-	/**
-	 * 题目作答类型
-	 */
-	@Enumerated(EnumType.STRING)
-	private AnswerType answerType;	
-	
-	public Long getExamRecordDataId() {
-		return examRecordDataId;
-	}
-	public void setExamRecordDataId(Long examRecordDataId) {
-		this.examRecordDataId = examRecordDataId;
-	}
-	public Integer getMainNumber() {
-		return mainNumber;
-	}
-	/**
-	 * 设置 大题号
-	 * @param mainNumber
-	 */
-	public void setMainNumber(Integer mainNumber) {
-		this.mainNumber = mainNumber;
-	}
-	public String getQuestionId() {
-		return questionId;
-	}
-	/**
-	 * 设置题库试题ID
-	 * @param questionId
-	 */
-	public void setQuestionId(String questionId) {
-		this.questionId = questionId;
-	}
-	public Integer getOrder() {
-		return order;
-	}
-	/**
-	 * 设置小题号
-	 * @param order
-	 */
-	public void setOrder(Integer order) {
-		this.order = order;
-	}
-	public String getStudentAnswer() {
-		return studentAnswer;
-	}
-	public void setStudentAnswer(String studentAnswer) {
-		this.studentAnswer = studentAnswer;
-	}
-	public Double getStudentScore() {
-		return studentScore;
-	}
-	/**
-	 * 设置考生得分
-	 * @param studentScore
-	 */
-	public void setStudentScore(Double studentScore) {
-		this.studentScore = studentScore;
-	}
-	public Double getQuestionScore() {
-		return questionScore;
-	}
-	/**
-	 * 设置试题分数
-	 * @param questionScore
-	 */
-	public void setQuestionScore(Double questionScore) {
-		this.questionScore = questionScore;
-	}
-	public QuestionType getQuestionType() {
-		return questionType;
-	}
-	/**
-	 * 设置题型
-	 * @param questionType
-	 */
-	public void setQuestionType(QuestionType questionType) {
-		this.questionType = questionType;
-	}
-	public Boolean getIsAnswer() {
-		return isAnswer;
-	}
-	public void setIsAnswer(Boolean isAnswer) {
-		this.isAnswer = isAnswer;
-	}
-	public Boolean getIsSign() {
-		return isSign;
-	}
-	public void setIsSign(Boolean isSign) {
-		this.isSign = isSign;
-	}
-
-	public String getCorrectAnswer() {
-		return correctAnswer;
-	}
-
-	public void setCorrectAnswer(String correctAnswer) {
-		this.correctAnswer = correctAnswer;
-	}
-
-	public Integer[] getOptionPermutation() {
-		return optionPermutation;
-	}
-
-	public void setOptionPermutation(Integer[] optionPermutation) {
-		this.optionPermutation = optionPermutation;
-	}
-
-	public String getAudioPlayTimes() {
-		return audioPlayTimes;
-	}
-
-	public void setAudioPlayTimes(String audioPlayTimes) {
-		this.audioPlayTimes = audioPlayTimes;
-	}
-
-	public AnswerType getAnswerType() {
-		return answerType;
-	}
-
-	public void setAnswerType(AnswerType answerType) {
-		this.answerType = answerType;
-	}
-    
-    public String getExamQuestionTempId() {
-        return examQuestionTempId;
-    }
-    
-    public void setExamQuestionTempId(String examQuestionTempId) {
-        this.examQuestionTempId = examQuestionTempId;
-    }
-    
-    public Boolean getIsInMongo() {
-        return isInMongo;
-    }
-    
-    public void setIsInMongo(Boolean isInMongo) {
-        this.isInMongo = isInMongo;
-    }
-
-	
-	
-}

examcloud-core-oe-student-base/src/main/java/cn/com/qmth/examcloud/core/oe/student/base/bean/ExamRecordQuestions.java

@@ -1,48 +0,0 @@
-package cn.com.qmth.examcloud.core.oe.student.base.bean;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author chenken
- * @date 2018年9月3日 上午10:46:06
- * @company QMTH
- * @description 考试作答试题集合
- */
-public class ExamRecordQuestions implements Serializable {
-    private static final long serialVersionUID = -1688201571728312142L;
-
-    private Long examRecordDataId;
-
-    private Date creationTime;
-
-    private List<ExamQuestion> examQuestions;
-
-    public Long getExamRecordDataId() {
-        return examRecordDataId;
-    }
-
-    public Date getCreationTime() {
-        return creationTime;
-    }
-
-    public void setCreationTime(Date creationTime) {
-        this.creationTime = creationTime;
-    }
-
-    public void setExamRecordDataId(Long examRecordDataId) {
-        this.examRecordDataId = examRecordDataId;
-    }
-
-    
-    public List<ExamQuestion> getExamQuestions() {
-        return examQuestions;
-    }
-
-    
-    public void setExamQuestions(List<ExamQuestion> examQuestions) {
-        this.examQuestions = examQuestions;
-    }
-
-}

examcloud-core-oe-student-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/bean/ExamRecordPaperStruct.java

@@ -1,41 +0,0 @@
-package cn.com.qmth.examcloud.core.oe.student.bean;
-
-import java.io.Serializable;
-
-import cn.com.qmth.examcloud.question.commons.core.paper.DefaultPaper;
-
-/**
- * 
- * @author  	chenken
- * @date    	2018年8月27日 下午3:26:27
- * @company 	QMTH
- * @description ExamRecordPaper.java
- */
-public class ExamRecordPaperStruct implements Serializable{
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -4672132535133881321L;
-
-	private String id;
-	
-	private DefaultPaper defaultPaper;
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public DefaultPaper getDefaultPaper() {
-		return defaultPaper;
-	}
-
-	public void setDefaultPaper(DefaultPaper defaultPaper) {
-		this.defaultPaper = defaultPaper;
-	}
-	
-}

examcloud-core-oe-student-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/service/ExamRecordPaperStructService.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.oe.student.service;
 
-import cn.com.qmth.examcloud.core.oe.student.bean.ExamRecordPaperStruct;
+import cn.com.qmth.examcloud.support.examing.ExamRecordPaperStruct;
 
 /**
  * @author chenken

examcloud-core-oe-student-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/service/ExamRecordQuestionsService.java

@@ -2,8 +2,8 @@ package cn.com.qmth.examcloud.core.oe.student.service;
 
 import java.util.List;
 
-import cn.com.qmth.examcloud.core.oe.student.base.bean.ExamQuestion;
-import cn.com.qmth.examcloud.core.oe.student.base.bean.ExamRecordQuestions;
+import cn.com.qmth.examcloud.support.examing.ExamQuestion;
+import cn.com.qmth.examcloud.support.examing.ExamRecordQuestions;
 import cn.com.qmth.examcloud.core.oe.student.bean.ExamStudentQuestionInfo;
 import cn.com.qmth.examcloud.question.commons.core.paper.DefaultPaper;
 

examcloud-core-oe-student-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/service/impl/ExamControlServiceImpl.java

@@ -45,14 +45,14 @@ import cn.com.qmth.examcloud.commons.util.Util;
 import cn.com.qmth.examcloud.core.oe.admin.api.ExamRecordCloudService;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.GetPartialExamRecordDataReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.GetPartialExamRecordDataResp;
-import cn.com.qmth.examcloud.core.oe.student.base.bean.ExamQuestion;
-import cn.com.qmth.examcloud.core.oe.student.base.bean.ExamRecordQuestions;
+import cn.com.qmth.examcloud.support.examing.ExamQuestion;
+import cn.com.qmth.examcloud.support.examing.ExamRecordQuestions;
 import cn.com.qmth.examcloud.core.oe.student.base.utils.CommonUtil;
 import cn.com.qmth.examcloud.core.oe.student.base.utils.QuestionTypeUtil;
 import cn.com.qmth.examcloud.core.oe.student.bean.CheckExamInProgressInfo;
 import cn.com.qmth.examcloud.core.oe.student.bean.CheckQrCodeInfo;
 import cn.com.qmth.examcloud.core.oe.student.bean.EndExamInfo;
-import cn.com.qmth.examcloud.core.oe.student.bean.ExamRecordPaperStruct;
+import cn.com.qmth.examcloud.support.examing.ExamRecordPaperStruct;
 import cn.com.qmth.examcloud.core.oe.student.bean.GetQrCodeReq;
 import cn.com.qmth.examcloud.core.oe.student.bean.GetUpyunSignatureReq;
 import cn.com.qmth.examcloud.core.oe.student.bean.StartExamInfo;

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

@@ -19,8 +19,8 @@ import cn.com.qmth.examcloud.core.oe.student.api.request.GetExamRecordDataIdsReq
 import cn.com.qmth.examcloud.core.oe.student.api.request.UpdateExamRecordDataBatchNumReq;
 import cn.com.qmth.examcloud.core.oe.student.api.response.CalcExamScoreResp;
 import cn.com.qmth.examcloud.core.oe.student.api.response.CalcFaceBiopsyResultResp;
-import cn.com.qmth.examcloud.core.oe.student.base.bean.ExamQuestion;
-import cn.com.qmth.examcloud.core.oe.student.base.bean.ExamRecordQuestions;
+import cn.com.qmth.examcloud.support.examing.ExamQuestion;
+import cn.com.qmth.examcloud.support.examing.ExamRecordQuestions;
 import cn.com.qmth.examcloud.core.oe.student.base.utils.QuestionTypeUtil;
 import cn.com.qmth.examcloud.core.oe.student.dao.ExamFaceLivenessVerifyRepo;
 import cn.com.qmth.examcloud.core.oe.student.dao.ExamRecordDataRepo;

examcloud-core-oe-student-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/service/impl/ExamRecordPaperStructServiceImpl.java

@@ -3,7 +3,7 @@ package cn.com.qmth.examcloud.core.oe.student.service.impl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import cn.com.qmth.examcloud.core.oe.student.bean.ExamRecordPaperStruct;
+import cn.com.qmth.examcloud.support.examing.ExamRecordPaperStruct;
 import cn.com.qmth.examcloud.core.oe.student.service.ExamRecordPaperStructService;
 import cn.com.qmth.examcloud.support.redis.RedisKeyHelper;
 import cn.com.qmth.examcloud.web.redis.RedisClient;

examcloud-core-oe-student-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/service/impl/ExamRecordQuestionsServiceImpl.java

@@ -16,8 +16,8 @@ import com.google.common.cache.CacheBuilder;
 import cn.com.qmth.examcloud.api.commons.enums.ExamType;
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.commons.util.JsonUtil;
-import cn.com.qmth.examcloud.core.oe.student.base.bean.ExamQuestion;
-import cn.com.qmth.examcloud.core.oe.student.base.bean.ExamRecordQuestions;
+import cn.com.qmth.examcloud.support.examing.ExamQuestion;
+import cn.com.qmth.examcloud.support.examing.ExamRecordQuestions;
 import cn.com.qmth.examcloud.core.oe.student.bean.ExamStudentQuestionInfo;
 import cn.com.qmth.examcloud.core.oe.student.dao.ExamRecordQuestionTempRepo;
 import cn.com.qmth.examcloud.core.oe.student.dao.entity.ExamQuestionTempEntity;