fix: bugs

src/main/java/nju/seec/helper/controller/QuestionController.java

@@ -27,8 +27,6 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
 
-import static nju.seec.helper.controller.QuizController.ChoiceQ;
-import static nju.seec.helper.controller.QuizController.TFQ;
 import static nju.seec.helper.controller.QuizController.objectMapper;
 /**
  * 题库
@@ -51,10 +49,10 @@ public class QuestionController {
     @GetMapping("")
     public Map getQuestionList(LoginUser user, String stem,@PageableDefault(Integer.MAX_VALUE) Pageable pageable) throws JsonProcessingException {
 
-        final Page<QuestionVO> questionList = questionService.getQuestionList(user, stem, pageable);
+        final Page<QuestionVO> page = questionService.getQuestionList(user, stem, pageable);
         Map ret=new LinkedHashMap(2);
-        ret.put("questions",questionList.getContent());
-        ret.put("page",questionList.getPageable());
+        ret.put("questions",page.getContent());
+        ret.put("page",PageResponse.PageInfo.of(page.getNumber()+1, page.getSize(), page.getTotalPages(), Long.valueOf(page.getTotalElements()).intValue()));
         return ret;
     }
 
@@ -93,7 +91,7 @@ public class QuestionController {
     /**
      * 更新题目
      */
-//    @Auth(roles = {UserType.TEACHER}, message = "更新题目")
+    @Auth(roles = {UserType.TEACHER}, message = "更新题目")
     @PutMapping("/{questionId}")
     public QuestionVO updateQuestion(LoginUser user, @RequestBody Map question, @PathVariable("questionId") String questionId) {
 

src/main/java/nju/seec/helper/controller/QuizController.java

@@ -63,7 +63,7 @@ public class QuizController {
             page = quizService.getAllBasicQuizByUser( pageable, state, user.getId());
         }
         quizzes.addAll(page.getContent().stream().map(QuizVO::new).collect(Collectors.toList()));
-        ret.put("page",PageResponse.PageInfo.of(page.getNumber(), page.getSize(), page.getTotalPages(), Long.valueOf(page.getTotalElements()).intValue()));
+        ret.put("page",PageResponse.PageInfo.of(page.getNumber()+1, page.getSize(), page.getTotalPages(), Long.valueOf(page.getTotalElements()).intValue()));
         ret.put("quizzes",quizzes);
         return ret;
     }
@@ -116,7 +116,7 @@ public class QuizController {
     /**
      * 获得测试结果统计
      */
-//    @Auth(roles = {UserType.TEACHER}, message = "获得测试结果统计")
+    @Auth(roles = {UserType.TEACHER}, message = "获得测试结果统计")
     @GetMapping("/{quizId}/result")
     public Map getQuizResult(LoginUser user, @PathVariable("quizId") String quizId) {
         if(quizId==null){
@@ -126,7 +126,7 @@ public class QuizController {
 
         List<QuizResultVO> list= quizService.getQuizResult(Long.valueOf(quizId));
         map.put("message","success");
-        map.put("avarage",list.stream().mapToInt(QuizResultVO::getScore).average());
+        map.put("average",list.stream().mapToInt(QuizResultVO::getScore).average());
         map.put("data",list);
         return map;
     }
@@ -148,18 +148,4 @@ public class QuizController {
         map.put("matchNum",match);
         return map;
     }
-    // --------------------------------stub---------------------------------------
-    static ChoiceQuestionVO ChoiceQ(){
-        Map<String,String> map =new LinkedHashMap<>();
-        map.put("A","This is A");
-        map.put("B","This is B");
-        map.put("C","This is C");
-        map.put("D","This is D");
-        return ChoiceQuestionVO.builder().QuestionId("1").studentAnswer("A").stem("这是一道测试选择题")
-                .pass(true).answer("A").analysis("这里是分析").kind(QuestionKindState.CHOICE).options(map).build();
-    }
-    static TrueOrFalseQuestionVO TFQ(){
-        return TrueOrFalseQuestionVO.builder().QuestionId("2").studentAnswer(true).stem("这是一道测试判断题")
-                .pass(true).answer(false).analysis("这里是分析").kind(QuestionKindState.TRUE_FALSE).build();
-    }
 }