添加随机题库

twzd-admin/src/main/java/com/miaxis/system/controller/h5/QuestionInfoController.java

@@ -4,6 +4,7 @@ import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.qustion.domain.QuestionInfo;
+import com.miaxis.qustion.dto.QuestionInfoDTO;
 import com.miaxis.qustion.dto.QuestionInfoFlDTO;
 import com.miaxis.qustion.service.IQuestionInfoService;
 import com.miaxis.qustion.vo.QuestionInfoDfVO;
@@ -37,9 +38,9 @@ public class QuestionInfoController extends BaseController{
             @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
             @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
     })
-    public ResponsePageInfo<QuestionInfo> list(@ModelAttribute QuestionInfo questionInfo){
+    public ResponsePageInfo<QuestionInfo> list(@ModelAttribute QuestionInfoDTO questionInfoDTO){
         startPage();
-        List<QuestionInfo> list = questionInfoService.selectQuestionInfoList(questionInfo);
+        List<QuestionInfo> list = questionInfoService.selectQuestionInfoList(questionInfoDTO);
         return toResponsePageInfo(list);
     }
 

twzd-service/src/main/java/com/miaxis/qustion/domain/QuestionInfo.java

@@ -477,6 +477,9 @@ public class QuestionInfo extends BaseBusinessEntity{
         return classIssueName;
     }
 
+
+
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

twzd-service/src/main/java/com/miaxis/qustion/dto/QuestionInfoDTO.java

@@ -0,0 +1,166 @@
+package com.miaxis.qustion.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 题库对象 question_info
+ *
+ * @author miaxis
+ * @date 2021-10-20
+ */
+@Data
+@TableName("question_info")
+@ApiModel(value = "QuestionInfo", description = "题库对象 question_info")
+public class QuestionInfoDTO extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /**  主键 */
+    @ApiModelProperty(value = " 主键")
+    private Long id;
+
+    /** 在所有题目中的序号 */
+    @ApiModelProperty(value = "在所有题目中的序号")
+    private Long number;
+
+    /** 正确答案 */
+    @ApiModelProperty(value = "正确答案")
+    private String answer;
+
+    /** 答案关键词 */
+    @ApiModelProperty(value = "答案关键词")
+    private String answerkeyword;
+
+    /** 技巧讲解图片URL */
+    @ApiModelProperty(value = "技巧讲解图片URL")
+    private String explainGif;
+
+    /** 技巧讲解说明 */
+    @ApiModelProperty(value = "技巧讲解说明")
+    private String explainJq;
+
+    /** 官方解释 */
+    @ApiModelProperty(value = "官方解释")
+    private String explainJs;
+
+    /** 技巧讲解语音URL */
+    @ApiModelProperty(value = "技巧讲解语音URL")
+    private String explainMp3;
+
+    /** 题目图片URL */
+    @ApiModelProperty(value = "题目图片URL")
+    private String image;
+
+    /** 题目图片URL2 */
+    @ApiModelProperty(value = "题目图片URL2")
+    private String imageYdt;
+
+    /** 题目 */
+    @ApiModelProperty(value = "题目")
+    private String issue;
+
+    /** 答案选项 */
+    @ApiModelProperty(value = "答案选项")
+    private String opts;
+
+    /** 答题技巧关键词 */
+    @ApiModelProperty(value = "答题技巧关键词")
+    private String skillkeyword;
+
+    /** 题目关键词 */
+    @ApiModelProperty(value = "题目关键词")
+    private String titlekeyword;
+
+    /** 读题语音URL */
+    @ApiModelProperty(value = "读题语音URL")
+    private String issuemp3;
+
+    /** 答案语音URL */
+    @ApiModelProperty(value = "答案语音URL")
+    private String answermp3;
+
+    /** 读题+答案语音URL */
+    @ApiModelProperty(value = "读题+答案语音URL")
+    private String explainjsmp3;
+
+    /** 是否是科目一题目 */
+    @ApiModelProperty(value = "是否是科目一题目")
+    private String subject1;
+
+    /** 是否是科目二题目 */
+    @ApiModelProperty(value = "是否是科目二题目")
+    private String subject2;
+
+    /** 是否是科目三题目 */
+    @ApiModelProperty(value = "是否是科目三题目")
+    private String subject3;
+
+    /** 是否是科目四题目 */
+    @ApiModelProperty(value = "是否是科目四题目")
+    private String subject4;
+
+    /** 是否是C1,C2,C3驾驶证题目 */
+    @ApiModelProperty(value = "是否是C1,C2,C3驾驶证题目")
+    private String liceCar;
+
+    /** 是否是A1\A3\B1驾驶证题目 */
+    @ApiModelProperty(value = "是否是A1,A3,B1驾驶证题目")
+    private String liceBus;
+
+    /** 是否是A2\B2驾驶证题目 */
+    @ApiModelProperty(value = "是否是A2,B2驾驶证题目")
+    private String liceTruck;
+
+    /** 是否是D\E\F驾驶证题目 */
+    @ApiModelProperty(value = "是否是D,E,F驾驶证题目")
+    private String liceMoto;
+
+    /** 顺序练习分类（包含科一到科四） */
+    @ApiModelProperty(value = "顺序练习分类（包含科一到科四）")
+    private String sequeIssue;
+
+    /** 分类练习（包含科一到科四） */
+    @ApiModelProperty(value = "分类练习（包含科一到科四）")
+    private String classIssue;
+
+    /** 地方专题（包含科一到科四） */
+    @ApiModelProperty(value = "地方专题（包含科一到科四）")
+    private String placeIssue;
+
+    /** 精选题（包含科一到科四） */
+    @ApiModelProperty(value = "精选题（包含科一到科四）")
+    private String excellIssue;
+
+    /** 是否是仿真考试题目 */
+    @ApiModelProperty(value = "是否是仿真考试题目")
+    private String copyIssue;
+
+    /** 是否是真实考场模拟题目 */
+    @ApiModelProperty(value = "是否是真实考场模拟题目")
+    private String mockIssue;
+
+    /** 题目在顺序练习中所属的模块名称 */
+    @ApiModelProperty(value = "题目在顺序练习中所属的模块名称")
+    private String sequeIssueName;
+
+    /** 题目在地方专题中所属的模块名称 */
+    @ApiModelProperty(value = "题目在地方专题中所属的模块名称")
+    private String placeIssueName;
+
+    /** 题目在精选中所属的模块名称 */
+    @ApiModelProperty(value = "题目在精选中所属的模块名称")
+    private String excellIssueName;
+
+    /** 题目在分类中所属的模块名称 */
+    @ApiModelProperty(value = "题目在分类中所属的模块名称")
+    private String classIssueName;
+
+    /** 是否随机 */
+    @ApiModelProperty(value = "是否随机")
+    private String isRand;
+
+
+}

