From 7ae782207db39ac6bf0899e639f5418ac2781ca0 Mon Sep 17 00:00:00 2001 From: mzh820631607 Date: Fri, 25 Sep 2020 10:54:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E6=B5=8B?= =?UTF-8?q?=E8=AF=84=E6=8F=90=E4=BA=A4=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/EvaluationRecordControllerApi.java | 7 ++-- .../EvaluationRecordController.java | 37 ++++++++++--------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/msdw/tms/api/EvaluationRecordControllerApi.java b/src/main/java/com/msdw/tms/api/EvaluationRecordControllerApi.java index be053af..a6ca51d 100644 --- a/src/main/java/com/msdw/tms/api/EvaluationRecordControllerApi.java +++ b/src/main/java/com/msdw/tms/api/EvaluationRecordControllerApi.java @@ -1,6 +1,7 @@ package com.msdw.tms.api; import com.msdw.tms.common.utils.R; +import com.msdw.tms.entity.vo.EvaluationRecordVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -44,13 +45,13 @@ public interface EvaluationRecordControllerApi { * 上一题 */ @ApiOperation(value = "上一题", notes = "上一题") - R previousQuestion(Integer evaluationRecordId, Integer currentQuestionSortNo, String userAnswer) throws ExecutionException, InterruptedException; + R previousQuestion(EvaluationRecordVO evaluationRecordVO) throws ExecutionException, InterruptedException; /** * 下一题 */ @ApiOperation(value = "下一题", notes = "下一题") - R nextQuestion(Integer evaluationRecordId, Integer currentQuestionSortNo, String userAnswer) throws ExecutionException, InterruptedException; + R nextQuestion(EvaluationRecordVO evaluationRecordVO) throws ExecutionException, InterruptedException; /** * 提交之前查询是否还有未做完的试题 @@ -62,7 +63,7 @@ public interface EvaluationRecordControllerApi { * 提交测评 */ @ApiOperation(value = "提交测评", notes = "提交测评") - R submitEvaluation(Integer evaluationRecordId, Integer currentQuestionSortNo, String userAnswer, Integer userId) throws ExecutionException, InterruptedException; + R submitEvaluation(EvaluationRecordVO evaluationRecordVO) throws ExecutionException, InterruptedException; /** * 成绩详情 diff --git a/src/main/java/com/msdw/tms/controller/EvaluationRecordController.java b/src/main/java/com/msdw/tms/controller/EvaluationRecordController.java index 581f58b..ed792eb 100644 --- a/src/main/java/com/msdw/tms/controller/EvaluationRecordController.java +++ b/src/main/java/com/msdw/tms/controller/EvaluationRecordController.java @@ -58,12 +58,13 @@ public class EvaluationRecordController implements EvaluationRecordControllerApi } @Override - @GetMapping("/previous") - public R previousQuestion(@RequestParam("evaluationRecordId") Integer evaluationRecordId, - @RequestParam("currentQuestionSortNo") Integer currentQuestionSortNo, - @RequestParam(value = "userAnswer", required = false) String userAnswer) throws ExecutionException, InterruptedException { - EvaluationRecordVO evaluationRecordVO = evaluationRecordService.convertQuestion(evaluationRecordId, currentQuestionSortNo, userAnswer, currentQuestionSortNo - 1); - return R.ok().put("data", evaluationRecordVO); + @PostMapping("/previous") + public R previousQuestion(@RequestBody EvaluationRecordVO evaluationRecordVO) throws ExecutionException, InterruptedException { + Integer evaluationRecordId = evaluationRecordVO.getId(); + String userAnswer = evaluationRecordVO.getUserAnswer(); + Integer currentQuestionSortNo = evaluationRecordVO.getCurrentQuestionSortNo(); + EvaluationRecordVO recordVO = evaluationRecordService.convertQuestion(evaluationRecordId, currentQuestionSortNo, userAnswer, currentQuestionSortNo + 1); + return R.ok().put("data", recordVO); } // 备份：上一题/下一题/提交 // @Override @@ -92,12 +93,13 @@ public class EvaluationRecordController implements EvaluationRecordControllerApi // return R.ok().put("data", recordSubmitVO); // } @Override - @GetMapping("/next") - public R nextQuestion(@RequestParam("evaluationRecordId") Integer evaluationRecordId, - @RequestParam("currentQuestionSortNo") Integer currentQuestionSortNo, - @RequestParam(value = "userAnswer", required = false) String userAnswer) throws ExecutionException, InterruptedException { - EvaluationRecordVO evaluationRecordVO = evaluationRecordService.convertQuestion(evaluationRecordId, currentQuestionSortNo, userAnswer, currentQuestionSortNo + 1); - return R.ok().put("data", evaluationRecordVO); + @PostMapping("/next") + public R nextQuestion(@RequestBody EvaluationRecordVO evaluationRecordVO) throws ExecutionException, InterruptedException { + Integer evaluationRecordId = evaluationRecordVO.getId(); + String userAnswer = evaluationRecordVO.getUserAnswer(); + Integer currentQuestionSortNo = evaluationRecordVO.getCurrentQuestionSortNo(); + EvaluationRecordVO recordVO = evaluationRecordService.convertQuestion(evaluationRecordId, currentQuestionSortNo, userAnswer, currentQuestionSortNo + 1); + return R.ok().put("data", recordVO); } @Override @@ -108,11 +110,12 @@ public class EvaluationRecordController implements EvaluationRecordControllerApi } @Override - @GetMapping("/submit") - public R submitEvaluation(@RequestParam("evaluationRecordId") Integer evaluationRecordId, - @RequestParam("currentQuestionSortNo") Integer currentQuestionSortNo, - @RequestParam(value = "userAnswer", required = false) String userAnswer, - @RequestParam("userId") Integer userId) throws ExecutionException, InterruptedException { + @PostMapping("/submit") + public R submitEvaluation(@RequestBody EvaluationRecordVO evaluationRecordVO) throws ExecutionException, InterruptedException { + Integer evaluationRecordId = evaluationRecordVO.getId(); + String userAnswer = evaluationRecordVO.getUserAnswer(); + Integer currentQuestionSortNo = evaluationRecordVO.getCurrentQuestionSortNo(); + Integer userId = evaluationRecordVO.getUserId(); EvaluationRecordSubmitVO recordSubmitVO = evaluationRecordService.submitEvaluation(evaluationRecordId, currentQuestionSortNo, userAnswer, userId); return R.ok().put("data", recordSubmitVO); }