From 13e561a2543beefedc7d7ee0f5cfdb0b7acc377f Mon Sep 17 00:00:00 2001
From: hujunpeng <junpeng.hu@51dayu.com.cn>
Date: Thu, 6 Mar 2025 17:37:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=98=E5=BA=93=E7=AE=A1=E7=90=86=E5=92=8C?=
 =?UTF-8?q?=E8=AF=95=E5=8D=B7=E7=AE=A1=E7=90=86=E4=BB=A3=E7=A0=81=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ccic/safeliab/dao/ExamPaperMapper.java    | 12 ++++++++
 .../safeliab/service/ExamPaperService.java    |  8 ++++++
 .../service/ExamPaperServiceImpl.java         |  5 ++++
 .../safeliab/service/QuestionServiceImpl.java |  8 +++---
 .../safeliab/web/ExamPaperController.java     | 19 +++++++++++--
 .../resources/mappers/ExamPaperMapper.xml     | 28 +++++++++++++++++++
 6 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/ccic-exam/src/main/java/com/ccic/safeliab/dao/ExamPaperMapper.java b/ccic-exam/src/main/java/com/ccic/safeliab/dao/ExamPaperMapper.java
index 4bd0341..b9a8943 100644
--- a/ccic-exam/src/main/java/com/ccic/safeliab/dao/ExamPaperMapper.java
+++ b/ccic-exam/src/main/java/com/ccic/safeliab/dao/ExamPaperMapper.java
@@ -2,6 +2,7 @@ package com.ccic.safeliab.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ccic.safeliab.entity.ExamPapers;
+import com.ccic.safeliab.entity.QuestionCategories;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -48,4 +49,15 @@ public interface ExamPaperMapper extends BaseMapper<ExamPapers> {
      * @return 题目详情
      */
     ExamPapers getDetail(@Param("id") Long id);
+
+    /**
+     * 随机获取题目
+     *
+     * @param industryId 监管行业
+     * @param questionCount 题目数量
+     * @return 题目列表
+     */
+    List<QuestionCategories> getRandomQuestions(
+            @Param("industryId") Long industryId,
+            @Param("questionCount") Integer questionCount);
 }
diff --git a/ccic-exam/src/main/java/com/ccic/safeliab/service/ExamPaperService.java b/ccic-exam/src/main/java/com/ccic/safeliab/service/ExamPaperService.java
index 7b86e24..9cdd0dd 100644
--- a/ccic-exam/src/main/java/com/ccic/safeliab/service/ExamPaperService.java
+++ b/ccic-exam/src/main/java/com/ccic/safeliab/service/ExamPaperService.java
@@ -1,6 +1,7 @@
 package com.ccic.safeliab.service;
 
 import com.ccic.safeliab.entity.ExamPapers;
+import com.ccic.safeliab.entity.QuestionCategories;
 import com.ccic.safeliab.support.BaseService;
 import com.ccic.safeliab.vo.InsExamPaperVO;
 import org.springframework.stereotype.Service;
@@ -68,4 +69,11 @@ public interface ExamPaperService extends BaseService<ExamPapers> {
      * @return 题目详情
      */
     ExamPapers getDetail(String id);
+
+    /**
+     * 随机获取题目
+     * @param entity 试卷表
+     * @return 试卷列表
+     */
+    List<QuestionCategories> getRandomQuestions(ExamPapers entity);
 }
diff --git a/ccic-exam/src/main/java/com/ccic/safeliab/service/ExamPaperServiceImpl.java b/ccic-exam/src/main/java/com/ccic/safeliab/service/ExamPaperServiceImpl.java
index c363a5d..f84320d 100644
--- a/ccic-exam/src/main/java/com/ccic/safeliab/service/ExamPaperServiceImpl.java
+++ b/ccic-exam/src/main/java/com/ccic/safeliab/service/ExamPaperServiceImpl.java
@@ -81,4 +81,9 @@ public class ExamPaperServiceImpl extends BaseServiceImpl<ExamPaperMapper, ExamP
     public ExamPapers getDetail(String id){
         return baseMapper.getDetail(Long.valueOf(id));
     }
+
+    @Override
+    public List<QuestionCategories>  getRandomQuestions(ExamPapers entity) {
+        return baseMapper.getRandomQuestions(entity.getIndustryId(), entity.getQuestionCount());
+    }
 }
