xiatian пре 4 година
родитељ
комит
8cbf83419e

+ 20 - 0
themis-business/src/main/java/com/qmth/themis/business/bean/exam/AnswerSubmitBean.java

@@ -0,0 +1,20 @@
+package com.qmth.themis.business.bean.exam;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel("提交作答结果返回信息")
+public class AnswerSubmitBean {
+	@ApiModelProperty("updateTime")
+	private Long version;
+
+	public Long getVersion() {
+		return version;
+	}
+
+	public void setVersion(Long version) {
+		this.version = version;
+	}
+
+
+}

+ 21 - 0
themis-business/src/main/java/com/qmth/themis/business/bean/exam/AudioLeftPlayCountSubmitBean.java

@@ -0,0 +1,21 @@
+package com.qmth.themis.business.bean.exam;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel("更新音频剩余播放次数返回信息")
+public class AudioLeftPlayCountSubmitBean {
+	@ApiModelProperty("updateTime")
+	private Integer count;
+
+	public Integer getCount() {
+		return count;
+	}
+
+	public void setCount(Integer count) {
+		this.count = count;
+	}
+
+
+
+}

+ 4 - 2
themis-business/src/main/java/com/qmth/themis/business/service/TEExamService.java

@@ -7,6 +7,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.themis.business.bean.exam.AnswerSubmitBean;
+import com.qmth.themis.business.bean.exam.AudioLeftPlayCountSubmitBean;
 import com.qmth.themis.business.bean.exam.ExamFileUploadBean;
 import com.qmth.themis.business.bean.exam.ExamFinishBean;
 import com.qmth.themis.business.bean.exam.ExamPrepareBean;
@@ -92,7 +94,7 @@ public interface TEExamService extends IService<TEExam> {
 	 * @param durationSeconds
 	 * @return
 	 */
-	public Long answerSubmit(Long studentId, Long recordId, Integer mainNumber, Integer subNumber, Integer subIndex,
+	public AnswerSubmitBean answerSubmit(Long studentId, Long recordId, Integer mainNumber, Integer subNumber, Integer subIndex,
 			String answer, Long version, Integer durationSeconds);
 
 	/**更新音频剩余播放次数
@@ -102,7 +104,7 @@ public interface TEExamService extends IService<TEExam> {
 	 * @param count
 	 * @return
 	 */
-	public Integer audioLeftPlayCountSubmit(Long studentId, Long recordId, String key, Integer count);
+	public AudioLeftPlayCountSubmitBean audioLeftPlayCountSubmit(Long studentId, Long recordId, String key, Integer count);
 
 	
 	/**文件上传

+ 10 - 5
themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamServiceImpl.java

@@ -25,6 +25,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.themis.business.bean.exam.AnswerSubmitBean;
+import com.qmth.themis.business.bean.exam.AudioLeftPlayCountSubmitBean;
 import com.qmth.themis.business.bean.exam.ExamFileUploadBean;
 import com.qmth.themis.business.bean.exam.ExamFinishBean;
 import com.qmth.themis.business.bean.exam.ExamPrepareBean;
@@ -358,7 +360,7 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
      * 提交作答结果
      */
     @Override
-    public Long answerSubmit(Long studentId, Long recordId, Integer mainNumber, Integer subNumber, Integer subIndex,
+    public AnswerSubmitBean answerSubmit(Long studentId, Long recordId, Integer mainNumber, Integer subNumber, Integer subIndex,
                              String answer, Long version, Integer durationSeconds) {
 
         // 校验当前登录用户和参数一致性
@@ -401,14 +403,16 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
                 RedisKeyHelper.examAnswerHashKey(mainNumber, subNumber, subIndex), answerCache);
         // 重置考试记录客观题得分
         ExamRecordCacheUtil.setObjectiveScore(recordId, null);
-        return version;
+        AnswerSubmitBean ret=new AnswerSubmitBean();
+        ret.setVersion(version);
+        return ret;
     }
 
     /**
      * 更新音频剩余播放次数
      */
     @Override
-    public Integer audioLeftPlayCountSubmit(Long studentId, Long recordId, String key, Integer count) {
+    public AudioLeftPlayCountSubmitBean audioLeftPlayCountSubmit(Long studentId, Long recordId, String key, Integer count) {
 
         // 校验当前登录用户和参数一致性
         if (ExamRecordCacheUtil.getId(recordId) == null) {
@@ -426,8 +430,9 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
 
         // 音频剩余播放次数缓存
         redisUtil.set(RedisKeyHelper.audioLeftPlayCountKey(recordId), key, count);
-
-        return count;
+        AudioLeftPlayCountSubmitBean ret=new AudioLeftPlayCountSubmitBean();
+        ret.setCount(count);
+        return ret;
     }
 
     /**

+ 2 - 1
themis-exam/src/main/java/com/qmth/themis/exam/api/TEExamController.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.qmth.themis.business.bean.exam.AnswerSubmitBean;
 import com.qmth.themis.business.bean.exam.AnswerSubmitParamBean;
 import com.qmth.themis.business.bean.exam.AudioLeftPlayCountSubmitParamBean;
 import com.qmth.themis.business.bean.exam.ExamStartParamBean;
@@ -183,7 +184,7 @@ public class TEExamController {
 			if (param.getVersion() == null) {
 				throw new BusinessException("时间戳不能为空");
 			}
-			Long ret = teExamService.answerSubmit(teStudent.getId(), param.getRecordId(), param.getMainNumber(),
+			AnswerSubmitBean ret = teExamService.answerSubmit(teStudent.getId(), param.getRecordId(), param.getMainNumber(),
 					param.getSubNumber(), param.getSubIndex(), param.getAnswer(), param.getVersion(),
 					param.getDurationSeconds());
 			// 发消息计算客观分