Merge branch 'master' of ssh://1.15.26.233:10022/miaxis/twzd

twzd-admin/src/main/java/com/miaxis/app/controller/common/CommonQuestionInfoController.java

@@ -26,8 +26,8 @@ import java.util.List;
  * @date 2021-10-20
  */
 @RestController
-@RequestMapping(Constants.OPEN_PREFIX+"/qustion/info")
-@Api(tags={"通用-题库】"})
+@RequestMapping(Constants.OPEN_PREFIX+"/question/info")
+@Api(tags={"【通用-题库】"})
 public class CommonQuestionInfoController extends BaseController{
     @Autowired
     private IQuestionInfoService questionInfoService;

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

@@ -26,7 +26,7 @@ import java.util.List;
  * @date 2021-10-20
  */
 @RestController
-@RequestMapping(Constants.STUDENT_PREFIX+"/qustion/info")
+@RequestMapping(Constants.STUDENT_PREFIX+"/question/info")
 @Api(tags={"【H5-题库】"})
 public class QuestionInfoController extends BaseController{
     @Autowired
@@ -127,7 +127,7 @@ public class QuestionInfoController extends BaseController{
     /**
      * 获取精选分类
      */
-    @GetMapping(value = "/selectJxQustionInfo")
+    @GetMapping(value = "/selectJxQuestionInfo")
     @ApiOperation("获取精选题分类")
     public Response<List<QuestionInfoJxVO>> selectJxQuestionInfo(@ModelAttribute QuestionInfoFlDTO questionInfoFlDTO) {
         return Response.success(questionInfoService.selectJxQuestionInfo(questionInfoFlDTO));
@@ -137,7 +137,7 @@ public class QuestionInfoController extends BaseController{
     /**
      * 获取地方分类
      */
-    @GetMapping(value = "/selectDfQustionInfo")
+    @GetMapping(value = "/selectDfQuestionInfo")
     @ApiOperation("获取地方题分类")
     public Response<List<QuestionInfoDfVO>> selectDfQuestionInfo(@ModelAttribute QuestionInfoFlDTO questionInfoFlDTO) {
         return Response.success(questionInfoService.selectDfQuestionInfo(questionInfoFlDTO));
@@ -146,7 +146,7 @@ public class QuestionInfoController extends BaseController{
     /**
      * 获取分类专题分类
      */
-    @GetMapping(value = "/selectFlQustionInfo")
+    @GetMapping(value = "/selectFlQuestionInfo")
     @ApiOperation("获取分类专题分类")
     public Response<List<QuestionInfoFlVO>> selectFlQuestionInfo(@ModelAttribute QuestionInfoFlDTO questionInfoFlDTO) {
         return Response.success(questionInfoService.selectFlQuestionInfo(questionInfoFlDTO));
@@ -155,7 +155,7 @@ public class QuestionInfoController extends BaseController{
     /**
      * 获取顺序练习分类
      */
-    @GetMapping(value = "/selectSxQustionInfo")
+    @GetMapping(value = "/selectSxQuestionInfo")
     @ApiOperation("获取顺序练习分类")
     public Response<List<QuestionInfoSxVO>> selectSxQuestionInfo(@ModelAttribute QuestionInfoFlDTO questionInfoFlDTO) {
 
@@ -187,7 +187,7 @@ public class QuestionInfoController extends BaseController{
 
 
     /**
-     * 查询模拟考试题库
+     * 查询免费题库
      */
     @GetMapping("/selectFreeQuestionInfo")
     @ApiOperation("查询免费题库")

twzd-admin/src/main/resources/application-dev.yml

@@ -56,30 +56,28 @@ spring:
                 wall:
                     config:
                         multi-statement-allow: true
-    cache:
-        type: redis
-        # redis 配置
-        redis:
-            # 地址
-            host: 1.15.29.64
-            # 端口，默认为6379
-            port: 6379
-            # 密码
-            password: miaxis110
-            # 连接超时时间
-            timeout: 10000
-            lettuce:
-                pool:
-                    # 连接池中的最小空闲连接
-                    min-idle: 0
-                    # 连接池中的最大空闲连接
-                    max-idle: 8
-                    # 连接池的最大数据库连接数
-                    max-active: 8
-                    # #连接池最大阻塞等待时间（使用负值表示没有限制）
-                    max-wait: -1ms
-            # 指定库
-            database: 14
+    # redis 配置
+    redis:
+        # 地址
+        host: sh-crs-lfzs3n8w.sql.tencentcdb.com
+        # 端口，默认为6379
+        port: 29466
+        # 密码
+        password: miaxis110
+        # 连接超时时间
+        timeout: 10000
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
+        # 指定库
+        database: 14
 
 
 

twzd-admin/src/main/resources/application-prodtest.yml

@@ -76,7 +76,7 @@ spring:
                 # #连接池最大阻塞等待时间（使用负值表示没有限制）
                 max-wait: -1ms
         # 指定库
-        database: 13
+        database: 14
 
 # 微信公众号
 app:

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

@@ -26,6 +26,19 @@ public class QuestionInfo extends BaseBusinessEntity{
     @ApiModelProperty(value = " 主键")
     private Long id;
 
+    /** 快通ID */
+    @Excel(name = "快通ID")
+    @TableField("id_kt")
+    @ApiModelProperty(value = "快通ID")
+    private Long idKt;
+
+    /** 一点通ID */
+    @Excel(name = "一点通ID")
+    @TableField("id_ydt")
+    @ApiModelProperty(value = "一点通ID")
+    private Long idYdt;
+
+
     /** 在所有题目中的序号 */
     @Excel(name = "在所有题目中的序号")
     @TableField("number")
@@ -170,17 +183,6 @@ public class QuestionInfo extends BaseBusinessEntity{
     @ApiModelProperty(value = "精选题（包含科一到科四）")
     private String excellIssue;
 
-    /** 是否是仿真考试题目 */
-    @Excel(name = "是否是仿真考试题目")
-    @TableField("copy_issue")
-    @ApiModelProperty(value = "是否是仿真考试题目")
-    private String copyIssue;
-
-    /** 是否是真实考场模拟题目 */
-    @Excel(name = "是否是真实考场模拟题目")
-    @TableField("mock_issue")
-    @ApiModelProperty(value = "是否是真实考场模拟题目")
-    private String mockIssue;
 
     /** 题目在顺序练习中所属的模块名称 */
     @Excel(name = "题目在顺序练习中所属的模块名称")

twzd-service/src/main/java/com/miaxis/question/dto/QuestionInfoTestDTO.java

@@ -32,6 +32,10 @@ public class QuestionInfoTestDTO extends BaseBusinessEntity{
     @ApiModelProperty(value = "是否摩托车 1：是 否：空")
     private String liceMoto;
 
+    @ApiModelProperty(hidden = true)
+    private String excellIssueName;
+
+
     @ApiModelProperty(hidden = true)
     private Integer questionType;
 

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

@@ -147,13 +147,30 @@ public class QuestionInfoServiceImpl extends ServiceImpl<QuestionInfoMapper, Que
             }
         } else {
             if(questionInfoTestDTO.getSubject()==1){
+                //旧判断20题
                 questionInfoTestDTO.setQuestionType(1);
-                questionInfoTestDTO.setNum(40);
+                questionInfoTestDTO.setNum(20);
+                questionInfoTestDTO.setExcellIssueName("必学");
                 List<QuestionInfo> list1 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
-                questionInfoTestDTO.setQuestionType(2);
-                questionInfoTestDTO.setNum(60);
+                //新判断20题
+                questionInfoTestDTO.setQuestionType(1);
+                questionInfoTestDTO.setNum(20);
+                questionInfoTestDTO.setExcellIssueName("新");
                 List<QuestionInfo> list2 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
+                //旧选择30题
+                questionInfoTestDTO.setQuestionType(2);
+                questionInfoTestDTO.setNum(30);
+                questionInfoTestDTO.setExcellIssueName("必学");
+                List<QuestionInfo> list3 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
+                //新选择30题
+                questionInfoTestDTO.setQuestionType(2);
+                questionInfoTestDTO.setNum(30);
+                questionInfoTestDTO.setExcellIssueName("新");
+                List<QuestionInfo> list4 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
+
                 list1.addAll(list2);
+                list1.addAll(list3);
+                list1.addAll(list4);
                 return list1;
             } else if (questionInfoTestDTO.getSubject()==4) {
                 questionInfoTestDTO.setQuestionType(1);

twzd-service/src/main/java/com/miaxis/question/vo/QuestionInfoExcelVo.java

@@ -19,6 +19,12 @@ public class QuestionInfoExcelVo extends BaseBusinessEntity{
     @ApiModelProperty("题目id")
     private long id;
 
+    @ApiModelProperty("快通id")
+    private long idKt;
+
+    @ApiModelProperty("一点通id")
+    private long idYdt;
+
     @ApiModelProperty("在所有题目中的序号")
     private Integer number;
 

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

@@ -30,8 +30,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="classIssue"    column="class_issue"    />
         <result property="placeIssue"    column="place_issue"    />
         <result property="excellIssue"    column="excell_issue"    />
-        <result property="copyIssue"    column="copy_issue"    />
-        <result property="mockIssue"    column="mock_issue"    />
         <result property="sequeIssueName"    column="seque_issue_name"    />
         <result property="placeIssueName"    column="place_issue_name"    />
         <result property="excellIssueName"    column="excell_issue_name"    />
@@ -78,8 +76,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="classIssue != null  and classIssue != ''"> and class_issue = #{classIssue}</if>
             <if test="placeIssue != null  and placeIssue != ''"> and place_issue = #{placeIssue}</if>
             <if test="excellIssue != null  and excellIssue != ''"> and excell_issue = #{excellIssue}</if>
-            <if test="copyIssue != null  and copyIssue != ''"> and copy_issue = #{copyIssue}</if>
-            <if test="mockIssue != null  and mockIssue != ''"> and mock_issue = #{mockIssue}</if>
             <if test="sequeIssueName != null  and sequeIssueName != ''"> and seque_issue_name like concat('%', #{sequeIssueName}, '%')</if>
             <if test="placeIssueName != null  and placeIssueName != ''"> and place_issue_name like concat('%', #{placeIssueName}, '%')</if>
             <if test="excellIssueName != null  and excellIssueName != ''"> and excell_issue_name like concat('%', #{excellIssueName}, '%')</if>
@@ -119,8 +115,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="classIssue != null  and classIssue != ''"> and class_issue = #{classIssue}</if>
             <if test="placeIssue != null  and placeIssue != ''"> and place_issue = #{placeIssue}</if>
             <if test="excellIssue != null  and excellIssue != ''"> and excell_issue = #{excellIssue}</if>
-            <if test="copyIssue != null  and copyIssue != ''"> and copy_issue = #{copyIssue}</if>
-            <if test="mockIssue != null  and mockIssue != ''"> and mock_issue = #{mockIssue}</if>
             <if test="sequeIssueName != null  and sequeIssueName != ''"> and seque_issue_name like concat('%', #{sequeIssueName}, '%')</if>
             <if test="placeIssueName != null  and placeIssueName != ''"> and place_issue_name like concat('%', #{placeIssueName}, '%')</if>
             <if test="excellIssueName != null  and excellIssueName != ''"> and excell_issue_name like concat('%', #{excellIssueName}, '%')</if>
@@ -315,6 +309,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selecQuestionInfoExcel4"  resultType="com.miaxis.question.vo.QuestionInfoExcelVo">
         SELECT id,
+             id_kt,
+             id_ydt,
              number,
              issue,
              image,
@@ -328,6 +324,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectQuestionInfoSortList"  resultType="com.miaxis.question.vo.QuestionInfoExcelVo">
         SELECT id,
+             id_kt,
+             id_ydt,
              number,
              issue,
              image,
@@ -349,7 +347,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTestQuestionInfoList"   resultMap="QuestionInfoResult">
         select * from question_info
         <where>
-            <if test="liceMoto == null or liceMoto == ''"> and excell_issue_name like '%必学%'</if>
+            <if test="liceMoto == null or liceMoto == ''"> and excell_issue_name like concat('%',#{excellIssueName},'%')  </if>
             <if test="subject != null"> and subject = #{subject}</if>
             <if test="questionType != null"> and question_type = #{questionType}</if>
             <if test="liceCar != null  and liceCar != ''"> and lice_car = #{liceCar} </if>