diff --git a/ccic-exam/src/main/java/com/ccic/safeliab/service/QuestionServiceImpl.java b/ccic-exam/src/main/java/com/ccic/safeliab/service/QuestionServiceImpl.java
index 3918f62..b28f2be 100644
--- a/ccic-exam/src/main/java/com/ccic/safeliab/service/QuestionServiceImpl.java
+++ b/ccic-exam/src/main/java/com/ccic/safeliab/service/QuestionServiceImpl.java
@@ -95,16 +95,16 @@ public class QuestionServiceImpl extends BaseServiceImpl<QuestionMapper, Questio
         if (answerOptions != null) {
             StringBuilder optionsBuilder = new StringBuilder();
             if (answerOptions.A != null) {
-                optionsBuilder.append("A:").append(answerOptions.A).append(";");
+                optionsBuilder.append("A:").append(answerOptions.A).append("，");
             }
             if (answerOptions.B != null) {
-                optionsBuilder.append("B:").append(answerOptions.B).append(";");
+                optionsBuilder.append("B:").append(answerOptions.B).append("，");
             }
             if (answerOptions.C != null) {
-                optionsBuilder.append("C:").append(answerOptions.C).append(";");
+                optionsBuilder.append("C:").append(answerOptions.C).append("，");
             }
             if (answerOptions.D != null) {
-                optionsBuilder.append("D:").append(answerOptions.D).append(";");
+                optionsBuilder.append("D:").append(answerOptions.D);
             }
             String options = optionsBuilder.toString();
             entity.setOptions(options);
diff --git a/ccic-exam/src/main/java/com/ccic/safeliab/web/ExamPaperController.java b/ccic-exam/src/main/java/com/ccic/safeliab/web/ExamPaperController.java
index 5b225e8..a25bac1 100644
--- a/ccic-exam/src/main/java/com/ccic/safeliab/web/ExamPaperController.java
+++ b/ccic-exam/src/main/java/com/ccic/safeliab/web/ExamPaperController.java
@@ -1,6 +1,7 @@
 package com.ccic.safeliab.web;
 
 import com.ccic.safeliab.entity.ExamPapers;
+import com.ccic.safeliab.entity.QuestionCategories;
 import com.ccic.safeliab.service.ExamPaperService;
 import com.ccic.safeliab.util.R;
 import com.ccic.safeliab.vo.InsExamPaperVO;
@@ -18,8 +19,8 @@ public class ExamPaperController {
     private ExamPaperService examPaperService;
 
     /**
-     * 获取试题
-     * @param vo 题库对象（VO）
+     * 获取试卷
+     * @param vo 试卷对象（VO）
      * @return 查询结果
      */
     @PostMapping("/list")
@@ -91,4 +92,18 @@ public class ExamPaperController {
         ExamPapers data = examPaperService.getDetail(id);
         return R.ok().data(data);
     }
+
+    /**
+     * 随机获取试题
+     * @param vo 题库对象（VO）
+     * @return 查询结果
+     */
+    @PostMapping("/getRandomQuestions")
+    public R getRandomQuestions(@RequestBody InsExamPaperVO vo) {
+        ExamPapers entity = new ExamPapers();
+        entity.setIndustryId(vo.getIndustryId());
+        entity.setQuestionCount(vo.getQuestionCount());
+        List<QuestionCategories> data = examPaperService.getRandomQuestions(entity);
+        return R.ok().data(data);
+    }
 }
diff --git a/ccic-exam/src/main/resources/mappers/ExamPaperMapper.xml b/ccic-exam/src/main/resources/mappers/ExamPaperMapper.xml
index 2e55f9b..904929d 100644
--- a/ccic-exam/src/main/resources/mappers/ExamPaperMapper.xml
+++ b/ccic-exam/src/main/resources/mappers/ExamPaperMapper.xml
@@ -2,6 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ccic.safeliab.dao.ExamPaperMapper">
     <!-- 通用查询映射结果 -->
+    <resultMap id="QuestionCategoriesResultMap" type="com.ccic.safeliab.entity.QuestionCategories">
+        <id column="id" property="id"/>
+        <result column="question_types" property="questionTypes"/>
+        <result column="industry_id" property="industryId"/>
+        <result column="service_type_id" property="serviceTypeId"/>
+        <result column="question_content" property="questionContent"/>
+        <result column="answer" property="answer"/>
+        <result column="options" property="options"/>
+    </resultMap>
     <resultMap id="ExamPapersResultMap" type="com.ccic.safeliab.entity.ExamPapers">
         <id column="id" property="id"/>
         <result column="paper_name" property="paperName"/>
@@ -70,4 +79,23 @@
             </if>
         </where>
     </select>
+    <select id="getRandomQuestions" resultMap="QuestionCategoriesResultMap">
+        SELECT
+        id,
+        question_types,
+        industry_id,
+        service_type_id,
+        question_content,
+        answer,
+        options
+        FROM ex_question_categories
+        <where>
+            is_deleted = '0'
+            <if test="industryId!= null and industryId!= ''">
+                AND industry_id = #{industryId}
+            </if>
+        </where>
+        ORDER BY RANDOM()
+        LIMIT #{questionCount};
+    </select>
 </mapper>