Merge remote-tracking branch 'origin/master'

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;
 
     /**
      * 成绩详情

src/main/java/com/msdw/tms/controller/EvaluationRecordController.java

@@ -58,21 +58,48 @@ public class EvaluationRecordController implements EvaluationRecordControllerApi
     }
 
     @Override
-    @GetMapping("/previous")
+    @PostMapping("/previous")
-    public R previousQuestion(@RequestParam("evaluationRecordId") Integer evaluationRecordId,
+    public R previousQuestion(@RequestBody EvaluationRecordVO evaluationRecordVO) throws ExecutionException, InterruptedException {
-                              @RequestParam("currentQuestionSortNo") Integer currentQuestionSortNo,
+        Integer evaluationRecordId = evaluationRecordVO.getId();
-                              @RequestParam(value = "userAnswer", required = false) String userAnswer) throws ExecutionException, InterruptedException {
+        String userAnswer = evaluationRecordVO.getUserAnswer();
-        EvaluationRecordVO evaluationRecordVO = evaluationRecordService.convertQuestion(evaluationRecordId, currentQuestionSortNo, userAnswer, currentQuestionSortNo - 1);
+        Integer currentQuestionSortNo = evaluationRecordVO.getCurrentQuestionSortNo();
-        return R.ok().put("data", evaluationRecordVO);
+        EvaluationRecordVO recordVO = evaluationRecordService.convertQuestion(evaluationRecordId, currentQuestionSortNo, userAnswer, currentQuestionSortNo + 1);
+        return R.ok().put("data", recordVO);
     }
-
+//        备份：上一题/下一题/提交
+//    @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);
+//    }
+//    @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);
+//    }
+//    @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 {
+//        EvaluationRecordSubmitVO recordSubmitVO = evaluationRecordService.submitEvaluation(evaluationRecordId, currentQuestionSortNo, userAnswer, userId);
+//        return R.ok().put("data", recordSubmitVO);
+//    }
     @Override
-    @GetMapping("/next")
+    @PostMapping("/next")
-    public R nextQuestion(@RequestParam("evaluationRecordId") Integer evaluationRecordId,
+    public R nextQuestion(@RequestBody EvaluationRecordVO evaluationRecordVO) throws ExecutionException, InterruptedException {
-                          @RequestParam("currentQuestionSortNo") Integer currentQuestionSortNo,
+        Integer evaluationRecordId = evaluationRecordVO.getId();
-                          @RequestParam(value = "userAnswer", required = false) String userAnswer) throws ExecutionException, InterruptedException {
+        String userAnswer = evaluationRecordVO.getUserAnswer();
-        EvaluationRecordVO evaluationRecordVO = evaluationRecordService.convertQuestion(evaluationRecordId, currentQuestionSortNo, userAnswer, currentQuestionSortNo + 1);
+        Integer currentQuestionSortNo = evaluationRecordVO.getCurrentQuestionSortNo();
-        return R.ok().put("data", evaluationRecordVO);
+        EvaluationRecordVO recordVO = evaluationRecordService.convertQuestion(evaluationRecordId, currentQuestionSortNo, userAnswer, currentQuestionSortNo + 1);
+        return R.ok().put("data", recordVO);
     }
 
     @Override
@@ -83,11 +110,12 @@ public class EvaluationRecordController implements EvaluationRecordControllerApi
     }
 
     @Override
-    @GetMapping("/submit")
+    @PostMapping("/submit")
-    public R submitEvaluation(@RequestParam("evaluationRecordId") Integer evaluationRecordId,
+    public R submitEvaluation(@RequestBody EvaluationRecordVO evaluationRecordVO) throws ExecutionException, InterruptedException {
-                              @RequestParam("currentQuestionSortNo") Integer currentQuestionSortNo,
+        Integer evaluationRecordId = evaluationRecordVO.getId();
-                              @RequestParam(value = "userAnswer", required = false) String userAnswer,
+        String userAnswer = evaluationRecordVO.getUserAnswer();
-                              @RequestParam("userId") Integer userId) throws ExecutionException, InterruptedException {
+        Integer currentQuestionSortNo = evaluationRecordVO.getCurrentQuestionSortNo();
+        Integer userId = evaluationRecordVO.getUserId();
         EvaluationRecordSubmitVO recordSubmitVO = evaluationRecordService.submitEvaluation(evaluationRecordId, currentQuestionSortNo, userAnswer, userId);
         return R.ok().put("data", recordSubmitVO);
     }

src/main/java/com/msdw/tms/controller/UserController.java

@@ -40,6 +40,7 @@ public class UserController implements UserControllerApi {
         return R.ok().put("growthChangeHistory", userEntity);
     }
 
+    @Override
     @GetMapping("/userinfo/{id}")
     public R userInfo(@PathVariable("id") Integer id){
         UserEntityVo userEntityVo = userService.queryUserId(id);
@@ -59,6 +60,7 @@ public class UserController implements UserControllerApi {
     /**
      * 修改
      */
+    @Override
     @PutMapping("/update")
     public R update(@RequestBody UserEntity userEntity){
         userService.updateById(userEntity);

src/main/resources/mapper/tms/UserDao.xml

@@ -3,13 +3,13 @@
 
 <mapper namespace="com.msdw.tms.dao.UserDao">
 
-    <select id="getByUserId" parameterType="com.msdw.tms.entity.UserEntity" resultType="com.msdw.tms.entity.vo.ExperimentalTeachingEntityVO">
+    <select id="getByUserId" parameterType="com.msdw.tms.entity.UserEntity" resultType="com.msdw.tms.entity.vo.UserEntityVo">
         SELECT
             userName,
             sex,
             countries,
             p.provinceName as provinceName,
-            c.cityName as provinceName,
+            c.cityName as cityName,
             IDNumber,
             educationDegree,
             schoolName,