出题

src/main/java/cn/aibreeze/exam/api/ExamController.java

 package cn.aibreeze.exam.api;
 
 import cn.aibreeze.exam.dto.ApiResponse;
+import cn.aibreeze.exam.dto.GetQuestionResponseResult;
 import cn.aibreeze.exam.dto.UpdateQuestionRequestDto;
 import cn.aibreeze.exam.entity.ElehKnowledgeDo;
 import cn.aibreeze.exam.entity.ElehKnowledgeTagDo;
@@ -40,17 +41,29 @@ public class ExamController {
     }
 
     @GetMapping(value = "/get_question")
-    public ApiResponse<ElehKnowledgeDo> getQuestion(@RequestParam("tenant") Integer tenant,
-                                                    @RequestParam("code") String code,
-                                                    @RequestParam("session_id") String sessionId,
-                                                    @RequestParam("user_id") String userId) {
+    public ApiResponse<GetQuestionResponseResult> getQuestion(@RequestParam("tenant") Integer tenant,
+                                                              @RequestParam("code") String code,
+                                                              @RequestParam("session_id") String sessionId,
+                                                              @RequestParam("user_id") String userId) {
 
+        GetQuestionResponseResult result = new GetQuestionResponseResult();
+
+        // 根据分类获取考题
         ElehKnowledgeTagDo tagDo = tagMapper.selectByCode(tenant, code);
+        if(Objects.nonNull(tagDo)) {
+            Long maxQuestionId = qaRecordMapper.selectSessionMaxQuestionId(tenant, sessionId, userId);
+            maxQuestionId = Objects.nonNull(maxQuestionId) ? maxQuestionId : 0;
+            ElehKnowledgeDo knowledgeDo = knowledgeMapper.selectQuestion(tenant, tagDo.getId(), maxQuestionId);
+            if(Objects.nonNull(knowledgeDo)) {
+                result.setQuestion(knowledgeDo.getQuestion());
+                result.setAnswer(knowledgeDo.getAnswer());
+                result.setProject(tagDo.getName());
+                result.setCode(tagDo.getCode());
+                result.setNext(true);
+            }
+        }
 
-        Long maxQuestionId = qaRecordMapper.selectSessionMaxQuestionId(tenant, sessionId, userId);
-        maxQuestionId = Objects.nonNull(maxQuestionId) ? maxQuestionId : 0;
-        ElehKnowledgeDo knowledgeDo = knowledgeMapper.selectQuestion(tenant, tagDo.getId(), maxQuestionId);
-        return ApiResponse.ok(knowledgeDo);
+        return ApiResponse.ok(result);
     }
 
     @PostMapping(value = "update_question")

src/main/java/cn/aibreeze/exam/dto/GetQuestionResponseResult.java

+package cn.aibreeze.exam.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class GetQuestionResponseResult implements Serializable {
+
+    @JsonProperty("question_id")
+    private Long questionId;
+
+    private String question;
+
+    private String answer;
+
+    private String project;
+
+    private String code;
+
+    private boolean next = false;
+}