twzd-service/src/main/java/com/miaxis/qustion/mapper/QuestionInfoMapper.java

@@ -3,6 +3,7 @@ package com.miaxis.qustion.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.qustion.domain.QuestionInfo;
+import com.miaxis.qustion.dto.QuestionInfoDTO;
 import com.miaxis.qustion.dto.QuestionInfoFlDTO;
 import com.miaxis.qustion.vo.QuestionInfoDfVO;
 import com.miaxis.qustion.vo.QuestionInfoFlVO;
@@ -21,7 +22,7 @@ public interface QuestionInfoMapper extends BaseMapper<QuestionInfo> {
      * @param questionInfo 题库
      * @return 题库集合
      */
-    List<QuestionInfo> selectQuestionInfoList(QuestionInfo questionInfo);
+    List<QuestionInfo> selectQuestionInfoList(QuestionInfoDTO questionInfoDTO);
 
     List<QuestionInfo> selectQuestionInfoListIds(Long[] ids);
 

twzd-service/src/main/java/com/miaxis/qustion/service/IQuestionInfoService.java

@@ -3,6 +3,7 @@ package com.miaxis.qustion.service;
 import java.util.List;
 import com.miaxis.qustion.domain.QuestionInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.qustion.dto.QuestionInfoDTO;
 import com.miaxis.qustion.dto.QuestionInfoFlDTO;
 import com.miaxis.qustion.vo.QuestionInfoDfVO;
 import com.miaxis.qustion.vo.QuestionInfoFlVO;
@@ -21,7 +22,7 @@ public interface IQuestionInfoService extends IService<QuestionInfo>{
      * @param questionInfo 题库
      * @return 题库集合
      */
-    List<QuestionInfo> selectQuestionInfoList(QuestionInfo questionInfo);
+    List<QuestionInfo> selectQuestionInfoList(QuestionInfoDTO questionInfoDTO);
 
     List<QuestionInfo> selectQuestionInfoListByIds(Long[] ids);
 

twzd-service/src/main/java/com/miaxis/qustion/service/impl/QuestionInfoServiceImpl.java

@@ -2,6 +2,7 @@ package com.miaxis.qustion.service.impl;
 
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.qustion.dto.QuestionInfoDTO;
 import com.miaxis.qustion.dto.QuestionInfoFlDTO;
 import com.miaxis.qustion.vo.QuestionInfoDfVO;
 import com.miaxis.qustion.vo.QuestionInfoFlVO;
@@ -30,8 +31,8 @@ public class QuestionInfoServiceImpl extends ServiceImpl<QuestionInfoMapper, Que
      * @return 题库
      */
     @Override
-    public List<QuestionInfo> selectQuestionInfoList(QuestionInfo questionInfo){
-        return questionInfoMapper.selectQuestionInfoList(questionInfo);
+    public List<QuestionInfo> selectQuestionInfoList(QuestionInfoDTO questionInfoDTO){
+        return questionInfoMapper.selectQuestionInfoList(questionInfoDTO);
     }
 
     @Override

twzd-service/src/main/resources/mapper/qustion/QuestionInfoMapper.xml

@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select * from question_info
     </sql>
 
-    <select id="selectQuestionInfoList" parameterType="QuestionInfo" resultMap="QuestionInfoResult">
+    <select id="selectQuestionInfoList" parameterType="QuestionInfoDTO" resultMap="QuestionInfoResult">
         <include refid="selectQuestionInfoVo"/>
         <where>
             <if test="number != null "> and number = #{number}</if>
@@ -86,6 +86,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="excellIssueName != null  and excellIssueName != ''"> and excell_issue_name like concat('%', #{excellIssueName}, '%')</if>
             <if test="classIssueName != null  and classIssueName != ''"> and class_issue_name like concat('%', #{classIssueName}, '%')</if>
         </where>
+
+        <if test="isRand!=null and isRand!=''"> order by rand() </if>
+
     </select>