选择、判断随机答题以及图片提交

src/main/java/com/exam/controller/PaperController.java

@@ -33,11 +33,15 @@ public class PaperController {
 
     @GetMapping("/paper/{paperId}")
     public Map<Integer, List<?>> findById(@PathVariable("paperId") Integer paperId) {
-        List<MultiQuestion> multiQuestionRes = multiQuestionService.findByIdAndType(paperId);   //选择题题库 1
-        //List<FillQuestion> fillQuestionsRes = fillQuestionService.findByIdAndType(paperId);     //填空题题库 2
-        //List<JudgeQuestion> judgeQuestionRes = judgeQuestionService.findByIdAndType(paperId);   //判断题题库 3
-        List<FillQuestion> fillQuestionsRes = new ArrayList<>();     //填空题题库 2
-        List<JudgeQuestion> judgeQuestionRes = new ArrayList<>();   //判断题题库 3
+        int number = new Random().nextInt(9) + 1;
+        List<MultiQuestion> multiQuestionRes = new ArrayList<>();//选择题题库 1
+        List<JudgeQuestion> judgeQuestionRes = new ArrayList<>();//判断题题库 3
+        List<FillQuestion> fillQuestionsRes = new ArrayList<>(); //填空题题库 2(暂定)
+        if(number>=4){
+            multiQuestionRes = multiQuestionService.findByIdAndType(paperId);
+        }else{
+            judgeQuestionRes = judgeQuestionService.findByIdAndType(paperId);
+        }
         Map<Integer, List<?>> map = new HashMap<>();
         map.put(1,multiQuestionRes);
         map.put(2,fillQuestionsRes);

src/main/java/com/exam/entity/JudgeQuestion.java

@@ -2,6 +2,8 @@ package com.exam.entity;
 
 import lombok.Data;
 
+import java.util.List;
+
 //判断题实体类
 @Data
 public class JudgeQuestion {
@@ -20,4 +22,6 @@ public class JudgeQuestion {
     private Integer score;
 
     private String analysis; //题目解析
+
+    private List<String> img; // 照片
 }
\ No newline at end of file

src/main/java/com/exam/entity/MultiQuestion.java

@@ -2,6 +2,8 @@ package com.exam.entity;
 
 import lombok.Data;
 
+import java.util.List;
+
 // 选择题实体
 @Data
 public class MultiQuestion {
@@ -31,4 +33,5 @@ public class MultiQuestion {
 
     private String oneOrMore; //单选还是多选  1是单选 2是多选
 
+    private List<String> img; // 照片
 }
\ No newline at end of file

src/main/java/com/exam/mapper/JudgeQuestionMapper.java

@@ -15,7 +15,7 @@ import java.util.List;
 @Mapper
 public interface JudgeQuestionMapper {
 
-    @Select("select * from judge_question where questionId in (select questionId from paper_manage where questionType = 3 and paperId = #{paperId})")
+    @Select("select * from judge_question where questionId in (select questionId from paper_manage where questionType = 3 and paperId = #{paperId}) order by rand() limit 1")
     List<JudgeQuestion> findByIdAndType(Integer paperId);
 
     @Select("select * from judge_question")

src/main/java/com/exam/serviceimpl/JudgeQuestionServiceImpl.java

@@ -3,22 +3,35 @@ package com.exam.serviceimpl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.exam.entity.JudgeQuestion;
+import com.exam.entity.PaperPhoto;
+import com.exam.mapper.AnswerMapper;
 import com.exam.mapper.JudgeQuestionMapper;
 import com.exam.service.JudgeQuestionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class JudgeQuestionServiceImpl implements JudgeQuestionService {
 
     @Autowired
     private JudgeQuestionMapper judgeQuestionMapper;
+    @Autowired
+    AnswerMapper answerMapper;
 
     @Override
     public List<JudgeQuestion> findByIdAndType(Integer paperId) {
-        return judgeQuestionMapper.findByIdAndType(paperId);
+        List<JudgeQuestion> list = judgeQuestionMapper.findByIdAndType(paperId);
+        list.stream().forEach(p->{
+            List<PaperPhoto> listPhoto =  answerMapper.answersPhoto(String.valueOf(p.getQuestionId()),"3",p.getSubject());
+            p.setImg(listPhoto.stream()
+                    .map(PaperPhoto::getImg)
+                    .distinct()
+                    .collect(Collectors.toList()));
+        });
+        return list;
     }
 
     @Override

src/main/java/com/exam/serviceimpl/MultiQuestionServiceImpl.java

@@ -3,21 +3,35 @@ package com.exam.serviceimpl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.exam.entity.MultiQuestion;
+import com.exam.entity.PaperPhoto;
+import com.exam.mapper.AnswerMapper;
 import com.exam.mapper.MultiQuestionMapper;
 import com.exam.service.MultiQuestionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class MultiQuestionServiceImpl implements MultiQuestionService {
 
     @Autowired
     private MultiQuestionMapper multiQuestionMapper;
+    @Autowired
+    AnswerMapper answerMapper;
+
     @Override
     public List<MultiQuestion> findByIdAndType(Integer PaperId) {
-        return multiQuestionMapper.findByIdAndType(PaperId);
+        List<MultiQuestion> list = multiQuestionMapper.findByIdAndType(PaperId);
+        list.stream().forEach(p->{
+            List<PaperPhoto> listPhoto =  answerMapper.answersPhoto(String.valueOf(p.getQuestionId()),"1",p.getSubject());
+            p.setImg(listPhoto.stream()
+                    .map(PaperPhoto::getImg)
+                    .distinct()
+                    .collect(Collectors.toList()));
+        });
+        return list;
     }
 
     @Override