模拟考试取题逻辑修改

nbjk-admin/src/main/java/com/miaxis/open/controller/CommonQuestionInfoController.java

@@ -2,6 +2,7 @@ package com.miaxis.open.controller;
 
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.question.domain.QuestionInfo;
 import com.miaxis.question.dto.QuestionInfoTestDTO;
@@ -30,7 +31,7 @@ public class CommonQuestionInfoController extends BaseController {
     private IQuestionInfoService questionInfoService;
 
     /**
-     * 查询模拟考试科目1与4题库
+     * 查询模拟考试科目1与4题库 //完成部署后，可以删掉
      */
     @GetMapping("/selectTestK14QuestionInfoList")
     @ApiOperation("取模拟考试题库")
@@ -39,6 +40,17 @@ public class CommonQuestionInfoController extends BaseController {
         return toResponsePageInfo(list);
     }
 
+    /**
+     * 查询模拟考试科目1与4题库
+     */
+    @GetMapping("/selectTestK14QuestionInfoListnN")
+    @ApiOperation("取模拟考试题库-无分页")
+    public Response<List<QuestionInfo>> selectTestK14QuestionInfoListN(@ModelAttribute QuestionInfoTestDTO questionInfoTestDTO){
+        List<QuestionInfo> list = questionInfoService.selectTestK14QuestionInfoList(questionInfoTestDTO);
+        System.out.println(list);
+        return Response.success(list);
+    }
+
     /**
      * 查询模拟考试科目1与4题库
      */

nbjk-admin/src/test/java/com/miaxis/test/NormalTest3.java

@@ -29,11 +29,10 @@ public class NormalTest3 {
     public void test1() throws Exception {
         QuestionInfoTestDTO questionInfoTestDTO = new QuestionInfoTestDTO();
         questionInfoTestDTO.setSubject(4);
-        questionInfoTestDTO.setGs("hc");
+        questionInfoTestDTO.setGs("mtc");
 
-        for (int i = 0; i < 10; i++) {
+        for (int i = 0; i < 1000; i++) {
             List<QuestionInfo> list = questionInfoService.selectTestK14QuestionInfoList(questionInfoTestDTO);
-            Thread.sleep(2000);
             System.out.println(i+"------------------------------------------------------------------------------------------------------");
         }
 

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

@@ -452,28 +452,26 @@ public class QuestionInfoServiceImpl extends ServiceImpl<QuestionInfoMapper, Que
                 for (int j = 0; j < difficult; j++) {
                     randomNum = random.nextInt(9);
 
-                    if(qt.getSubject()==1 || (qt.getSubject()==4 && diffMultiple==0)) {
-                        if (randomNum <= 2) {   //判断题
+                    if(qt.getSubject()==1 || (qt.getSubject()==4 && easyMultiple==0)) {
+                        if (randomNum <= 4) {   //判断题
                             diffJudeg++;
                             easyJudge--;
-                        } else if (randomNum <= 5) {  //单选题
+                        } else if (randomNum <= 9) {  //单选题
                             diffChoice++;
                             easyChoice--;
-                        } else if (randomNum <= 8) {    //多选题
-                            diffMultiple++;
-                            easyMultiple--;
                         }
                     } else if(qt.getSubject()==4){
-                        if (randomNum <= 4) {   //判断题
+                        if (randomNum <= 2) {   //判断题
                             diffJudeg++;
                             easyJudge--;
-                        } else if (randomNum <= 9) {  //单选题
+                        } else if (randomNum <= 5) {  //单选题
                             diffChoice++;
                             easyChoice--;
+                        } else if (randomNum <= 8) {    //多选题
+                            diffMultiple++;
+                            easyMultiple--;
                         }
                     }
-
-
                 }
 
                 if(qt.getSubject()==1) {