Merge remote-tracking branch 'origin/iterator3'

src/main/java/nju/seec/helper/aspect/auth/Auth.java

@@ -13,5 +13,5 @@ import java.lang.annotation.*;
 public @interface Auth {
     UserType[] roles() default {};
 
-    String message();
+    String message() default "";
 }

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

@@ -44,9 +44,9 @@ public class CommentController {
      */
     @Auth(roles = {UserType.TEACHER, UserType.STUDENT}, message = "删除评论")
     @DeleteMapping("/{commentId}")
-    public void removeComment(LoginUser user,
+    public void deleteComment(LoginUser user,
                               @PathVariable Long commentId) {
-        commentService.removeComment(user, commentId);
+        commentService.deleteComment(user, commentId);
     }
 
     /**

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

@@ -6,6 +6,7 @@ import nju.seec.helper.util.exception.HelperException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.BindException;
+import org.springframework.web.HttpRequestMethodNotSupportedException;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
@@ -40,6 +41,11 @@ public class ControllerAdvice {
         return ResponseEntity.badRequest().body(ErrorResponse.of(Objects.requireNonNull(e.getFieldError()).getDefaultMessage()));
     }
 
+    @ExceptionHandler(HttpRequestMethodNotSupportedException.class)
+    public ResponseEntity<ErrorResponse> handleHttpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException e) {
+        return ResponseEntity.status(405).body(ErrorResponse.of(e.getLocalizedMessage()));
+    }
+
     @ExceptionHandler(HelperException.class)
     public ResponseEntity<ErrorResponse> handleHelperException(HelperException e) {
         return ResponseEntity.status(e.getType().getStatus()).body(ErrorResponse.of(e.getMsg()));

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

@@ -45,9 +45,9 @@ public class CourseController {
      */
     @Auth(roles = UserType.TEACHER, message = "删除课程")
     @DeleteMapping("/{courseId}")
-    public void removeCourse(LoginUser user,
+    public void deleteCourse(LoginUser user,
                              @PathVariable Long courseId) {
-        courseService.removeCourse(user, courseId);
+        courseService.deleteCourse(user, courseId);
     }
 
     /**

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

@@ -43,7 +43,7 @@ public class NoticeController {
 
     @Auth(roles = UserType.TEACHER, message = "删除公告")
     @DeleteMapping("/{noticeId}")
-    public void removeNotice(LoginUser user,
+    public void deleteNotice(LoginUser user,
                              @PathVariable Long noticeId) {
         noticeService.deleteNotice(user, noticeId);
     }

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

@@ -2,15 +2,20 @@ package nju.seec.helper.controller;
 
 import nju.seec.helper.aspect.auth.Auth;
 import nju.seec.helper.controller.response.PageResponse;
+import nju.seec.helper.dto.groups.Create;
+import nju.seec.helper.dto.groups.Modify;
+import nju.seec.helper.dto.question.BaseQuestionDTO;
 import nju.seec.helper.dto.user.LoginUser;
 import nju.seec.helper.service.QuestionService;
 import nju.seec.helper.util.enums.UserType;
 import nju.seec.helper.vo.question.BaseQuestionVO;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * 题库
@@ -49,63 +54,38 @@ public class QuestionController {
 
     @Auth(roles = UserType.TEACHER, message = "获取题目信息")
     @GetMapping("/{questionId}")
-    public BaseQuestionVO getOneQuestion(LoginUser user, @PathVariable("questionId") String questionId) {
+    public BaseQuestionVO getOneQuestion(LoginUser user, @PathVariable String questionId) {
         return questionService.getOneQuestion(user, questionId);
     }
 
-//    @Auth(roles = UserType.TEACHER, message = "创建题目")
-//    @PostMapping
-//    public BaseQuestionVO createQuestion(LoginUser user, @Validated @RequestBody BaseQuestionDTO baseQuestionDTO) {
-//        return questionService.createQuestion(user, baseQuestionDTO);
-//    }
-
-//    /**
-//     * 获得题目列表
-//     */
-//    @Auth(roles = {UserType.TEACHER}, message = "获得题目详情")
-//    @GetMapping("/{questionId}")
-//    public BaseQuestionVO getQuestion(LoginUser user, @PathVariable("questionId") String questionId) throws JsonProcessingException {
-//        return questionService.getQuestion(questionId);
-//    }
-
+    @Auth(roles = UserType.TEACHER, message = "创建题目")
+    @PostMapping
+    public BaseQuestionVO createQuestion(LoginUser user, @Validated(Create.class) @RequestBody BaseQuestionDTO baseQuestionDTO) {
+        return questionService.createQuestion(user, baseQuestionDTO);
+    }
 
-//    /**
-//     * 创建题目
-//     */
-//    @Auth(roles = {UserType.TEACHER}, message = "创建题目")
-//    @PostMapping
-//    public BaseQuestionVO postQuestion(LoginUser user, @RequestBody Map question) {
-//        if (question.get("kind") == null) {
-//            throw HelperException.of(ExceptionType.PARAM_ERROR, "无类型");
-//        }
-//
-//        return questionService.newQuestion(BaseQuestionVO.parse(question));
-//    }
+    @Auth(roles = UserType.TEACHER, message = "修改题目")
+    @PutMapping("/{questionId}")
+    public BaseQuestionVO modifyQuestion(LoginUser user, @PathVariable String questionId, @Validated(Modify.class) @RequestBody BaseQuestionDTO baseQuestionDTO) {
+        return questionService.modifyQuestion(user, questionId, baseQuestionDTO);
+    }
 
-//    /**
-//     * 更新题目
-//     */
-//    @Auth(roles = {UserType.TEACHER}, message = "更新题目")
-//    @PutMapping("/{questionId}")
-//    public BaseQuestionVO updateQuestion(LoginUser user, @RequestBody Map question, @PathVariable("questionId") String questionId) {
-//        if (question.get("kind") == null) {
-//            throw HelperException.of(ExceptionType.PARAM_ERROR, "无类型");
-//        }
-//
-//        return questionService.updateQuestion(BaseQuestionVO.parse(question));
-//    }
+    @Auth(roles = UserType.TEACHER, message = "删除题目")
+    @DeleteMapping("/{questionId}")
+    public void deleteQuestion(LoginUser user, @PathVariable String questionId) {
+        questionService.deleteQuestion(user, questionId);
+    }
 
+    @Auth(roles = UserType.TEACHER, message = "获取创建的题目")
+    @GetMapping("/created")
+    public PageResponse<BaseQuestionVO> getCreatedQuestions(LoginUser user,
+                                                            @PageableDefault(size = Integer.MAX_VALUE) Pageable pageable) {
+        return PageResponse.of(questionService.getCreatedQuestions(user, pageable));
+    }
 
-//    /**
-//     * 删除题目
-//     */
-//    @Auth(roles = {UserType.TEACHER}, message = "删除题目")
-//    @DeleteMapping("/{questionId}")
-//    public Map deleteQuestion(LoginUser user, @PathVariable("questionId") String questionId) {
-//
-//        questionService.deleteQuestion(questionId);
-//        Map map = new HashMap();
-//        map.put("message", "success");
-//        return map;
-//    }
+    @Auth(roles = UserType.TEACHER)
+    @GetMapping("/created/ids")
+    public Set<String> getIdsOfCreatedQuestions(LoginUser user) {
+        return questionService.getIdsOfCreatedQuestions(user);
+    }
 }

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

@@ -36,8 +36,8 @@ public class ReplyController {
      */
     @Auth(roles = UserType.TEACHER, message = "删除回复")
     @DeleteMapping("/{replyId}")
-    public void removeReply(LoginUser user,
+    public void deleteReply(LoginUser user,
                             @PathVariable Long replyId) {
-        replyService.removeReply(user, replyId);
+        replyService.deleteReply(user, replyId);
     }
 }

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

@@ -80,9 +80,9 @@ public class SlideController {
      */
     @Auth(roles = UserType.TEACHER, message = "删除课件")
     @DeleteMapping("/{slideId}")
-    public void removeSlide(LoginUser user,
+    public void deleteSlide(LoginUser user,
                             @PathVariable Long slideId) {
-        slideService.removeSlide(user, slideId);
+        slideService.deleteSlide(user, slideId);
     }
 
     /**

src/main/java/nju/seec/helper/dao/QuestionRecordDAO.java

@@ -0,0 +1,52 @@
+package nju.seec.helper.dao;
+
+import nju.seec.helper.entity.QuestionRecord;
+import nju.seec.helper.entity.User;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.Optional;
+import java.util.Set;
+
+/**
+ * @author cst
+ */
+public interface QuestionRecordDAO extends JpaRepository<QuestionRecord, Long> {
+    /**
+     * 基于老师和问题查询
+     *
+     * @param user
+     * @param questionId
+     * @return
+     */
+    Optional<QuestionRecord> findByTeacherAndQuestionId(User user, String questionId);
+
+    /**
+     * 查询是否创建该问题ID
+     *
+     * @param questionId
+     * @return
+     */
+    boolean existsByQuestionId(String questionId);
+
+    /**
+     * 分页查询老师创建的题目ID
+     *
+     * @param teacher
+     * @param pageable
+     * @return
+     */
+    @Query("select record.questionId from QuestionRecord record where record.teacher=?1")
+    Page<String> findQuestionIdsByTeacher(User teacher, Pageable pageable);
+
+    /**
+     * 查询老师创建的题目id
+     *
+     * @param teacher
+     * @return
+     */
+    @Query("select record.questionId from QuestionRecord record where record.teacher=?1")
+    Set<String> findQuestionIdsByTeacher(User teacher);
+}

src/main/java/nju/seec/helper/dto/question/BaseQuestionDTO.java

@@ -8,6 +8,7 @@ import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.Set;
 
 /**
  * @author cst
@@ -24,8 +25,8 @@ import javax.validation.constraints.NotNull;
         @JsonSubTypes.Type(value = TrueOrFalseQuestionDTO.class, name = BaseQuestionDTO.TRUE_FALSE)
 })
 public abstract class BaseQuestionDTO {
-    protected static final String CHOICE = "CHOICE";
-    protected static final String TRUE_FALSE = "TRUE_FALSE";
+    protected static final String CHOICE = "choice";
+    protected static final String TRUE_FALSE = "true_false";
 
     @NotBlank(message = "题干不能为空")
     @Length(max = 1000, message = "题干长度不能超过1000")
@@ -35,4 +36,8 @@ public abstract class BaseQuestionDTO {
     @NotNull(message = "缺少题目类型", groups = Create.class)
     protected String type;
 
+    protected String keyPoints;
+    protected Set<String> tags;
+    protected Set<String> knowledgeId;
+
 }

src/main/java/nju/seec/helper/dto/question/SubjectiveQuestionDTO.java

@@ -1,21 +0,0 @@
-//package nju.seec.helper.dto.question;
-//
-//import lombok.Data;
-//import lombok.EqualsAndHashCode;
-//import nju.seec.helper.util.enums.QuestionType;
-//
-//import java.io.Serializable;
-//
-///**
-// * @author cst
-// */
-//@EqualsAndHashCode(callSuper = true)
-//@Data
-//public class SubjectiveQuestionDTO extends BaseQuestionDTO implements Serializable {
-//    private static final long serialVersionUID = -4391297345486351815L;
-//
-//    @Override
-//    public QuestionType getQuestionType() {
-//        return QuestionType.SUBJECTIVE;
-//    }
-//}

src/main/java/nju/seec/helper/entity/QuestionRecord.java

@@ -0,0 +1,27 @@
+package nju.seec.helper.entity;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.persistence.*;
+
+/**
+ * @author cst
+ */
+@Data
+@Accessors(chain = true)
+@Entity
+@Table(name = "question_record", indexes = @Index(name = "question_record_question", columnList = "question_id"),
+        uniqueConstraints = @UniqueConstraint(name = "teacher_question_unique", columnNames = {"teacher_id", "question_id"}))
+public class QuestionRecord {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne(cascade = {CascadeType.DETACH, CascadeType.MERGE, CascadeType.REFRESH}, fetch = FetchType.LAZY)
+    @JoinColumn(name = "teacher_id", foreignKey = @ForeignKey(name = "question_teacher"))
+    private User teacher;
+
+    @Column(name = "question_id", nullable = false)
+    private String questionId;
+}

src/main/java/nju/seec/helper/entity/Quiz.java

@@ -36,15 +36,15 @@ public class Quiz {
     private String name;
 
     @ManyToOne(cascade = {CascadeType.DETACH, CascadeType.MERGE, CascadeType.REFRESH}, fetch = FetchType.LAZY)
-    @JoinColumn(name = "course_id", referencedColumnName = "id", foreignKey = @ForeignKey(name = "quiz_course"))
+    @JoinColumn(name = "course_id", foreignKey = @ForeignKey(name = "quiz_course"))
     private Course course;
 
     @ManyToOne(cascade = {CascadeType.DETACH, CascadeType.MERGE, CascadeType.REFRESH}, fetch = FetchType.LAZY)
-    @JoinColumn(name = "slide_id", referencedColumnName = "id", foreignKey = @ForeignKey(name = "quiz_slide"))
+    @JoinColumn(name = "slide_id", foreignKey = @ForeignKey(name = "quiz_slide"))
     private Slide slide;
 
     @ManyToOne(cascade = {CascadeType.DETACH, CascadeType.MERGE, CascadeType.REFRESH}, fetch = FetchType.LAZY)
-    @JoinColumn(name = "teacher_id", referencedColumnName = "id", foreignKey = @ForeignKey(name = "quiz_teacher"))
+    @JoinColumn(name = "teacher_id", foreignKey = @ForeignKey(name = "quiz_teacher"))
     private User teacher;
 
     @Convert(converter = ListConverter.class)

src/main/java/nju/seec/helper/entity/QuizStudentAnswer.java

@@ -31,11 +31,11 @@ public class QuizStudentAnswer {
     private Long id;
 
     @ManyToOne(cascade = {CascadeType.DETACH, CascadeType.MERGE, CascadeType.REFRESH}, fetch = FetchType.LAZY)
-    @JoinColumn(name = "quiz_id", referencedColumnName = "id", foreignKey = @ForeignKey(name = "answer_quiz"))
+    @JoinColumn(name = "quiz_id", foreignKey = @ForeignKey(name = "answer_quiz"))
     private Quiz quiz;
 
     @ManyToOne(cascade = {CascadeType.DETACH, CascadeType.MERGE, CascadeType.REFRESH}, fetch = FetchType.LAZY)
-    @JoinColumn(name = "student_id", referencedColumnName = "id", foreignKey = @ForeignKey(name = "answer_student"))
+    @JoinColumn(name = "student_id", foreignKey = @ForeignKey(name = "answer_student"))
     private User student;
 
     @SuppressWarnings("all")

src/main/java/nju/seec/helper/service/CommentService.java

@@ -25,7 +25,7 @@ public interface CommentService {
      * @param user
      * @param commentId
      */
-    void removeComment(LoginUser user, Long commentId);
+    void deleteComment(LoginUser user, Long commentId);
 
     /**
      * 置顶评论

src/main/java/nju/seec/helper/service/CourseFileService.java

@@ -24,7 +24,7 @@ public interface CourseFileService {
      * @param user
      * @param courseFileId
      */
-    void deleteCourseFile(LoginUser user, Long courseFileId);
+    void  deleteCourseFile(LoginUser user, Long courseFileId);
 
     /**
      * 取得课程附件

src/main/java/nju/seec/helper/service/CourseService.java

@@ -37,7 +37,7 @@ public interface CourseService {
      * @param user
      * @param courseId
      */
-    void removeCourse(LoginUser user, Long courseId);
+    void deleteCourse(LoginUser user, Long courseId);
 
     /**
      * 学生选课

src/main/java/nju/seec/helper/service/MessageService.java

@@ -29,7 +29,7 @@ public interface MessageService {
      * @param user
      * @param messageDTO
      */
-    void deleteMessages(LoginUser user, MessageDTO messageDTO);
+    void  deleteMessages(LoginUser user, MessageDTO messageDTO);
 
     /**
      * 设置消息已阅

src/main/java/nju/seec/helper/service/NoticeService.java

@@ -46,7 +46,7 @@ public interface NoticeService {
      * @param user
      * @param noticeId
      */
-    void deleteNotice(LoginUser user, Long noticeId);
+    void  deleteNotice(LoginUser user, Long noticeId);
 
     /**
      * 取得某一公告

src/main/java/nju/seec/helper/service/QuestionService.java

@@ -1,5 +1,6 @@
 package nju.seec.helper.service;
 
+import nju.seec.helper.dto.question.BaseQuestionDTO;
 import nju.seec.helper.dto.user.LoginUser;
 import nju.seec.helper.entity.Quiz;
 import nju.seec.helper.vo.question.BaseQuestionVO;
@@ -7,6 +8,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * @author xst
@@ -49,4 +51,48 @@ public interface QuestionService {
      * @return
      */
     BaseQuestionVO getOneQuestion(LoginUser user, String questionId);
+
+    /**
+     * 创建题目
+     *
+     * @param user
+     * @param baseQuestionDTO
+     * @return
+     */
+    BaseQuestionVO createQuestion(LoginUser user, BaseQuestionDTO baseQuestionDTO);
+
+    /**
+     * 修改题目
+     *
+     * @param user
+     * @param questionId
+     * @param baseQuestionDTO
+     * @return
+     */
+    BaseQuestionVO modifyQuestion(LoginUser user, String questionId, BaseQuestionDTO baseQuestionDTO);
+
+    /**
+     * 删除题目
+     *
+     * @param user
+     * @param questionId
+     */
+    void deleteQuestion(LoginUser user, String questionId);
+
+    /**
+     * 获取创建的题目
+     *
+     * @param user
+     * @param pageable
+     * @return
+     */
+    Page<BaseQuestionVO> getCreatedQuestions(LoginUser user, Pageable pageable);
+
+    /**
+     * 获取创建题目的id
+     *
+     * @param user
+     * @return
+     */
+    Set<String> getIdsOfCreatedQuestions(LoginUser user);
 }

src/main/java/nju/seec/helper/service/QuizService.java

@@ -44,7 +44,7 @@ public interface QuizService {
      * @param quizId
      * @return
      */
-    void deleteQuiz(LoginUser user, Long quizId);
+    void  deleteQuiz(LoginUser user, Long quizId);
 
     /**
      * 教师基于课件获取测试

src/main/java/nju/seec/helper/service/ReplyService.java

@@ -23,5 +23,5 @@ public interface ReplyService {
      * @param user
      * @param replyId
      */
-    void removeReply(LoginUser user, Long replyId);
+    void deleteReply(LoginUser user, Long replyId);
 }

src/main/java/nju/seec/helper/service/SlideService.java

@@ -55,7 +55,7 @@ public interface SlideService {
      * @param user
      * @param slideId
      */
-    void removeSlide(LoginUser user, Long slideId);
+    void deleteSlide(LoginUser user, Long slideId);
 
     /**
      * 教师获取课件列表

src/main/java/nju/seec/helper/service/impl/CommentServiceImpl.java

@@ -61,13 +61,13 @@ public class CommentServiceImpl implements CommentService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void removeComment(LoginUser user, Long commentId) {
+    public void deleteComment(LoginUser user, Long commentId) {
         Comment comment = commentDAO.findCommentById(commentId);
 
         AuthUtils.checkDataAuth(user.getId(), comment.getUser().getId(), "您无权删除该评论");
 
         unTopComment(comment);
-        commentDAO.deleteById(commentId);
+        commentDAO.delete(comment);
     }
 
     @Transactional(rollbackFor = Exception.class)

src/main/java/nju/seec/helper/service/impl/CourseFileServiceImpl.java

@@ -81,7 +81,7 @@ public class CourseFileServiceImpl implements CourseFileService {
     public void deleteCourseFile(LoginUser user, Long courseFileId) {
         CourseFile courseFile = courseFileDAO.findCourseFileById(courseFileId);
         AuthUtils.checkDataAuth(user.getId(), courseFile.getTeacherId(), "您无权删除该附件");
-        courseFileDAO.deleteById(courseFileId);
+        courseFileDAO.delete(courseFile);
         fileUtils.delete(courseFile.getObjectName());
     }
 

src/main/java/nju/seec/helper/service/impl/CourseServiceImpl.java

@@ -73,7 +73,7 @@ public class CourseServiceImpl implements CourseService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void removeCourse(LoginUser user, Long courseId) {
+    public void deleteCourse(LoginUser user, Long courseId) {
         Course course = courseDAO.findCourseById(courseId);
         AuthUtils.checkDataAuth(user.getId(), course.getTeacher().getId(), "您无权删除该课程");
 

src/main/java/nju/seec/helper/service/impl/NoticeServiceImpl.java

@@ -76,7 +76,7 @@ public class NoticeServiceImpl implements NoticeService {
     public void deleteNotice(LoginUser user, Long noticeId) {
         Notice notice = noticeDAO.findNoticeById(noticeId);
         AuthUtils.checkDataAuth(user.getId(), notice.getTeacherId(), "您无权删除该公告");
-        noticeDAO.deleteById(noticeId);
+        noticeDAO.delete(notice);
     }
 
     @Transactional(readOnly = true)

src/main/java/nju/seec/helper/service/impl/QuestionServiceImpl.java

@@ -1,21 +1,31 @@
 package nju.seec.helper.service.impl;
 
+import nju.seec.helper.dao.QuestionRecordDAO;
 import nju.seec.helper.dao.QuizDAO;
 import nju.seec.helper.dao.UserDAO;
+import nju.seec.helper.dto.question.BaseQuestionDTO;
 import nju.seec.helper.dto.user.LoginUser;
+import nju.seec.helper.entity.QuestionRecord;
 import nju.seec.helper.entity.Quiz;
 import nju.seec.helper.service.QuestionService;
 import nju.seec.helper.util.BokUtil;
+import nju.seec.helper.util.enums.ExceptionType;
 import nju.seec.helper.util.enums.QuizState;
 import nju.seec.helper.util.enums.UserType;
+import nju.seec.helper.util.exception.HelperException;
 import nju.seec.helper.vo.question.BaseQuestionVO;
+import nju.seec.helper.vo.question.BokQuestion;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
 
 /**
  * @author xst
@@ -26,21 +36,23 @@ import java.util.List;
 public class QuestionServiceImpl implements QuestionService {
     private final QuizDAO quizDAO;
     private final UserDAO userDAO;
+    private final QuestionRecordDAO questionRecordDAO;
 
     private final BokUtil bokUtil;
 
     @Autowired
     public QuestionServiceImpl(QuizDAO quizDAO
             , UserDAO userDAO
-            , BokUtil bokUtil) {
+            , QuestionRecordDAO questionRecordDAO, BokUtil bokUtil) {
         this.quizDAO = quizDAO;
         this.userDAO = userDAO;
+        this.questionRecordDAO = questionRecordDAO;
         this.bokUtil = bokUtil;
     }
 
     @Override
     public Page<BaseQuestionVO> getQuestions(LoginUser user, String stem, Pageable pageable) {
-        return bokUtil.bokFindByStemLike(stem, pageable, true);
+        return bokUtil.bokFindByStemLike(stem, pageable).map(bokQuestion -> BaseQuestionVO.convertBokQuestionToVO(bokQuestion, true));
     }
 
     @Transactional(readOnly = true)
@@ -48,19 +60,82 @@ public class QuestionServiceImpl implements QuestionService {
     public List<BaseQuestionVO> getQuestionsByQuiz(LoginUser user, Long quizId) {
         Quiz quiz = quizDAO.findQuizById(quizId);
         List<String> questionIds = quiz.getQuestions();
-        return bokUtil.bokFindByIdIn(questionIds, quiz.getState() == QuizState.CLOSED || user.getType() == UserType.TEACHER);
+        return bokUtil.bokFindByIdIn(questionIds)
+                .stream()
+                .map(bokQuestion -> BaseQuestionVO.convertBokQuestionToVO(bokQuestion, quiz.getState() == QuizState.CLOSED || user.getType() == UserType.TEACHER))
+                .collect(Collectors.toList());
     }
 
     @Transactional(readOnly = true)
     @Override
     public List<BaseQuestionVO> getQuestionsByQuiz(Quiz quiz) {
         List<String> questionIds = quiz.getQuestions();
-        return bokUtil.bokFindByIdIn(questionIds, true);
+        return bokUtil.bokFindByIdIn(questionIds)
+                .stream()
+                .map(bokQuestion -> BaseQuestionVO.convertBokQuestionToVO(bokQuestion, true))
+                .collect(Collectors.toList());
     }
 
-    @Transactional(readOnly = true)
     @Override
     public BaseQuestionVO getOneQuestion(LoginUser user, String questionId) {
-        return bokUtil.bokFindById(questionId, true);
+        return BaseQuestionVO.convertBokQuestionToVO(bokUtil.bokFindById(questionId), true);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public BaseQuestionVO createQuestion(LoginUser user, BaseQuestionDTO baseQuestionDTO) {
+        String questionId;
+        do {
+            // 保证不产生重复QuestionId
+            questionId = UUID.randomUUID().toString().replaceAll("-", "");
+        } while (questionRecordDAO.existsByQuestionId(questionId));
+
+        BokQuestion bokQuestion = bokUtil.createQuestion(questionId, baseQuestionDTO);
+        QuestionRecord questionRecord = new QuestionRecord()
+                .setTeacher(userDAO.findUserById(user.getId()))
+                .setQuestionId(bokQuestion.getId());
+        questionRecordDAO.save(questionRecord);
+        return BaseQuestionVO.convertBokQuestionToVO(bokQuestion, true);
+    }
+
+    @Transactional(readOnly = true)
+    @Override
+    public BaseQuestionVO modifyQuestion(LoginUser user, String questionId, BaseQuestionDTO baseQuestionDTO) {
+        QuestionRecord questionRecord = questionRecordDAO.findByTeacherAndQuestionId(userDAO.findUserById(user.getId()), questionId)
+                .orElseThrow(() -> HelperException.of(ExceptionType.FORBIDDEN, "您无权修改该问题"));
+        BokQuestion bokQuestion = bokUtil.modifyQuestion(questionId, baseQuestionDTO);
+        questionRecordDAO.save(questionRecord);
+        return BaseQuestionVO.convertBokQuestionToVO(bokQuestion, true);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void deleteQuestion(LoginUser user, String questionId) {
+        QuestionRecord questionRecord = questionRecordDAO.findByTeacherAndQuestionId(userDAO.findUserById(user.getId()), questionId)
+                .orElseThrow(() -> HelperException.of(ExceptionType.FORBIDDEN, "您无权删除该问题"));
+        bokUtil.deleteQuestion(questionId);
+        questionRecordDAO.delete(questionRecord);
+    }
+
+    @Transactional(readOnly = true)
+    @Override
+    public Page<BaseQuestionVO> getCreatedQuestions(LoginUser user, Pageable pageable) {
+        Page<String> questionIdPage = questionRecordDAO
+                .findQuestionIdsByTeacher(userDAO.findUserById(user.getId()), pageable);
+
+        return new PageImpl<>(
+                bokUtil.bokFindByIdIn(questionIdPage.getContent())
+                        .stream()
+                        .map(bokQuestion -> BaseQuestionVO.convertBokQuestionToVO(bokQuestion, true))
+                        .collect(Collectors.toList())
+                , pageable
+                , questionIdPage.getTotalElements()
+        );
+    }
+
+    @Transactional(readOnly = true)
+    @Override
+    public Set<String> getIdsOfCreatedQuestions(LoginUser user) {
+        return questionRecordDAO.findQuestionIdsByTeacher(userDAO.findUserById(user.getId()));
     }
 }

src/main/java/nju/seec/helper/service/impl/ReplyServiceImpl.java

@@ -71,7 +71,7 @@ public class ReplyServiceImpl implements ReplyService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void removeReply(LoginUser user, Long replyId) {
+    public void deleteReply(LoginUser user, Long replyId) {
         Reply reply = replyDAO.findReplyById(replyId);
         AuthUtils.checkDataAuth(user.getId(), reply.getTeacher().getId(), "您无权删除该评论");
 

src/main/java/nju/seec/helper/service/impl/SlideServiceImpl.java

@@ -179,7 +179,7 @@ public class SlideServiceImpl implements SlideService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void removeSlide(LoginUser user, Long slideId) {
+    public void deleteSlide(LoginUser user, Long slideId) {
         Slide slide = slideDAO.findSlideById(slideId);
         AuthUtils.checkDataAuth(user.getId(), slide.getTeacher().getId(), "您无权删除该课件");
 

src/main/java/nju/seec/helper/util/BokUtil.java

@@ -1,12 +1,17 @@
 package nju.seec.helper.util;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import nju.seec.helper.dto.question.BaseQuestionDTO;
+import nju.seec.helper.dto.question.ChoiceQuestionDTO;
+import nju.seec.helper.dto.question.TrueOrFalseQuestionDTO;
 import nju.seec.helper.util.enums.ExceptionType;
+import nju.seec.helper.util.enums.QuestionType;
 import nju.seec.helper.util.exception.HelperException;
-import nju.seec.helper.vo.question.BaseQuestionVO;
 import nju.seec.helper.vo.question.BokQuestion;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
@@ -14,10 +19,10 @@ import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -30,183 +35,127 @@ import java.util.stream.Collectors;
 public class BokUtil {
     private final RestRequestUtil restRequestUtil;
     private final GuavaCacheUtil cacheUtils;
-    @Value("${bok.url}")
-    private String bokUrl = "http://bok.seecoder.cn";
-    private String searchUrl = bokUrl + "/api/tq/search/";
-    private String tqUrl = bokUrl + "/api/tq/";
+    @Value("${bok.searchUrl}")
+    private String searchUrl;
+    @Value("${bok.tqUrl}")
+    private String tqUrl;
 
     public BokUtil(RestRequestUtil restRequestUtil, GuavaCacheUtil cacheUtils) {
         this.restRequestUtil = restRequestUtil;
         this.cacheUtils = cacheUtils;
     }
 
-    public Page<BaseQuestionVO> bokFindByStemLike(String stem, Pageable pageable, boolean withAnswer) {
-        try {
-            Map<String, String> urlParams = ImmutableMap.of(
-                    "content", stem,
-                    "page", String.valueOf(1 + pageable.getPageNumber()),
-                    "size", String.valueOf(pageable.getPageSize()),
-                    "sort", pageable.getSort().toString().replaceAll(" ", "").replaceAll(":", ",")
-            );
-            BokSearchResult result = restRequestUtil.sendGetRequest(
-                    searchUrl + "findByStemLike?content={content}&sort={sort}&size={size}&page={page}", BokSearchResult.class, urlParams);
-
-            List<BokQuestion> questions = result.get_embedded().getChoiceQuestions();
-            List<BaseQuestionVO> questionVOList =
-                    questions.stream()
-                            .map(question -> {
-                                cacheUtils.set(CACHE_NAME, question.getTqId(), question);
-                                return BaseQuestionVO.convertBokQuestionToVO(question, withAnswer);
-                            })
-                            .collect(Collectors.toList());
-            return new PageImpl<>(questionVOList, pageable, result.getPage().getTotalElements());
-        } catch (Exception e) {
-            log.error(e.getLocalizedMessage(), e);
-            throw HelperException.of(ExceptionType.ERROR, "获取题目失败");
-        }
+    public Page<BokQuestion> bokFindByStemLike(String stem, Pageable pageable) {
+        Map<String, String> urlParams = ImmutableMap.of(
+                "content", stem,
+                "page", String.valueOf(1 + pageable.getPageNumber()),
+                "size", String.valueOf(pageable.getPageSize())
+        );
+        BokSearchResult result = restRequestUtil.sendGetRequest(
+                searchUrl + "findByStemLike?content={content}&size={size}&page={page}", BokSearchResult.class, urlParams);
+
+        List<BokQuestion> bokQuestions = result.getEmbedded().getQuestions();
+        cacheUtils.setAll(BOK_CACHE_NAME,
+                bokQuestions.parallelStream()
+                        .collect(Collectors.toMap(BokQuestion::getId, bokQuestion -> bokQuestion))
+        );
+        return new PageImpl<>(bokQuestions, pageable, result.getPage().getTotalElements());
     }
 
-    private static String CACHE_NAME = "BOK";
-
-    public List<BaseQuestionVO> bokFindByIdIn(final List<String> ids, boolean withAnswer) {
-        try {
-            final ImmutableMap<Object, Object> bokQuestionsMap = cacheUtils.multiGet(CACHE_NAME, ids);
-
-            List<String> requestIds = new ArrayList<>(ids);
-            Map<String, BaseQuestionVO> questionVOMap = Maps.newHashMapWithExpectedSize(ids.size());
-
-            bokQuestionsMap
-                    .values()
-                    .forEach(value -> {
-                        BokQuestion bokQuestion = (BokQuestion) value;
-                        BaseQuestionVO questionVO = BaseQuestionVO.convertBokQuestionToVO(bokQuestion, withAnswer);
-                        questionVOMap.put(questionVO.getId(), questionVO);
-                        requestIds.remove(bokQuestion.getTqId());
-                    });
-            //未缓存的去这里拿
-            if (!requestIds.isEmpty()) {
-                Map<String, String> urlParams = ImmutableMap.of("id", requestIds.stream().reduce((a, b) -> a + "," + b).orElse(""));
-
-                BokSearchResult result = restRequestUtil.sendGetRequest(searchUrl + "findByIdIn?id={id}", BokSearchResult.class, urlParams);
-                List<BokQuestion> questions = result.get_embedded().getChoiceQuestions();
-                questions.forEach(question -> {
-                    cacheUtils.set(CACHE_NAME, question.getTqId(), question);
-                    BaseQuestionVO questionVO = BaseQuestionVO.convertBokQuestionToVO(question, withAnswer);
-                    questionVOMap.put(questionVO.getId(), questionVO);
-                });
-            }
-
-            return ids.stream()
-                    .map(questionVOMap::get)
-                    .collect(Collectors.toList());
-        } catch (Exception e) {
-            log.error(e.getLocalizedMessage(), e);
-            throw HelperException.of(ExceptionType.ERROR, "获取题目失败");
+    private static String BOK_CACHE_NAME = "BOK";
+
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public List<BokQuestion> bokFindByIdIn(final List<String> ids) {
+        Map<String, BokQuestion> bokQuestionsMap = Maps.newHashMapWithExpectedSize(ids.size());
+
+        final Map<String, BokQuestion> cacheBokQuestionsMap = (Map) cacheUtils.multiGet(BOK_CACHE_NAME, ids);
+        bokQuestionsMap.putAll(cacheBokQuestionsMap);
+
+        List<String> requestIds = Lists.newArrayList(ids);
+        requestIds.removeAll(cacheBokQuestionsMap.keySet());
+        //未缓存的去这里拿
+        if (!requestIds.isEmpty()) {
+            Map<String, String> urlParams = ImmutableMap.of("id", requestIds.stream().reduce((a, b) -> a + "," + b).orElse(""));
+
+            BokSearchResult result = restRequestUtil.sendGetRequest(searchUrl + "findByIdIn?id={id}", BokSearchResult.class, urlParams);
+            List<BokQuestion> bokQuestions = result.getEmbedded().getQuestions();
+
+            Map<String, BokQuestion> remoteBokQuestionsMap = bokQuestions.parallelStream()
+                    .collect(Collectors.toMap(BokQuestion::getId, bokQuestion -> bokQuestion));
+
+            bokQuestionsMap.putAll(remoteBokQuestionsMap);
+            cacheUtils.setAll(BOK_CACHE_NAME, (Map) remoteBokQuestionsMap);
         }
+
+        return ids.stream()
+                .map(bokQuestionsMap::get)
+                .collect(Collectors.toList());
     }
 
-    public BaseQuestionVO bokFindById(String questionId, boolean withAnswer) {
-        Object cachedBokQuestion = cacheUtils.get(CACHE_NAME, questionId);
+    public BokQuestion bokFindById(String questionId) {
+        Object cachedBokQuestion = cacheUtils.get(BOK_CACHE_NAME, questionId);
         if (cachedBokQuestion instanceof BokQuestion) {
-            return BaseQuestionVO.convertBokQuestionToVO((BokQuestion) cachedBokQuestion, withAnswer);
-        }
-        try {
-            BokQuestion bokQuestion = restRequestUtil.sendGetRequest(tqUrl + questionId, BokQuestion.class, Collections.emptyMap());
-            cacheUtils.set(CACHE_NAME, bokQuestion.getTqId(), bokQuestion);
-            return BaseQuestionVO.convertBokQuestionToVO(bokQuestion, withAnswer);
-        } catch (Exception e) {
-            log.error(e.getLocalizedMessage(), e);
-            throw HelperException.of(ExceptionType.ERROR, "获取题目失败");
+            return (BokQuestion) cachedBokQuestion;
         }
+        BokQuestion bokQuestion = restRequestUtil.sendGetRequest(tqUrl + questionId, BokQuestion.class, Collections.emptyMap());
+        cacheUtils.set(BOK_CACHE_NAME, bokQuestion.getId(), bokQuestion);
+        return bokQuestion;
     }
 
-//    @Transactional(isolation = Isolation.SERIALIZABLE, rollbackFor = Exception.class)
-//    public BaseQuestionVO postNewQuestion(BaseQuestionVO vo) throws JsonProcessingException {
-//        if (vo.getQuestionId() != null) {
-//            throw HelperException.of(ExceptionType.PARAM_ERROR, "should POST a new question");
-//        }
-//        String questionId = null;
-//        //我当时应该用uuid的，但是线上已经部署了，只能下次再改了（如果有下次
-//        //因为线上用的也是Long Id 并且es不提供自增主键，先这样尝试插入
-//        //之后对于新增bok的题目，应该有某种限制，未补全知识点的题目不允许插入
-//        int tryNumber = 100;
-//        int randomLength = 4;
-//        for (int i = 0; i < tryNumber; i++) {
-//            Date date = new Date();
-//            Calendar calendar = Calendar.getInstance();
-//            int year = calendar.get(Calendar.YEAR);
-//            String month = String.valueOf(1 + calendar.get(Calendar.MONTH));
-//            String day = String.valueOf(calendar.get(Calendar.DATE));
-//            if (month.length() < 2) {
-//                month = "0" + month;
-//            }
-//            if (day.length() < 2) {
-//                month = "0" + month;
-//            }
-//            Random randomGet = new Random();
-//            StringBuilder random = new StringBuilder(String.valueOf(randomGet.nextInt(10000)));
-//            while (random.length() < randomLength) {
-//                random.insert(0, "0");
-//            }
-//            questionId = "" + (year - 2010) + (month) + day + (random);
-//            try {
-//                Map ret = (Map) restRequestUtil.sendGetRequest(tqUrl + questionId, new HashMap<>());
-//            } catch (HttpClientErrorException e) {
-//                if (e.getStatusCode().equals(HttpStatus.NOT_FOUND)) {
-//                    break;
-//                }
-//            }
-//            questionId = null;
-//        }
-//        if (questionId == null) {
-//            throw HelperException.of(ExceptionType.ERROR, "暂时无法保存题目，请重试！");
-//        }
-//
-//        vo.setQuestionId(questionId);
-//
-//        BokTq bokTq = new BokTq(vo);
-//        restRequestUtil.sendPutRequest(tqUrl + questionId, bokTq);
-//
-//        return vo;
-//
-//    }
-//
-//    @Transactional(isolation = Isolation.SERIALIZABLE, rollbackFor = Exception.class)
-//    public BaseQuestionVO putQuestion(BaseQuestionVO vo) throws JsonProcessingException {
-//        if (vo.getQuestionId() == null) {
-//            throw HelperException.of(ExceptionType.PARAM_ERROR, "should POST a present question");
-//        }
-//        String questionId = vo.getQuestionId();
-//        try {
-//            restRequestUtil.sendGetRequest(tqUrl + questionId, new HashMap<>());
-//        } catch (HttpClientErrorException e) {
-//            if (e.getStatusCode().equals(HttpStatus.NOT_FOUND)) {
-//                throw HelperException.of(ExceptionType.PARAM_ERROR, "should POST a present question");
-//            }
-//        }
-//        restRequestUtil.sendPutRequest(tqUrl + questionId, new BokTq(vo));
-//
-//        cacheUtils.remove(CACHE_NAME, questionId);
-//        return vo;
-//    }
-//
-//    public void deleteQuestion(String questionId) {
-//        try {
-//            restRequestUtil.sendDeleteRequest(tqUrl + questionId);
-//        } catch (JsonProcessingException e) {
-//            throw HelperException.of(ExceptionType.ERROR, "请求BOK题库数据错误：" + e.getMessage());
-//        }
-//        cacheUtils.remove(CACHE_NAME, questionId);
-//    }
+    public BokQuestion createQuestion(String questionId, BaseQuestionDTO baseQuestionDTO) {
+        BokQuestion bokQuestion = getQuestion(baseQuestionDTO);
+        bokQuestion.setId(questionId);
+        bokQuestion = restRequestUtil.sendPostRequest(tqUrl, bokQuestion, BokQuestion.class);
+        return bokQuestion;
+    }
+
+    public BokQuestion modifyQuestion(String questionId, BaseQuestionDTO baseQuestionDTO) {
+        BokQuestion bokQuestion = getQuestion(baseQuestionDTO);
+        bokQuestion.setId(questionId);
+        restRequestUtil.sendPutRequest(tqUrl + questionId, bokQuestion);
+        return bokFindById(questionId);
+    }
+
+    public void deleteQuestion(String questionId) {
+        restRequestUtil.sendDeleteRequest(tqUrl + questionId);
+    }
+
+    private BokQuestion getQuestion(BaseQuestionDTO baseQuestionDTO) {
+        BokQuestion bokQuestion = new BokQuestion();
+        bokQuestion.setType(baseQuestionDTO.getType());
+        bokQuestion.setStem(baseQuestionDTO.getStem());
+        bokQuestion.setKeyPoints(baseQuestionDTO.getKeyPoints());
+        bokQuestion.setTags(baseQuestionDTO.getTags());
+        bokQuestion.setKnowledgeId(baseQuestionDTO.getKnowledgeId());
+
+        final QuestionType questionType = QuestionType.getQuestionType(baseQuestionDTO.getType());
+        switch (Objects.requireNonNull(questionType)) {
+            case CHOICE:
+                ChoiceQuestionDTO choiceQuestionDTO = (ChoiceQuestionDTO) baseQuestionDTO;
+                bokQuestion.setOptions(choiceQuestionDTO.getOptions());
+                bokQuestion.setAnswer(choiceQuestionDTO.getAnswer());
+                bokQuestion.setAnalysis(choiceQuestionDTO.getAnalysis());
+                break;
+            case TRUE_FALSE:
+                TrueOrFalseQuestionDTO trueOrFalseQuestionDTO = (TrueOrFalseQuestionDTO) baseQuestionDTO;
+                bokQuestion.setAnswer(String.valueOf(trueOrFalseQuestionDTO.getAnswer()));
+                bokQuestion.setAnalysis(trueOrFalseQuestionDTO.getAnalysis());
+                break;
+            default:
+                throw HelperException.of(ExceptionType.ERROR, "不支持的题目类型");
+        }
+        return bokQuestion;
+    }
 
     @Data
     private static class BokSearchResult {
-        private Embedded _embedded;
+        @JsonProperty("_embedded")
+        private Embedded embedded = new Embedded();
         private Page page;
 
         @Data
         private static class Embedded {
-            private List<BokQuestion> choiceQuestions;
+            private List<BokQuestion> questions = Collections.emptyList();
         }
 
         @Data

src/main/java/nju/seec/helper/util/GuavaCacheUtil.java

@@ -20,16 +20,9 @@ import java.util.stream.Collectors;
 public class GuavaCacheUtil {
     private Cache<Object, Object> cache;
 
-    @Value("${guavaCache.maximumSize}")
-    private Long maximumSize = 1000L;
-
-    @Value("${guavaCache.expireAfterAccessInSeconds}")
-    private Long expireAfterAccessInSeconds = 0L;
-
-    @Value("${guavaCache.expireAfterWriteInSeconds}")
-    private Long expireAfterWriteInSeconds = 600L;
-
-    public GuavaCacheUtil() {
+    public GuavaCacheUtil(@Value("${guavaCache.maximumSize}") Long maximumSize,
+                          @Value("${guavaCache.expireAfterAccessInSeconds}") Long expireAfterAccessInSeconds,
+                          @Value("${guavaCache.expireAfterWriteInSeconds}") Long expireAfterWriteInSeconds) {
         CacheBuilder<Object, Object> builder = CacheBuilder.newBuilder();
         builder.maximumSize(maximumSize);
         builder.expireAfterAccess(expireAfterAccessInSeconds, TimeUnit.SECONDS);

src/main/java/nju/seec/helper/util/RestRequestUtil.java

@@ -1,38 +1,34 @@
 package nju.seec.helper.util;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import org.springframework.http.*;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
-import java.util.List;
 import java.util.Map;
 
+/**
+ * @author xst
+ * <p>
+ * updated by cst
+ */
 @Component
 public class RestRequestUtil {
-
-    public List sendPostRequest(String url, Object params) throws JsonProcessingException {
+    public <T> T sendPostRequest(String url, Object request, Class<T> responseType) {
         RestTemplate client = new RestTemplate();
-        HttpHeaders headers = new HttpHeaders();
-        HttpMethod method = HttpMethod.POST;
-        headers.setContentType(MediaType.APPLICATION_JSON);
-        HttpEntity<Object> requestEntity = new HttpEntity<>(params, headers);
-        ResponseEntity ret = client.postForEntity(url, requestEntity, List.class);
-        return (List) ret.getBody();
+        return client.postForObject(url, request, responseType);
     }
 
-    public void sendPutRequest(String url, Object params) throws JsonProcessingException {
+    public void sendPutRequest(String url, Object request) {
         RestTemplate client = new RestTemplate();
-        client.put(url, params);
+        client.put(url, request);
     }
 
-    public void sendDeleteRequest(String url) throws JsonProcessingException {
+    public void sendDeleteRequest(String url) {
         RestTemplate client = new RestTemplate();
         client.delete(url);
     }
 
-    public <T> T sendGetRequest(String url, Class<T> responseType, Map<String, String> urlParams) {
+    public <T> T sendGetRequest(String url, Class<T> responseType, Map<String, ?> uriVariables) {
         RestTemplate client = new RestTemplate();
-        return client.getForObject(url, responseType, urlParams);
+        return client.getForObject(url, responseType, uriVariables);
     }
 }

src/main/java/nju/seec/helper/util/enums/QuestionType.java

@@ -1,8 +1,37 @@
 package nju.seec.helper.util.enums;
 
+import com.fasterxml.jackson.annotation.JsonValue;
+
 /**
  * @author cst
  */
 public enum QuestionType {
-    CHOICE, TRUE_FALSE, SUBJECTIVE
+    /**
+     * 单选
+     */
+    CHOICE("choice"),
+    /**
+     * 判断
+     */
+    TRUE_FALSE("true_false");
+
+    private String value;
+
+    QuestionType(String value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+        return value;
+    }
+
+    public static QuestionType getQuestionType(String value) {
+        for (QuestionType questionType : QuestionType.values()) {
+            if (questionType.getValue().equals(value)) {
+                return questionType;
+            }
+        }
+        return null;
+    }
 }

src/main/java/nju/seec/helper/vo/question/BaseQuestionVO.java

@@ -6,6 +6,9 @@ import nju.seec.helper.util.enums.ExceptionType;
 import nju.seec.helper.util.enums.QuestionType;
 import nju.seec.helper.util.exception.HelperException;
 
+import java.util.Date;
+import java.util.Set;
+
 /**
  * @author XuShengTao
  * <p>
@@ -17,6 +20,10 @@ public abstract class BaseQuestionVO {
     protected QuestionType type;
     protected String stem;
     protected String analysis;
+    protected String keyPoints;
+    protected Set<String> tags;
+    protected Set<String> knowledgeId;
+    private Date lastModified;
 
     public static BaseQuestionVO convertBokQuestionToVO(@NonNull BokQuestion bokQuestion, boolean withAnswer) {
         switch (bokQuestion.getType()) {
@@ -24,29 +31,25 @@ public abstract class BaseQuestionVO {
                 return new ChoiceQuestionVO(bokQuestion, withAnswer);
             case "true_false":
                 return new TrueOrFalseQuestionVO(bokQuestion, withAnswer);
-//            case "subjective":
-//                return new SubjectiveQuestionVO(bokQuestion, withAnswer);
             default:
                 throw HelperException.of(ExceptionType.ERROR, "无法解析该题目");
         }
     }
 
-//    public static BaseQuestionVO convertBaseQuestionToVO(@NonNull BaseQuestion baseQuestion, boolean withAnswer) {
-//        switch (baseQuestion.getType()) {
-//            case CHOICE:
-//                return new ChoiceQuestionVO((ChoiceQuestion) baseQuestion, withAnswer);
-//            case TRUE_FALSE:
-//                return new TrueOrFalseQuestionVO((TrueOrFalseQuestion) baseQuestion, withAnswer);
-//            default:
-//                throw HelperException.of(ExceptionType.ERROR,"暂不支持该类型的题目");
-//        }
-//    }
+    public BaseQuestionVO(BokQuestion bokQuestion) {
+        this.id = bokQuestion.getId();
+        this.stem = bokQuestion.getStem();
+        this.keyPoints = bokQuestion.getKeyPoints();
+        this.tags = bokQuestion.getTags();
+        this.knowledgeId = bokQuestion.getKnowledgeId();
+        this.lastModified = bokQuestion.getLastModified();
+    }
 
     /**
      * 检查答案是否正确
      *
-     * @param answer
-     * @return
+     * @param answer 答案
+     * @return 是否正确
      */
     public abstract boolean pass(Object answer);
 }

src/main/java/nju/seec/helper/vo/question/BokQuestion.java

@@ -15,8 +15,7 @@ import java.util.Set;
  */
 @Data
 public class BokQuestion {
-    @JsonProperty(value = "tq_id")
-    private String tqId;
+    private String id;
     private String type;
     private String stem;
     private Map<String, String> options;

src/main/java/nju/seec/helper/vo/question/ChoiceQuestionVO.java

@@ -19,9 +19,8 @@ public class ChoiceQuestionVO extends BaseQuestionVO {
     private String answer;
 
     public ChoiceQuestionVO(@NonNull BokQuestion bokQuestion, boolean withAnswer) {
-        this.id = bokQuestion.getTqId();
+        super(bokQuestion);
         this.type = QuestionType.CHOICE;
-        this.stem = bokQuestion.getStem();
         this.options = bokQuestion.getOptions();
 
         if (withAnswer) {
@@ -30,26 +29,8 @@ public class ChoiceQuestionVO extends BaseQuestionVO {
         }
     }
 
-//    public ChoiceQuestionVO(ChoiceQuestion baseQuestion, boolean withAnswer) {
-//        this.id = String.valueOf(baseQuestion.getId());
-//        this.type = QuestionType.CHOICE;
-//        this.stem = baseQuestion.getStem();
-//        this.options = baseQuestion.getOptions();
-//
-//        if (withAnswer) {
-//            this.answer = baseQuestion.getAnswer();
-//            this.analysis = baseQuestion.getAnalysis();
-//        }
-//    }
-
     @Override
     public boolean pass(Object answer) {
         return this.answer.equals(String.valueOf(answer));
     }
 }
-//kind: "CHOICE";
-//  options: {
-//    [key: string]: string;
-//  };
-//  answer: string; // 答案 [与 options 的 key 一致]
-//  analysis?: string; // 解析

src/main/java/nju/seec/helper/vo/question/SubjectiveQuestionVO.java

@@ -1,27 +0,0 @@
-//package nju.seec.helper.vo.question;
-//
-//import lombok.Data;
-//import lombok.EqualsAndHashCode;
-//import lombok.NonNull;
-//import nju.seec.helper.util.enums.QuestionType;
-//
-//import java.io.Serializable;
-//
-///**
-// * @author cst
-// */
-//@EqualsAndHashCode(callSuper = true)
-//@Data
-//public class SubjectiveQuestionVO extends BaseQuestionVO implements Serializable {
-//    private static final long serialVersionUID = -7173121632346669906L;
-//
-//    public SubjectiveQuestionVO(@NonNull BokQuestion bokQuestion, boolean withAnswer) {
-//        this.id = bokQuestion.getTqId();
-//        this.type = QuestionType.SUBJECTIVE;
-//        this.stem = bokQuestion.getStem();
-//
-//        if (withAnswer) {
-//            this.analysis = bokQuestion.getAnalysis();
-//        }
-//    }
-//}

src/main/java/nju/seec/helper/vo/question/TrueOrFalseQuestionVO.java

@@ -4,7 +4,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
 import nju.seec.helper.util.enums.QuestionType;
-//import nju.seec.helper.entity.QuizStudentAnswer;
 
 /**
  * @author xst
@@ -15,17 +14,7 @@ import nju.seec.helper.util.enums.QuestionType;
 @Data
 public class TrueOrFalseQuestionVO extends BaseQuestionVO {
     private Boolean answer;
-
-//    public TrueOrFalseQuestionVO(TrueOrFalseQuestion baseQuestion, boolean withAnswer) {
-//        this.id = String.valueOf(baseQuestion.getId());
-//        this.type = QuestionType.TRUE_FALSE;
-//        this.stem = baseQuestion.getStem();
-//
-//        if (withAnswer) {
-//            this.answer = baseQuestion.getAnswer();
-//            this.analysis = baseQuestion.getAnalysis();
-//        }
-//    }
+    private String analysis;
 
     @Override
     public boolean pass(Object answer) {
@@ -33,38 +22,12 @@ public class TrueOrFalseQuestionVO extends BaseQuestionVO {
     }
 
     public TrueOrFalseQuestionVO(@NonNull BokQuestion bokQuestion, boolean withAnswer) {
-        this.id = bokQuestion.getTqId();
+        super(bokQuestion);
         this.type = QuestionType.TRUE_FALSE;
-        this.stem = bokQuestion.getStem();
 
         if (withAnswer) {
             this.answer = Boolean.valueOf(bokQuestion.getAnswer());
             this.analysis = bokQuestion.getAnalysis();
         }
     }
-//    @JsonProperty(value = "studentAnswer")
-//    private Boolean studentAnswer;
-//    @JsonProperty(value = "pass")
-//    private Boolean pass;
-
-//    @Override
-//    public void exAddAnswer(QuizStudentAnswer answer) {
-//        this.pass = answer.getPass();
-//        this.studentAnswer = Boolean.valueOf(answer.getStudentAnswer());
-//    }
-//
-//    @Override
-//    public boolean checkAnswer(Object answer) {
-//        if (answer == null) {
-//            return false;
-//        }
-//        return this.answer.toString().toLowerCase().equals(answer.toString().toLowerCase());
-//    }
-//
-//    @Override
-//    public void excludeCorrectAnswer() {
-//        this.answer = null;
-//        this.pass = null;
-//        this.analysis = null;
-//    }
 }

src/main/java/nju/seec/helper/vo/quiz/QuizVO.java

@@ -43,39 +43,4 @@ public class QuizVO {
         this.createAt = quiz.getCreateAt();
         this.updateAt = quiz.getUpdateAt();
     }
-
-//    public void excludeCorrectAnswer() {
-//        questions.forEach(BaseQuestionVO::excludeCorrectAnswer);
-//    }
 }
-// http://47.100.18.120:3000/SEEC-BOK/API-DOC/src/master/helper/serializer/QuizSerializer.md
-// /** 已实现的枚举类 */
-//    type SlideState =
-//  | "DRAFT"
-//          | "BEFORE_CLASS" // 课前
-//          | "IN_CLASS" // 课中
-//          | "AFTER_CLASS" // 课后
-//          | "FINISH"; // 最终截止
-//
-//          type QuizState =
-//          | "NOT_STARTED" // 未开始
-//          | "ONGOING" // 正在进行
-//          | "CLOSED"; // 已结束
-//
-//interface QuizSerializer<T extends QuizState> {
-//    id: number;
-//    name: string; // 测试名
-//    state: T; // 考试状态
-//    course: CourseSerializer; // 课程详情
-//    quizTime: SlideState;
-//    slide: SlideSerializer;
-//    questions: Array<
-//            T extends "CLOSED"
-//            ? QuestionWithStudentAnswerSerializer
-//      : QuestionWithoutAnswerSerializer
-//  >;
-//}
-//
-//interface QuizBasicSerialzer extends Omit<QuizSerialzier, "questions"> {
-//        questionNumber: number; // 题目数量
-//        }

src/main/resources/application-deploy.yml

@@ -52,6 +52,8 @@ aliyun:
     templateCode: SMS_181555598
 bok:
   url: http://bok.seecoder.cn
+  searchUrl: ${bok.url}/api/question/search/
+  tqUrl: ${bok.url}/api/question/
 guavaCache:
   maximumSize: 1000
   expireAfterAccessInSeconds: 0

src/main/resources/application-dev.yml

@@ -52,6 +52,8 @@ aliyun:
     templateCode: SMS_181555598
 bok:
   url: http://bok.seecoder.cn
+  searchUrl: ${bok.url}/api/question/search/
+  tqUrl: ${bok.url}/api/question/
 guavaCache:
   maximumSize: 1000
   expireAfterAccessInSeconds: 0

src/main/resources/application.yml

@@ -1,3 +1,3 @@
-spring:
-  profiles:
-    active: deploy
+#spring:
+#  profiles:
+#    active: dev