题库抓取等等

zzjs-admin/src/main/java/com/miaxis/app/controller/gzpt/GzptTrainRecordController.java

@@ -20,8 +20,6 @@ import com.miaxis.newgzpt.service.IGzptUserInfoService;
 import com.miaxis.newgzpt.vo.TrainCreditVO;
 import com.miaxis.newgzpt.vo.TrainFinishKmVO;
 import com.miaxis.newgzpt.vo.TrainFinishVO;
-import com.miaxis.question.domain.QuestionError;
-import com.miaxis.question.dto.QuestionCollectionDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

zzjs-admin/src/main/java/com/miaxis/app/controller/question/QuestionCollectionController.java

@@ -1,79 +0,0 @@
-package com.miaxis.app.controller.question;
-
-import com.miaxis.common.annotation.Log;
-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.domain.entity.UserInfo;
-import com.miaxis.common.core.page.ResponsePageInfo;
-import com.miaxis.common.enums.BusinessTypeEnum;
-import com.miaxis.common.utils.SecurityUtils;
-import com.miaxis.question.domain.QuestionCollection;
-import com.miaxis.question.domain.QuestionError;
-import com.miaxis.question.dto.QuestionCollectionDto;
-import com.miaxis.question.service.IQuestionCollectionService;
-import io.swagger.annotations.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 【题目收藏】Controller
- *
- * @author miaxis
- * @date 2021-03-18
- */
-@RestController
-@RequestMapping(Constants.STUDENT_PREFIX+"/question/collection")
-@Api(tags={"【小程序-题目收藏】"})
-public class QuestionCollectionController extends BaseController{
-    @Autowired
-    private IQuestionCollectionService questionCollectionService;
-
-
-
-
-
-    /**
-     * 新增题目收藏
-     */
-    @Log(title = "题目收藏", businessType = BusinessTypeEnum.INSERT)
-    @PostMapping
-    @ApiOperation("新增题目收藏")
-    public Response<Integer> add(@RequestBody QuestionCollection questionCollection){
-        UserInfo student = SecurityUtils.getLoginUser().getStudent();
-        questionCollection.setUserId(student.getId());
-        return toResponse(questionCollectionService.save(questionCollection) ? 1 : 0);
-    }
-
-    @GetMapping("/getQuestionCollectionList")
-    @ApiOperation("查询题目收藏列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
-            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
-    })
-    public ResponsePageInfo<QuestionError> getQuestionCollectionList(@ModelAttribute QuestionCollectionDto questionCollectionDto){
-        startPage();
-        UserInfo student = SecurityUtils.getLoginUser().getStudent();
-        questionCollectionDto.setUserId(student.getId());
-        List<QuestionError> list = questionCollectionService.getQuestionCollectionList(questionCollectionDto);
-        return toResponsePageInfo(list);
-    }
-
-
-
-    /**
-     * 删除题目收藏
-     */
-    @Log(title = "题目收藏", businessType = BusinessTypeEnum.DELETE)
-	@DeleteMapping("/{ids}")
-    @ApiOperation("删除题目收藏")
-    public  Response<Integer> remove(
-            @ApiParam(name = "ids", value = "题目收藏ids参数", required = true)
-            @PathVariable Long[] ids
-    ){
-        return toResponse(questionCollectionService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
-    }
-}

zzjs-admin/src/main/java/com/miaxis/app/controller/question/QuestionErrorController.java

@@ -1,79 +0,0 @@
-package com.miaxis.app.controller.question;
-
-import com.miaxis.common.annotation.Log;
-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.domain.entity.UserInfo;
-import com.miaxis.common.core.page.ResponsePageInfo;
-import com.miaxis.common.enums.BusinessTypeEnum;
-import com.miaxis.common.utils.SecurityUtils;
-import com.miaxis.question.domain.QuestionError;
-import com.miaxis.question.dto.QuestionErrorDto;
-import com.miaxis.question.service.IQuestionErrorService;
-import io.swagger.annotations.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 【错题】Controller
- *
- * @author miaxis
- * @date 2021-03-16
- */
-@RestController
-@RequestMapping(Constants.STUDENT_PREFIX+"/question/error")
-@Api(tags={"【小程序-错题】"})
-public class QuestionErrorController extends BaseController{
-    @Autowired
-    private IQuestionErrorService questionErrorService;
-
-
-    @GetMapping("/getQuestionErrorList")
-    @ApiOperation("查询错题列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
-            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
-    })
-    public ResponsePageInfo<QuestionError> getQuestionErrorList(@ModelAttribute QuestionErrorDto questionErrorDto){
-        startPage();
-        UserInfo student = SecurityUtils.getLoginUser().getStudent();
-        questionErrorDto.setUserId(student.getId());
-        List<QuestionError> list = questionErrorService.getQuestionErrorList(questionErrorDto);
-        return toResponsePageInfo(list);
-    }
-
-
-
-    /**
-     * 新增错题
-     */
-    //@PreAuthorize("@ss.hasPermi('question:error:add')")
-    @Log(title = "错题", businessType = BusinessTypeEnum.INSERT)
-    @PostMapping
-    @ApiOperation("新增错题")
-    public Response<Integer> add(@RequestBody QuestionError questionError){
-        UserInfo student = SecurityUtils.getLoginUser().getStudent();
-        questionError.setUserId(student.getId());
-        return toResponse(questionErrorService.save(questionError) ? 1 : 0);
-    }
-
-
-
-    /**
-     * 删除错题
-     */
-    //@PreAuthorize("@ss.hasPermi('question:error:remove')")
-    @Log(title = "错题", businessType = BusinessTypeEnum.DELETE)
-	@DeleteMapping("/{ids}")
-    @ApiOperation("删除错题")
-    public  Response<Integer> remove(
-            @ApiParam(name = "ids", value = "错题ids参数", required = true)
-            @PathVariable Long[] ids
-    ){
-        return toResponse(questionErrorService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
-    }
-}

zzjs-admin/src/main/java/com/miaxis/app/controller/question/QuestionInfoController.java

@@ -1,76 +0,0 @@
-package com.miaxis.app.controller.question;
-
-import com.miaxis.common.constant.Constants;
-import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.core.page.ResponsePageInfo;
-import com.miaxis.question.domain.QuestionInfo;
-import com.miaxis.question.dto.QuestionInfoDto;
-import com.miaxis.question.dto.QuestionInfoRandDto;
-import com.miaxis.question.service.IQuestionInfoService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 【题库】Controller
- *
- * @author miaxis
- * @date 2021-03-12
- */
-@RestController
-@RequestMapping(Constants.STUDENT_PREFIX+"/question/info")
-@Api(tags={"【小程序-题库】"})
-public class QuestionInfoController extends BaseController{
-    @Autowired
-    private IQuestionInfoService questionInfoService;
-
-    /**
-     * 查询题库列表
-     */
-//    @PreAuthorize("@ss.hasPermi('question:info:list')")
-//    @GetMapping("/list")
-//    @ApiOperation("查询题库列表")
-//    @ApiImplicitParams({
-//            @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){
-//        startPage();
-//        List<QuestionInfo> list = questionInfoService.selectQuestionInfoList(questionInfo);
-//        return toResponsePageInfo(list);
-//    }
-
-    @GetMapping("/getQuestionInfoList")
-    @ApiOperation("查询题库列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
-            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
-    })
-    public ResponsePageInfo<QuestionInfo> getQuestionInfoList(@ModelAttribute QuestionInfoDto questionInfoDto){
-        startPage();
-        List<QuestionInfo> list = questionInfoService.getQuestionInfoList(questionInfoDto);
-        return toResponsePageInfo(list);
-    }
-
-    @GetMapping("/getRandQuestionInfoList")
-    @ApiOperation("查询随机题库列表")
-    public ResponsePageInfo<QuestionInfo> getRandQuestionInfoList(@ModelAttribute QuestionInfoRandDto questionInfoRandDto){
-//        startPage();
-        List<QuestionInfo> list = questionInfoService.getRandQuestionInfoList(questionInfoRandDto);
-        return toResponsePageInfo(list);
-    }
-
-
-
-
-
-
-}

zzjs-admin/src/main/java/com/miaxis/app/controller/question/QuestionInfoKtGetController.java

@@ -0,0 +1,109 @@
+package com.miaxis.app.controller.question;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.question.domain.QuestionInfoKtGet;
+import com.miaxis.question.service.IQuestionInfoKtGetService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 【获取快通题库】Controller
+ *
+ * @author miaxis
+ * @date 2022-04-08
+ */
+@RestController
+@RequestMapping("/kt/get")
+@Api(tags={"【小程序-获取快通题库】"})
+public class QuestionInfoKtGetController extends BaseController{
+    @Autowired
+    private IQuestionInfoKtGetService questionInfoKtGetService;
+
+    /**
+     * 查询获取快通题库列表
+     */
+    @PreAuthorize("@ss.hasPermi('kt:get:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询获取快通题库列表")
+        @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<QuestionInfoKtGet> list(@ModelAttribute QuestionInfoKtGet questionInfoKtGet){
+        startPage();
+        List<QuestionInfoKtGet> list = questionInfoKtGetService.selectQuestionInfoKtGetList(questionInfoKtGet);
+        return toResponsePageInfo(list);
+    }
+    
+    /**
+     * 导出获取快通题库列表
+     */
+    @PreAuthorize("@ss.hasPermi('kt:get:export')")
+    @Log(title = "获取快通题库", businessType = BusinessTypeEnum.EXPORT)
+    @GetMapping("/export")
+    @ApiOperation("导出获取快通题库列表Excel")
+    public Response<String> export(@ModelAttribute QuestionInfoKtGet questionInfoKtGet){
+        List<QuestionInfoKtGet> list = questionInfoKtGetService.selectQuestionInfoKtGetList(questionInfoKtGet);
+        ExcelUtil<QuestionInfoKtGet> util = new ExcelUtil<QuestionInfoKtGet>(QuestionInfoKtGet.class);
+        return util.exportExcel(list, "get");
+    }
+
+    /**
+     * 获取获取快通题库详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('kt:get:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取获取快通题库详细信息")
+    public Response<QuestionInfoKtGet> getInfo(
+            @ApiParam(name = "id", value = "获取快通题库参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(questionInfoKtGetService.getById(id));
+    }
+
+    /**
+     * 新增获取快通题库
+     */
+    @PreAuthorize("@ss.hasPermi('kt:get:add')")
+    @Log(title = "获取快通题库", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增获取快通题库")
+    public Response<Integer> add(@RequestBody QuestionInfoKtGet questionInfoKtGet){
+        return toResponse(questionInfoKtGetService.save(questionInfoKtGet) ? 1 : 0);
+    }
+
+    /**
+     * 修改获取快通题库
+     */
+    @PreAuthorize("@ss.hasPermi('kt:get:edit')")
+    @Log(title = "获取快通题库", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改获取快通题库")
+    public Response<Integer> edit(@RequestBody QuestionInfoKtGet questionInfoKtGet){
+        return toResponse(questionInfoKtGetService.updateById(questionInfoKtGet) ? 1 : 0);
+    }
+
+    /**
+     * 删除获取快通题库
+     */
+    @PreAuthorize("@ss.hasPermi('kt:get:remove')")
+    @Log(title = "获取快通题库", businessType = BusinessTypeEnum.DELETE)
+	@DeleteMapping("/{ids}")
+    @ApiOperation("删除获取快通题库")
+    public  Response<Integer> remove(
+            @ApiParam(name = "ids", value = "获取快通题库ids参数", required = true)
+            @PathVariable Long[] ids
+    ){
+        return toResponse(questionInfoKtGetService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

zzjs-admin/src/test/java/com/miaxis/test/KTDownload.java

@@ -0,0 +1,125 @@
+package com.miaxis.test;
+
+
+import org.junit.Test;
+import com.miaxis.ZzjsApplication;
+import com.miaxis.common.utils.StringUtils;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.question.domain.QuestionInfoKtGet;
+import com.miaxis.question.service.IQuestionInfoKtGetService;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.List;
+
+
+@SpringBootTest(classes = ZzjsApplication.class)
+@RunWith(SpringRunner.class)
+public class KTDownload {
+
+
+    @Autowired
+    private IQuestionInfoKtGetService questionInfoGetService;
+
+    @Test
+    public void testExcel() throws Exception {
+
+        List<QuestionInfoKtGet> list = questionInfoGetService.selectQuestionInfoKtGetExplainjsmp3List(); //要修改
+        for (int i = 0; i < list.size(); i++) {
+            QuestionInfoKtGet questionInfoKtGet = list.get(i);
+            String mediaUrl = questionInfoKtGet.getExplainjsmp3(); //要修改
+            int index = mediaUrl.lastIndexOf("/");
+            String fileName = mediaUrl.substring(index + 1);
+            System.out.println(mediaUrl + "," + fileName);
+            Thread.sleep(256);
+
+            try {
+                downLoadFromUrl(mediaUrl, fileName, "G:\\中正\\题库图\\kt\\explain_js_mp3"); //要修改
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+
+    }
+
+    public static void downLoadFromUrl(String urlStr, String fileName, String savePath) throws IOException {
+        URL url = new URL(urlStr);
+        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+        //设置超时间为3秒
+        conn.setConnectTimeout(3 * 1000);
+        //防止屏蔽程序抓取而返回403错误
+        conn.setRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)");
+        //得到输入流
+        InputStream inputStream = conn.getInputStream();
+
+        //获取自己数组
+        byte[] getData = readInputStream(inputStream);
+
+        //文件保存位置
+        File saveDir = new File(savePath);
+        if (!saveDir.exists()) {
+            saveDir.mkdir();
+        }
+        int index = fileName.lastIndexOf(".");
+        String first = fileName.substring(0, index);
+        String lastName = fileName.substring(index);
+        System.out.println(fileName);
+        System.out.println(first);
+        first += lastName; //要修改
+        System.out.println(first);
+
+        File file = new File(saveDir + File.separator + first);
+
+        FileOutputStream fos = new FileOutputStream(file);
+
+        fos.write(getData);
+
+        if (fos != null) {
+            fos.close();
+        }
+        if (inputStream != null) {
+
+            inputStream.close();
+        }
+        System.out.println("info:" + url + " download success");
+    }
+
+
+    /**
+     * 从输入流中获取字节数组
+     *
+     * @param inputStream
+     * @return
+     * @throws IOException
+     */
+    public static byte[] readInputStream(InputStream inputStream) throws IOException {
+
+        byte[] buffer = new byte[1024];
+
+        int len = 0;
+
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        while ((len = inputStream.read(buffer)) != -1) {
+            bos.write(buffer, 0, len);
+        }
+        bos.close();
+
+        return bos.toByteArray();
+
+    }
+
+    public static void main(String[] args) throws Exception {
+
+        KTDownload t = new KTDownload();
+        t.testExcel();
+
+    }
+
+
+}

zzjs-admin/src/test/java/com/miaxis/test/KtTest.java

@@ -0,0 +1,527 @@
+package com.miaxis.test;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.miaxis.ZzjsApplication;
+import com.miaxis.feign.service.IKtService;
+import com.miaxis.question.domain.QuestionInfoKtGet;
+import com.miaxis.question.service.IQuestionInfoKtGetService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+@SpringBootTest(classes = ZzjsApplication.class)
+@RunWith(SpringRunner.class)
+public class KtTest {
+
+
+    @Autowired
+    private IKtService ktService;
+
+    @Autowired
+    private IQuestionInfoKtGetService questionInfoGetService;
+
+    /**
+     * 获取一点通题库
+     */
+    @Test
+    public void test() {
+        QuestionInfoKtGet questionInfoKt = new QuestionInfoKtGet();
+        questionInfoKt.setNumber(150511l);
+        int count = questionInfoGetService.selectQuestionInfoKtGetCount(questionInfoKt);
+        System.out.println(count);
+
+    }
+
+    @Test
+    public void getInfo() {
+
+        List<Map<String, String>> mapList = this.getMap();
+        for (Map<String, String> m : mapList) {
+
+            String time = String.valueOf(System.currentTimeMillis() / 1000);
+            String result = ktService.getInfo(m.get("model"), m.get("subject"), time);
+            JSONObject json = JSONObject.parseObject(result);
+            JSONArray data = json.getJSONArray("data");
+
+            for (int i = 0; i < data.size(); i++) {
+                JSONObject n1 = (JSONObject) data.get(i);
+                String id = n1.getString("id");
+                String title = n1.getString("title");
+                String model = n1.getString("model");
+                String subject = n1.getString("subject");
+                System.out.println(id + "," + title + "," + model);
+                String result2 = ktService.getQuestion(model, id, title, subject, time);
+                JSONObject json2 = JSONObject.parseObject(result2);
+                JSONArray data2 = json2.getJSONArray("data");
+                List<QuestionInfoKtGet> addList = new ArrayList<QuestionInfoKtGet>();
+                List<QuestionInfoKtGet> upList = new ArrayList<QuestionInfoKtGet>();
+                for (int j = 0; j < data2.size(); j++) {
+                    JSONObject n2 = (JSONObject) data2.get(j);
+                    String id2 = n2.getString("id");    //快通ID
+                    String idYdt = n2.getString("idYdt");  //一点通ID
+                    String number = n2.getString("number");  //一点通ID
+                    String type = n2.getString("type"); // 1:判断题 2：选择题 3：多选题
+                    String answer = n2.getString("answer"); //答案
+                    String answerkeyword = n2.getString("answerkeyword");//答案关键词
+                    String explainGif = n2.getString("explainGif"); //技巧讲解图片URL
+                    String explainJq = n2.getString("explainJq");  //技巧讲解说明
+                    String explainJs = n2.getString("explainJs"); //官方解释
+                    String explainMp3 = n2.getString("explainMp3"); //技巧讲解语音URL
+                    String image = n2.getString("image");   //题目图片URL
+                    String imageYdt = n2.getString("imageYdt"); //题目图片URL2
+                    String issue = n2.getString("issue");  //题目
+                    String model2 = n2.getString("model"); //车型
+                    String opts = n2.getString("opts");    //答案选项
+                    String skillkeyword = n2.getString("skillkeyword");  //答题技巧关键词
+                    String subject2 = n2.getString("subject");   // 科目与分类
+                    String titlekeyword = n2.getString("titlekeyword");  // 题目关键词
+                    String issuemp3 = n2.getString("issuemp3");   //读题语音URL
+                    String answermp3 = n2.getString("answermp3");   //答案语音URL
+                    String explainjsmp3 = n2.getString("explainjsmp3"); //读题+答案语音URL
+
+                    //查询当前是否数据是否存在
+                    QuestionInfoKtGet questionInfoKtQuery = new QuestionInfoKtGet();
+                    questionInfoKtQuery.setIdKt(Long.parseLong(id2));
+                    int count = questionInfoGetService.selectQuestionInfoKtGetCount(questionInfoKtQuery);
+                    if(count==0) {
+                        QuestionInfoKtGet questionInfoKt = new QuestionInfoKtGet();
+                        questionInfoKt.setIdKt(Long.parseLong(id2));
+                        questionInfoKt.setIdYdt(idYdt==null?null:Long.parseLong(idYdt));
+                        questionInfoKt.setNumber(Long.parseLong(number));
+                        questionInfoKt.setQuestionType(Long.parseLong(type));
+                        questionInfoKt.setAnswer(answer);
+                        questionInfoKt.setAnswerkeyword(answerkeyword);
+                        questionInfoKt.setExplainGif(explainGif);
+                        questionInfoKt.setExplainJq(explainJq);
+                        questionInfoKt.setExplainJs(explainJs);
+                        questionInfoKt.setExplainMp3(explainMp3);
+                        questionInfoKt.setImage(image);
+                        questionInfoKt.setImageYdt(imageYdt);
+                        questionInfoKt.setIssue(issue);
+                        questionInfoKt.setOpts(opts);
+                        questionInfoKt.setSkillkeyword(skillkeyword);
+                        questionInfoKt.setTitlekeyword(titlekeyword);
+                        questionInfoKt.setIssuemp3(issuemp3);
+                        questionInfoKt.setAnswermp3(answermp3);
+                        questionInfoKt.setExplainjsmp3(explainjsmp3);
+
+                        if ("cart".equals(m.get("model"))) {  //小车
+                            questionInfoKt.setLiceCar("1");
+                        } else if ("bus".equals(m.get("model"))) { //客车
+                            questionInfoKt.setLiceBus("1");
+                        } else if ("truck".equals(m.get("model"))) { //货车
+                            questionInfoKt.setLiceTruck("1");
+                        } else if ("mtc".equals(m.get("model"))) {  //摩托车
+                            questionInfoKt.setLiceMoto("1");
+                        }
+
+                        if ("k1".equals(m.get("subject"))) {  //科目一   顺序练习
+                            questionInfoKt.setSubject(1l);
+                            questionInfoKt.setSequeIssue(id);
+                            questionInfoKt.setSequeIssueName(title);
+                            long sort = j+1;
+                            questionInfoKt.setSequeSort(sort);
+                        } else if ("k1_2".equals(m.get("subject"))) { // 科目一 精选必考题
+                            questionInfoKt.setSubject(1l);
+                            questionInfoKt.setExcellIssue(id);
+                            questionInfoKt.setExcellIssueName(title);
+                            long sort = j+1;
+                            questionInfoKt.setExcellSort(sort);
+                        } else if ("k1_3".equals(m.get("subject"))) { // 科目一 分类练习
+                            questionInfoKt.setSubject(1l);
+                            questionInfoKt.setClassIssue(id);
+                            questionInfoKt.setClassIssueName(title);
+                            long sort = j+1;
+                            questionInfoKt.setClassSort(sort);
+                        } else if ("k1_4".equals(m.get("subject"))) { //科目一 地方题库
+                            questionInfoKt.setSubject(1l);
+                            questionInfoKt.setPlaceIssue(id);
+                            questionInfoKt.setPlaceIssueName(title);
+                            long sort = j+1;
+                            questionInfoKt.setPlaceSort(sort);
+                        } else if ("k4".equals(m.get("subject"))) {  //科目四   顺序练习
+                            questionInfoKt.setSubject(4l);
+                            questionInfoKt.setSequeIssue(id);
+                            questionInfoKt.setSequeIssueName(title);
+                            long sort = j+1;
+                            questionInfoKt.setSequeSort(sort);
+                        } else if ("k4_2".equals(m.get("subject"))) { // 科目四 精选必考题
+                            questionInfoKt.setSubject(4l);
+                            questionInfoKt.setExcellIssue(id);
+                            questionInfoKt.setExcellIssueName(title);
+                            long sort = j+1;
+                            questionInfoKt.setExcellSort(sort);
+                        } else if ("k4_3".equals(m.get("subject"))) { // 科目四 分类练习
+                            questionInfoKt.setSubject(4l);
+                            questionInfoKt.setClassIssue(id);
+                            questionInfoKt.setClassIssueName(title);
+                            long sort = j+1;
+                            questionInfoKt.setClassSort(sort);
+                        } else if ("k4_4".equals(m.get("subject"))) { //科目四 地方题库
+                            questionInfoKt.setSubject(4l);
+                            questionInfoKt.setPlaceIssue(id);
+                            questionInfoKt.setPlaceIssueName(title);
+                            long sort = j+1;
+                            questionInfoKt.setPlaceSort(sort);
+                        }
+
+                        addList.add(questionInfoKt);
+                       // questionInfoGetService.save(questionInfoKt);
+                    } else {
+                        List<QuestionInfoKtGet> list=questionInfoGetService.selectQuestionInfoKtGetList(questionInfoKtQuery);
+                        QuestionInfoKtGet questionInfoKtGet= list.get(0);
+
+                        questionInfoKtGet.setIdKt(Long.parseLong(id2));
+                        questionInfoKtGet.setIdYdt(idYdt==null?null:Long.parseLong(idYdt));
+                        questionInfoKtGet.setNumber(Long.parseLong(number));
+                        questionInfoKtGet.setQuestionType(Long.parseLong(type));
+                        questionInfoKtGet.setAnswer(answer);
+                        questionInfoKtGet.setAnswerkeyword(answerkeyword);
+                        questionInfoKtGet.setExplainGif(explainGif);
+                        questionInfoKtGet.setExplainJq(explainJq);
+                        questionInfoKtGet.setExplainJs(explainJs);
+                        questionInfoKtGet.setExplainMp3(explainMp3);
+                        questionInfoKtGet.setImage(image);
+                        questionInfoKtGet.setImageYdt(imageYdt);
+                        questionInfoKtGet.setIssue(issue);
+                        questionInfoKtGet.setOpts(opts);
+                        questionInfoKtGet.setSkillkeyword(skillkeyword);
+                        questionInfoKtGet.setTitlekeyword(titlekeyword);
+                        questionInfoKtGet.setIssuemp3(issuemp3);
+                        questionInfoKtGet.setAnswermp3(answermp3);
+                        questionInfoKtGet.setExplainjsmp3(explainjsmp3);
+
+                        if ("cart".equals(m.get("model"))) {  //小车
+                            questionInfoKtGet.setLiceCar("1");
+                        } else if ("bus".equals(m.get("model"))) { //客车
+                            questionInfoKtGet.setLiceBus("1");
+                        } else if ("truck".equals(m.get("model"))) { //货车
+                            questionInfoKtGet.setLiceTruck("1");
+                        } else if ("mtc".equals(m.get("model"))) {  //摩托车
+                            questionInfoKtGet.setLiceMoto("1");
+                        }
+
+                        if ("k1".equals(m.get("subject"))) {  //科目一   顺序练习
+                            questionInfoKtGet.setSubject(1l);
+                            questionInfoKtGet.setSequeIssue(id);
+                            questionInfoKtGet.setSequeIssueName(title);
+                            long sort = j+1;
+                            questionInfoKtGet.setSequeSort(sort);
+                        } else if ("k1_2".equals(m.get("subject"))) { // 科目一 精选必考题
+                            questionInfoKtGet.setSubject(1l);
+                            questionInfoKtGet.setExcellIssue(id);
+                            questionInfoKtGet.setExcellIssueName(title);
+                            long sort = j+1;
+                            questionInfoKtGet.setExcellSort(sort);
+                        } else if ("k1_3".equals(m.get("subject"))) { // 科目一 分类练习
+                            questionInfoKtGet.setSubject(1l);
+                            questionInfoKtGet.setClassIssue(id);
+                            questionInfoKtGet.setClassIssueName(title);
+                            long sort = j+1;
+                            questionInfoKtGet.setClassSort(sort);
+                        } else if ("k1_4".equals(m.get("subject"))) { //科目一 地方题库
+                            questionInfoKtGet.setSubject(1l);
+                            questionInfoKtGet.setPlaceIssue(id);
+                            questionInfoKtGet.setPlaceIssueName(title);
+                            long sort = j + 1;
+                            questionInfoKtGet.setPlaceSort(sort);
+                        } else if ("k4".equals(m.get("subject"))) {  //科目四   顺序练习
+                            questionInfoKtGet.setSubject(4l);
+                            questionInfoKtGet.setSequeIssue(id);
+                            questionInfoKtGet.setSequeIssueName(title);
+                            long sort = j+1;
+                            questionInfoKtGet.setSequeSort(sort);
+                        } else if ("k4_2".equals(m.get("subject"))) { // 科目四 精选必考题
+                            questionInfoKtGet.setSubject(4l);
+                            questionInfoKtGet.setExcellIssue(id);
+                            questionInfoKtGet.setExcellIssueName(title);
+                            long sort = j+1;
+                            questionInfoKtGet.setExcellSort(sort);
+                        } else if ("k4_3".equals(m.get("subject"))) { // 科目四 分类练习
+                            questionInfoKtGet.setSubject(4l);
+                            questionInfoKtGet.setClassIssue(id);
+                            questionInfoKtGet.setClassIssueName(title);
+                            long sort = j+1;
+                            questionInfoKtGet.setClassSort(sort);
+                        } else if ("k4_4".equals(m.get("subject"))) { //科目四 地方题库
+                            questionInfoKtGet.setSubject(4l);
+                            questionInfoKtGet.setPlaceIssue(id);
+                            questionInfoKtGet.setPlaceIssueName(title);
+                            long sort = j+1;
+                            questionInfoKtGet.setPlaceSort(sort);
+                        }
+
+                        upList.add(questionInfoKtGet);
+                        //questionInfoGetService.updateById(questionInfoKtGet);
+                    }
+                }
+                questionInfoGetService.saveBatch(addList);
+                questionInfoGetService.updateBatchById(upList);
+            }
+
+        }
+
+    }
+
+
+    public List<Map<String, String>> getMap() {
+
+        //小车 科目一
+        Map<String, String> cart_k1 = new LinkedHashMap(); // k1:顺序练习
+        cart_k1.put("model", "cart");
+        cart_k1.put("subject", "k1");
+        Map<String, String> cart_k1_2 = new LinkedHashMap(); //  k1_2:精选必考题
+        cart_k1_2.put("model", "cart");
+        cart_k1_2.put("subject", "k1_2");
+        Map<String, String> cart_k1_3 = new LinkedHashMap(); //  k1_3:分类练习
+        cart_k1_3.put("model", "cart");
+        cart_k1_3.put("subject", "k1_3");
+        Map<String, String> cart_k1_4 = new LinkedHashMap(); //  k1_4:地方题库
+        cart_k1_4.put("model", "cart");
+        cart_k1_4.put("subject", "k1_4");
+
+        //客车 科目一
+        Map<String, String> bus_k1 = new LinkedHashMap(); // k1:顺序练习
+        bus_k1.put("model", "bus");
+        bus_k1.put("subject", "k1");
+        Map<String, String> bus_k1_2 = new LinkedHashMap(); //  k1_2:精选必考题
+        bus_k1_2.put("model", "bus");
+        bus_k1_2.put("subject", "k1_2");
+        Map<String, String> bus_k1_3 = new LinkedHashMap(); //  k1_3:分类练习
+        bus_k1_3.put("model", "bus");
+        bus_k1_3.put("subject", "k1_3");
+        Map<String, String> bus_k1_4 = new LinkedHashMap(); //  k1_4:地方题库
+        bus_k1_4.put("model", "bus");
+        bus_k1_4.put("subject", "k1_4");
+
+
+        //货车 科目一
+        Map<String, String> truck_k1 = new LinkedHashMap(); // k1:顺序练习
+        truck_k1.put("model", "truck");
+        truck_k1.put("subject", "k1");
+        Map<String, String> truck_k1_2 = new LinkedHashMap(); //  k1_2:精选必考题
+        truck_k1_2.put("model", "truck");
+        truck_k1_2.put("subject", "k1_2");
+        Map<String, String> truck_k1_3 = new LinkedHashMap(); //  k1_3:分类练习
+        truck_k1_3.put("model", "truck");
+        truck_k1_3.put("subject", "k1_3");
+        Map<String, String> truck_k1_4 = new LinkedHashMap(); //  k1_4:地方题库
+        truck_k1_4.put("model", "truck");
+        truck_k1_4.put("subject", "k1_4");
+
+        //摩托车 科目一
+        Map<String, String> mtc_k1 = new LinkedHashMap(); // k1:顺序练习
+        mtc_k1.put("model", "mtc");
+        mtc_k1.put("subject", "k1");
+        Map<String, String> mtc_k1_2 = new LinkedHashMap(); //  k1_2:精选必考题
+        mtc_k1_2.put("model", "mtc");
+        mtc_k1_2.put("subject", "k1_2");
+        Map<String, String> mtc_k1_3 = new LinkedHashMap(); //  k1_3:分类练习
+        mtc_k1_3.put("model", "mtc");
+        mtc_k1_3.put("subject", "k1_3");
+        Map<String, String> mtc_k1_4 = new LinkedHashMap(); //  k1_4:地方题库
+        mtc_k1_4.put("model", "mtc");
+        mtc_k1_4.put("subject", "k1_4");
+
+
+        //小车 科目四
+        Map<String, String> cart_k4 = new LinkedHashMap(); // k4:顺序练习
+        cart_k4.put("model", "cart");
+        cart_k4.put("subject", "k4");
+        Map<String, String> cart_k4_2 = new LinkedHashMap(); //  k4_2:精选必考题
+        cart_k4_2.put("model", "cart");
+        cart_k4_2.put("subject", "k4_2");
+        Map<String, String> cart_k4_3 = new LinkedHashMap(); //  k4_3:分类练习
+        cart_k4_3.put("model", "cart");
+        cart_k4_3.put("subject", "k4_3");
+        Map<String, String> cart_k4_4 = new LinkedHashMap(); //  k4_4:地方题库
+        cart_k4_4.put("model", "cart");
+        cart_k4_4.put("subject", "k4_4");
+
+        //客车 科目四
+        Map<String, String> bus_k4 = new LinkedHashMap(); // k4:顺序练习
+        bus_k4.put("model", "bus");
+        bus_k4.put("subject", "k4");
+        Map<String, String> bus_k4_2 = new LinkedHashMap(); //  k4_2:精选必考题
+        bus_k4_2.put("model", "bus");
+        bus_k4_2.put("subject", "k4_2");
+        Map<String, String> bus_k4_3 = new LinkedHashMap(); //  k4_3:分类练习
+        bus_k4_3.put("model", "bus");
+        bus_k4_3.put("subject", "k4_3");
+        Map<String, String> bus_k4_4 = new LinkedHashMap(); //  k4_4:地方题库
+        bus_k4_4.put("model", "bus");
+        bus_k4_4.put("subject", "k4_4");
+
+
+        //货车 科目四
+        Map<String, String> truck_k4 = new LinkedHashMap(); // k4:顺序练习
+        truck_k4.put("model", "truck");
+        truck_k4.put("subject", "k4");
+        Map<String, String> truck_k4_2 = new LinkedHashMap(); //  k4_2:精选必考题
+        truck_k4_2.put("model", "truck");
+        truck_k4_2.put("subject", "k4_2");
+        Map<String, String> truck_k4_3 = new LinkedHashMap(); //  k4_3:分类练习
+        truck_k4_3.put("model", "truck");
+        truck_k4_3.put("subject", "k4_3");
+        Map<String, String> truck_k4_4 = new LinkedHashMap(); //  k4_4:地方题库
+        truck_k4_4.put("model", "truck");
+        truck_k4_4.put("subject", "k4_4");
+
+        //摩托车 科目四
+        Map<String, String> mtc_k4 = new LinkedHashMap(); // k4:顺序练习
+        mtc_k4.put("model", "mtc");
+        mtc_k4.put("subject", "k4");
+        Map<String, String> mtc_k4_2 = new LinkedHashMap(); //  k4_2:精选必考题
+        mtc_k4_2.put("model", "mtc");
+        mtc_k4_2.put("subject", "k4_2");
+        Map<String, String> mtc_k4_3 = new LinkedHashMap(); //  k4_3:分类练习
+        mtc_k4_3.put("model", "mtc");
+        mtc_k4_3.put("subject", "k4_3");
+        Map<String, String> mtc_k4_4 = new LinkedHashMap(); //  k4_4:地方题库
+        mtc_k4_4.put("model", "mtc");
+        mtc_k4_4.put("subject", "k4_4");
+
+
+
+        List<Map<String, String>> mapList = new ArrayList<Map<String, String>>();
+        //小车 科目一
+        mapList.add(cart_k1);
+        mapList.add(cart_k1_2);
+        mapList.add(cart_k1_3);
+        mapList.add(cart_k1_4);
+        //客车 科目一
+        mapList.add(bus_k1);
+        mapList.add(bus_k1_2);
+        mapList.add(bus_k1_3);
+        mapList.add(bus_k1_4);
+        //货车 科目一
+        mapList.add(truck_k1);
+        mapList.add(truck_k1_2);
+        mapList.add(truck_k1_3);
+        mapList.add(truck_k1_4);
+        //摩托车 科目一
+        mapList.add(mtc_k1);
+        mapList.add(mtc_k1_2);
+        mapList.add(mtc_k1_3);
+        mapList.add(mtc_k1_4);
+
+        //小车 科目四
+        mapList.add(cart_k4);
+        mapList.add(cart_k4_2);
+        mapList.add(cart_k4_3);
+        mapList.add(cart_k4_4);
+        //客车 科目四
+        mapList.add(bus_k4);
+        mapList.add(bus_k4_2);
+        mapList.add(bus_k4_3);
+        mapList.add(bus_k4_4);
+        //货车 科目四
+        mapList.add(truck_k4);
+        mapList.add(truck_k4_2);
+        mapList.add(truck_k4_3);
+        mapList.add(truck_k4_4);
+        //摩托车 科目四
+        mapList.add(mtc_k4);
+        mapList.add(mtc_k4_2);
+        mapList.add(mtc_k4_3);
+        mapList.add(mtc_k4_4);
+
+        return mapList;
+    }
+
+
+    public List<Map<String, String>> get4Map() {
+
+        //小车 科目四
+        Map<String, String> cart_k4 = new LinkedHashMap(); // k4:顺序练习
+        cart_k4.put("model", "cart");
+        cart_k4.put("subject", "k4");
+        Map<String, String> cart_k4_2 = new LinkedHashMap(); //  k4_2:精选必考题
+        cart_k4_2.put("model", "cart");
+        cart_k4_2.put("subject", "k4_2");
+        Map<String, String> cart_k4_3 = new LinkedHashMap(); //  k4_3:分类练习
+        cart_k4_3.put("model", "cart");
+        cart_k4_3.put("subject", "k4_3");
+        Map<String, String> cart_k4_4 = new LinkedHashMap(); //  k4_4:地方题库
+        cart_k4_4.put("model", "cart");
+        cart_k4_4.put("subject", "k4_4");
+
+        //客车 科目四
+        Map<String, String> bus_k4 = new LinkedHashMap(); // k4:顺序练习
+        bus_k4.put("model", "bus");
+        bus_k4.put("subject", "k4");
+        Map<String, String> bus_k4_2 = new LinkedHashMap(); //  k4_2:精选必考题
+        bus_k4_2.put("model", "bus");
+        bus_k4_2.put("subject", "k4_2");
+        Map<String, String> bus_k4_3 = new LinkedHashMap(); //  k4_3:分类练习
+        bus_k4_3.put("model", "bus");
+        bus_k4_3.put("subject", "k4_3");
+        Map<String, String> bus_k4_4 = new LinkedHashMap(); //  k4_4:地方题库
+        bus_k4_4.put("model", "bus");
+        bus_k4_4.put("subject", "k4_4");
+
+
+        //货车 科目四
+        Map<String, String> truck_k4 = new LinkedHashMap(); // k4:顺序练习
+        truck_k4.put("model", "truck");
+        truck_k4.put("subject", "k4");
+        Map<String, String> truck_k4_2 = new LinkedHashMap(); //  k4_2:精选必考题
+        truck_k4_2.put("model", "truck");
+        truck_k4_2.put("subject", "k4_2");
+        Map<String, String> truck_k4_3 = new LinkedHashMap(); //  k4_3:分类练习
+        truck_k4_3.put("model", "truck");
+        truck_k4_3.put("subject", "k4_3");
+        Map<String, String> truck_k4_4 = new LinkedHashMap(); //  k4_4:地方题库
+        truck_k4_4.put("model", "truck");
+        truck_k4_4.put("subject", "k4_4");
+
+        //摩托车 科目四
+        Map<String, String> mtc_k4 = new LinkedHashMap(); // k4:顺序练习
+        mtc_k4.put("model", "mtc");
+        mtc_k4.put("subject", "k4");
+        Map<String, String> mtc_k4_2 = new LinkedHashMap(); //  k4_2:精选必考题
+        mtc_k4_2.put("model", "mtc");
+        mtc_k4_2.put("subject", "k4_2");
+        Map<String, String> mtc_k4_3 = new LinkedHashMap(); //  k4_3:分类练习
+        mtc_k4_3.put("model", "mtc");
+        mtc_k4_3.put("subject", "k4_3");
+        Map<String, String> mtc_k4_4 = new LinkedHashMap(); //  k4_4:地方题库
+        mtc_k4_4.put("model", "mtc");
+        mtc_k4_4.put("subject", "k4_4");
+
+
+        List<Map<String, String>> mapList = new ArrayList<Map<String, String>>();
+        //小车 科目四
+        mapList.add(cart_k4);
+        mapList.add(cart_k4_2);
+        mapList.add(cart_k4_3);
+        mapList.add(cart_k4_4);
+        //客车 科目四
+        mapList.add(bus_k4);
+        mapList.add(bus_k4_2);
+        mapList.add(bus_k4_3);
+        mapList.add(bus_k4_4);
+        //货车 科目四
+        mapList.add(truck_k4);
+        mapList.add(truck_k4_2);
+        mapList.add(truck_k4_3);
+        mapList.add(truck_k4_4);
+        //摩托车 科目四
+        mapList.add(mtc_k4);
+        mapList.add(mtc_k4_2);
+        mapList.add(mtc_k4_3);
+        mapList.add(mtc_k4_4);
+
+        return mapList;
+    }
+
+
+}

zzjs-admin/src/test/java/com/miaxis/test/Test03.java

@@ -26,7 +26,7 @@ public class Test03 {
                 int index = t.mediaUrl.lastIndexOf("/");
                 String fileName = t.mediaUrl.substring(index+1);
              //   System.out.println(t.mediaUrl+","+fileName);
-                downLoadFromUrl(t.mediaUrl,fileName,"G:\\中正\\题库图\\media");
+                downLoadFromUrl(t.mediaUrl,fileName,"G:\\中正\\题库图\\media2");
 
             }
 
@@ -52,8 +52,13 @@ public class Test03 {
         if(!saveDir.exists()){
             saveDir.mkdir();
         }
+        int index = fileName.lastIndexOf(".");
+        String first = fileName.substring(0,index);
+        System.out.println(fileName);
+        System.out.println(first);
+        first+=".jpg";
 
-        File file = new File(saveDir+File.separator+fileName);
+        File file = new File(saveDir+File.separator+first);
 
         FileOutputStream fos = new FileOutputStream(file);
 

zzjs-service/src/main/java/com/miaxis/question/domain/QuestionCollection.java

@@ -1,76 +0,0 @@
-package com.miaxis.question.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import lombok.Data;
-/**
- * 题目收藏对象 question_collection
- *
- * @author miaxis
- * @date 2021-03-18
- */
-@Data
-@TableName("question_collection")
-@ApiModel(value = "QuestionCollection", description = "题目收藏对象 question_collection")
-public class QuestionCollection extends BaseBusinessEntity{
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    @TableId(value = "id")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Long id;
-
-    /** 用户id */
-    @Excel(name = "用户id")
-    @TableField("user_id")
-    @ApiModelProperty(value = "用户id")
-    private Long userId;
-
-    /** 题目id */
-    @Excel(name = "题目id")
-    @TableField("question_id")
-    @ApiModelProperty(value = "题目id")
-    private Long questionId;
-
-    public void setId(Long id){
-        this.id = id;
-    }
-
-    public Long getId(){
-        return id;
-    }
-    public void setUserId(Long userId){
-        this.userId = userId;
-    }
-
-    public Long getUserId(){
-        return userId;
-    }
-    public void setQuestionId(Long questionId){
-        this.questionId = questionId;
-    }
-
-    public Long getQuestionId(){
-        return questionId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("userId", getUserId())
-            .append("questionId", getQuestionId())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}

zzjs-service/src/main/java/com/miaxis/question/domain/QuestionError.java

@@ -1,74 +0,0 @@
-package com.miaxis.question.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-/**
- * 错题对象 question_error
- *
- * @author miaxis
- * @date 2021-03-16
- */
-@Data
-@TableName("question_error")
-@ApiModel(value = "QuestionError", description = "错题对象 question_error")
-public class QuestionError extends BaseBusinessEntity{
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    @TableId(value = "id")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Long id;
-
-    /** 用户id */
-    @Excel(name = "用户id")
-    @TableField("user_id")
-    @ApiModelProperty(value = "用户id")
-    private Long userId;
-
-    /** 题目id */
-    @Excel(name = "题目id")
-    @TableField("question_id")
-    @ApiModelProperty(value = "题目id")
-    private Long questionId;
-
-    public void setId(Long id){
-        this.id = id;
-    }
-
-    public Long getId(){
-        return id;
-    }
-    public void setUserId(Long userId){
-        this.userId = userId;
-    }
-
-    public Long getUserId(){
-        return userId;
-    }
-    public void setQuestionId(Long questionId){
-        this.questionId = questionId;
-    }
-
-    public Long getQuestionId(){
-        return questionId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("userId", getUserId())
-            .append("questionId", getQuestionId())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}

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

@@ -1,452 +0,0 @@
-package com.miaxis.question.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import lombok.Data;
-/**
- * 题库对象 question_info
- *
- * @author miaxis
- * @date 2021-03-12
- */
-@Data
-@TableName("question_info")
-@ApiModel(value = "QuestionInfo", description = "题库对象 question_info")
-public class QuestionInfo extends BaseBusinessEntity{
-    private static final long serialVersionUID = 1L;
-
-    /** id */
-    @TableId("id")
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    /** 类型 */
-    @Excel(name = "类型")
-    @TableField("type")
-    @ApiModelProperty(value = "类型")
-    private Long type;
-
-    /** 未知字段 */
-    @Excel(name = "未知字段")
-    @TableField("int_number")
-    @ApiModelProperty(value = "未知字段")
-    private String intNumber;
-
-    /** 未知字段 */
-    @Excel(name = "未知字段")
-    @TableField("str_tppe")
-    @ApiModelProperty(value = "未知字段")
-    private String strTppe;
-
-    /** 未知字段 */
-    @Excel(name = "未知字段")
-    @TableField("str_type_l")
-    @ApiModelProperty(value = "未知字段")
-    private String strTypeL;
-
-    /** 许可车型 */
-    @Excel(name = "许可车型")
-    @TableField("license_type")
-    @ApiModelProperty(value = "许可车型")
-    private String licenseType;
-
-    /** 问题 */
-    @Excel(name = "问题")
-    @TableField("question")
-    @ApiModelProperty(value = "问题")
-    private String question;
-
-    /** 答案1 */
-    @Excel(name = "答案1")
-    @TableField("an1")
-    @ApiModelProperty(value = "答案1")
-    private String an1;
-
-    /** 答案2 */
-    @Excel(name = "答案2")
-    @TableField("an2")
-    @ApiModelProperty(value = "答案2")
-    private String an2;
-
-    /** 答案3 */
-    @Excel(name = "答案3")
-    @TableField("an3")
-    @ApiModelProperty(value = "答案3")
-    private String an3;
-
-    /** 答案4 */
-    @Excel(name = "答案4")
-    @TableField("an4")
-    @ApiModelProperty(value = "答案4")
-    private String an4;
-
-    /** 答案5 */
-    @Excel(name = "答案5")
-    @TableField("an5")
-    @ApiModelProperty(value = "答案5")
-    private String an5;
-
-    /** 答案6 */
-    @Excel(name = "答案6")
-    @TableField("an6")
-    @ApiModelProperty(value = "答案6")
-    private String an6;
-
-    /** 答案7 */
-    @Excel(name = "答案7")
-    @TableField("an7")
-    @ApiModelProperty(value = "答案7")
-    private String an7;
-
-    /** 正确答案 */
-    @Excel(name = "正确答案")
-    @TableField("answer_true")
-    @ApiModelProperty(value = "正确答案")
-    private String answerTrue;
-
-    /** 解释 */
-    @Excel(name = "解释")
-    @TableField("explain1")
-    @ApiModelProperty(value = "解释")
-    private String explain1;
-
-    /** 最佳答案 */
-    @Excel(name = "最佳答案")
-    @TableField("best_answer_id")
-    @ApiModelProperty(value = "最佳答案")
-    private String bestAnswerId;
-
-    /** 科目 */
-    @Excel(name = "科目")
-    @TableField("kemu")
-    @ApiModelProperty(value = "科目")
-    private Long kemu;
-
-    /** 解释_from */
-    @Excel(name = "解释_from")
-    @TableField("jieshi_from")
-    @ApiModelProperty(value = "解释_from")
-    private String jieshiFrom;
-
-    /** 更多类型 */
-    @Excel(name = "更多类型")
-    @TableField("moretypes")
-    @ApiModelProperty(value = "更多类型")
-    private String moretypes;
-
-    /** chapterid */
-    @Excel(name = "chapterid")
-    @TableField("chapterid")
-    @ApiModelProperty(value = "chapterid")
-    private Long chapterid;
-
-    /** 图片文件名 */
-    @Excel(name = "图片文件名")
-    @TableField("sinaimg")
-    @ApiModelProperty(value = "图片文件名")
-    private String sinaimg;
-
-    /** 视频文件名 */
-    @Excel(name = "视频文件名")
-    @TableField("video_url")
-    @ApiModelProperty(value = "视频文件名")
-    private String videoUrl;
-
-    /** 未知 */
-    @Excel(name = "未知")
-    @TableField("diff_degree")
-    @ApiModelProperty(value = "未知")
-    private Long diffDegree;
-
-    /** 城市 */
-    @Excel(name = "城市")
-    @TableField("cityid")
-    @ApiModelProperty(value = "城市")
-    private Long cityid;
-
-    /** gs */
-    @Excel(name = "gs")
-    @TableField("gs")
-    @ApiModelProperty(value = "gs")
-    private String gs;
-
-    /** 关键字 */
-    @Excel(name = "关键字")
-    @TableField("keyword")
-    @ApiModelProperty(value = "关键字")
-    private String keyword;
-
-    /** 错误率 */
-    @Excel(name = "错误率")
-    @TableField("error_rate")
-    @ApiModelProperty(value = "错误率")
-    private Long errorRate;
-
-    /** 文件地址 */
-    @Excel(name = "文件地址")
-    @TableField("media_url")
-    @ApiModelProperty(value = "文件地址")
-    private String mediaUrl;
-
-    /** 是否显示 */
-    @Excel(name = "是否显示")
-    @TableField("show_option_type")
-    @ApiModelProperty(value = "是否显示")
-    private Long showOptionType;
-
-    public void setId(Long id){
-        this.id = id;
-    }
-
-    public Long getId(){
-        return id;
-    }
-    public void setType(Long type){
-        this.type = type;
-    }
-
-    public Long getType(){
-        return type;
-    }
-    public void setIntNumber(String intNumber){
-        this.intNumber = intNumber;
-    }
-
-    public String getIntNumber(){
-        return intNumber;
-    }
-    public void setStrTppe(String strTppe){
-        this.strTppe = strTppe;
-    }
-
-    public String getStrTppe(){
-        return strTppe;
-    }
-    public void setStrTypeL(String strTypeL){
-        this.strTypeL = strTypeL;
-    }
-
-    public String getStrTypeL(){
-        return strTypeL;
-    }
-    public void setLicenseType(String licenseType){
-        this.licenseType = licenseType;
-    }
-
-    public String getLicenseType(){
-        return licenseType;
-    }
-    public void setQuestion(String question){
-        this.question = question;
-    }
-
-    public String getQuestion(){
-        return question;
-    }
-    public void setAn1(String an1){
-        this.an1 = an1;
-    }
-
-    public String getAn1(){
-        return an1;
-    }
-    public void setAn2(String an2){
-        this.an2 = an2;
-    }
-
-    public String getAn2(){
-        return an2;
-    }
-    public void setAn3(String an3){
-        this.an3 = an3;
-    }
-
-    public String getAn3(){
-        return an3;
-    }
-    public void setAn4(String an4){
-        this.an4 = an4;
-    }
-
-    public String getAn4(){
-        return an4;
-    }
-    public void setAn5(String an5){
-        this.an5 = an5;
-    }
-
-    public String getAn5(){
-        return an5;
-    }
-    public void setAn6(String an6){
-        this.an6 = an6;
-    }
-
-    public String getAn6(){
-        return an6;
-    }
-    public void setAn7(String an7){
-        this.an7 = an7;
-    }
-
-    public String getAn7(){
-        return an7;
-    }
-    public void setAnswerTrue(String answerTrue){
-        this.answerTrue = answerTrue;
-    }
-
-    public String getAnswerTrue(){
-        return answerTrue;
-    }
-    public void setExplain1(String explain1){
-        this.explain1 = explain1;
-    }
-
-    public String getExplain1(){
-        return explain1;
-    }
-    public void setBestAnswerId(String bestAnswerId){
-        this.bestAnswerId = bestAnswerId;
-    }
-
-    public String getBestAnswerId(){
-        return bestAnswerId;
-    }
-    public void setKemu(Long kemu){
-        this.kemu = kemu;
-    }
-
-    public Long getKemu(){
-        return kemu;
-    }
-    public void setJieshiFrom(String jieshiFrom){
-        this.jieshiFrom = jieshiFrom;
-    }
-
-    public String getJieshiFrom(){
-        return jieshiFrom;
-    }
-    public void setMoretypes(String moretypes){
-        this.moretypes = moretypes;
-    }
-
-    public String getMoretypes(){
-        return moretypes;
-    }
-    public void setChapterid(Long chapterid){
-        this.chapterid = chapterid;
-    }
-
-    public Long getChapterid(){
-        return chapterid;
-    }
-    public void setSinaimg(String sinaimg){
-        this.sinaimg = sinaimg;
-    }
-
-    public String getSinaimg(){
-        return sinaimg;
-    }
-    public void setVideoUrl(String videoUrl){
-        this.videoUrl = videoUrl;
-    }
-
-    public String getVideoUrl(){
-        return videoUrl;
-    }
-    public void setDiffDegree(Long diffDegree){
-        this.diffDegree = diffDegree;
-    }
-
-    public Long getDiffDegree(){
-        return diffDegree;
-    }
-    public void setCityid(Long cityid){
-        this.cityid = cityid;
-    }
-
-    public Long getCityid(){
-        return cityid;
-    }
-    public void setGs(String gs){
-        this.gs = gs;
-    }
-
-    public String getGs(){
-        return gs;
-    }
-    public void setKeyword(String keyword){
-        this.keyword = keyword;
-    }
-
-    public String getKeyword(){
-        return keyword;
-    }
-    public void setErrorRate(Long errorRate){
-        this.errorRate = errorRate;
-    }
-
-    public Long getErrorRate(){
-        return errorRate;
-    }
-    public void setMediaUrl(String mediaUrl){
-        this.mediaUrl = mediaUrl;
-    }
-
-    public String getMediaUrl(){
-        return mediaUrl;
-    }
-    public void setShowOptionType(Long showOptionType){
-        this.showOptionType = showOptionType;
-    }
-
-    public Long getShowOptionType(){
-        return showOptionType;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("type", getType())
-            .append("intNumber", getIntNumber())
-            .append("strTppe", getStrTppe())
-            .append("strTypeL", getStrTypeL())
-            .append("licenseType", getLicenseType())
-            .append("question", getQuestion())
-            .append("an1", getAn1())
-            .append("an2", getAn2())
-            .append("an3", getAn3())
-            .append("an4", getAn4())
-            .append("an5", getAn5())
-            .append("an6", getAn6())
-            .append("an7", getAn7())
-            .append("answerTrue", getAnswerTrue())
-            .append("explain1", getExplain1())
-            .append("bestAnswerId", getBestAnswerId())
-            .append("kemu", getKemu())
-            .append("jieshiFrom", getJieshiFrom())
-            .append("moretypes", getMoretypes())
-            .append("chapterid", getChapterid())
-            .append("sinaimg", getSinaimg())
-            .append("videoUrl", getVideoUrl())
-            .append("diffDegree", getDiffDegree())
-            .append("cityid", getCityid())
-            .append("gs", getGs())
-            .append("keyword", getKeyword())
-            .append("errorRate", getErrorRate())
-            .append("mediaUrl", getMediaUrl())
-            .append("showOptionType", getShowOptionType())
-            .toString();
-    }
-}

zzjs-service/src/main/java/com/miaxis/question/domain/QuestionInfoGet.java

@@ -1,17 +1,15 @@
 package com.miaxis.question.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.miaxis.common.annotation.Excel;
 import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 /**
  * 202204题库获取对象 question_info_get
  *

zzjs-service/src/main/java/com/miaxis/question/domain/QuestionInfoKtGet.java

@@ -0,0 +1,261 @@
+package com.miaxis.question.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import lombok.Data;
+/**
+ * 获取快通题库对象 question_info_kt_get
+ *
+ * @author miaxis
+ * @date 2022-04-08
+ */
+@Data
+@TableName("question_info_kt_get")
+@ApiModel(value = "QuestionInfoKtGet", description = "获取快通题库对象 question_info_kt_get")
+public class QuestionInfoKtGet extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /**  主键 */
+    @TableId(value = "id")
+    @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")
+    @ApiModelProperty(value = "在所有题目中的序号")
+    private Long number;
+
+    /** 正确答案 */
+    @Excel(name = "正确答案")
+    @TableField("answer")
+    @ApiModelProperty(value = "正确答案")
+    private String answer;
+
+    /** 答案关键词 */
+    @Excel(name = "答案关键词")
+    @TableField("answerkeyword")
+    @ApiModelProperty(value = "答案关键词")
+    private String answerkeyword;
+
+    /** 技巧讲解图片URL */
+    @Excel(name = "技巧讲解图片URL")
+    @TableField("explain_gif")
+    @ApiModelProperty(value = "技巧讲解图片URL")
+    private String explainGif;
+
+    /** 技巧讲解说明 */
+    @Excel(name = "技巧讲解说明")
+    @TableField("explain_jq")
+    @ApiModelProperty(value = "技巧讲解说明")
+    private String explainJq;
+
+    /** 官方解释 */
+    @Excel(name = "官方解释")
+    @TableField("explain_js")
+    @ApiModelProperty(value = "官方解释")
+    private String explainJs;
+
+    /** 技巧讲解语音URL */
+    @Excel(name = "技巧讲解语音URL")
+    @TableField("explain_mp3")
+    @ApiModelProperty(value = "技巧讲解语音URL")
+    private String explainMp3;
+
+    /** 题目图片URL */
+    @Excel(name = "题目图片URL")
+    @TableField("image")
+    @ApiModelProperty(value = "题目图片URL")
+    private String image;
+
+    /** 题目图片URL2 */
+    @Excel(name = "题目图片URL2")
+    @TableField("image_ydt")
+    @ApiModelProperty(value = "题目图片URL2")
+    private String imageYdt;
+
+    /** 题目 */
+    @Excel(name = "题目")
+    @TableField("issue")
+    @ApiModelProperty(value = "题目")
+    private String issue;
+
+    /** 答案选项 */
+    @Excel(name = "答案选项")
+    @TableField("opts")
+    @ApiModelProperty(value = "答案选项")
+    private String opts;
+
+    /** 答题技巧关键词 */
+    @Excel(name = "答题技巧关键词")
+    @TableField("skillkeyword")
+    @ApiModelProperty(value = "答题技巧关键词")
+    private String skillkeyword;
+
+    /** 题目关键词 */
+    @Excel(name = "题目关键词")
+    @TableField("titlekeyword")
+    @ApiModelProperty(value = "题目关键词")
+    private String titlekeyword;
+
+    /** 读题语音URL */
+    @Excel(name = "读题语音URL")
+    @TableField("issuemp3")
+    @ApiModelProperty(value = "读题语音URL")
+    private String issuemp3;
+
+    /** 答案语音URL */
+    @Excel(name = "答案语音URL")
+    @TableField("answermp3")
+    @ApiModelProperty(value = "答案语音URL")
+    private String answermp3;
+
+    /** 读题+答案语音URL */
+    @Excel(name = "读题+答案语音URL")
+    @TableField("explainjsmp3")
+    @ApiModelProperty(value = "读题+答案语音URL")
+    private String explainjsmp3;
+
+    /** 是否是C1\C2\C3驾驶证题目 */
+    @Excel(name = "是否是C1,C2,C3驾驶证题目")
+    @TableField("lice_car")
+    @ApiModelProperty(value = "是否是C1,C2,C3驾驶证题目")
+    private String liceCar;
+
+    /** 是否是A1\A3\B1驾驶证题目 */
+    @Excel(name = "是否是A1,A3,B1驾驶证题目")
+    @TableField("lice_bus")
+    @ApiModelProperty(value = "是否是A1,A3,B1驾驶证题目")
+    private String liceBus;
+
+    /** 是否是A2\B2驾驶证题目 */
+    @Excel(name = "是否是A2,B2驾驶证题目")
+    @TableField("lice_truck")
+    @ApiModelProperty(value = "是否是A2,B2驾驶证题目")
+    private String liceTruck;
+
+    /** 是否是D\E\F驾驶证题目 */
+    @Excel(name = "是否是D,E,F驾驶证题目")
+    @TableField("lice_moto")
+    @ApiModelProperty(value = "是否是D,E,F驾驶证题目")
+    private String liceMoto;
+
+    /** 顺序练习分类（包含科一到科四） */
+    @Excel(name = "顺序练习分类（包含科一到科四）", readConverterExp = "包=含科一到科四")
+    @TableField("seque_issue")
+    @ApiModelProperty(value = "顺序练习分类（包含科一到科四）")
+    private String sequeIssue;
+
+    /** 分类练习（包含科一到科四） */
+    @Excel(name = "分类练习（包含科一到科四）", readConverterExp = "包=含科一到科四")
+    @TableField("class_issue")
+    @ApiModelProperty(value = "分类练习（包含科一到科四）")
+    private String classIssue;
+
+    /** 地方专题（包含科一到科四） */
+    @Excel(name = "地方专题（包含科一到科四）", readConverterExp = "包=含科一到科四")
+    @TableField("place_issue")
+    @ApiModelProperty(value = "地方专题（包含科一到科四）")
+    private String placeIssue;
+
+    /** 精选题（包含科一到科四） */
+    @Excel(name = "精选题（包含科一到科四）", readConverterExp = "包=含科一到科四")
+    @TableField("excell_issue")
+    @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 = "题目在顺序练习中所属的模块名称")
+    @TableField("seque_issue_name")
+    @ApiModelProperty(value = "题目在顺序练习中所属的模块名称")
+    private String sequeIssueName;
+
+    /** 题目在地方专题中所属的模块名称 */
+    @Excel(name = "题目在地方专题中所属的模块名称")
+    @TableField("place_issue_name")
+    @ApiModelProperty(value = "题目在地方专题中所属的模块名称")
+    private String placeIssueName;
+
+    /** 题目在精选中所属的模块名称 */
+    @Excel(name = "题目在精选中所属的模块名称")
+    @TableField("excell_issue_name")
+    @ApiModelProperty(value = "题目在精选中所属的模块名称")
+    private String excellIssueName;
+
+    /** 题目在分类中所属的模块名称 */
+    @Excel(name = "题目在分类中所属的模块名称")
+    @TableField("class_issue_name")
+    @ApiModelProperty(value = "题目在分类中所属的模块名称")
+    private String classIssueName;
+
+    /** 题目类型 1判断题 2选择题 3多选题 */
+    @Excel(name = "题目类型 1判断题 2选择题 3多选题")
+    @TableField("question_type")
+    @ApiModelProperty(value = "题目类型 1判断题 2选择题 3多选题")
+    private Long questionType;
+
+    /** 分类练习排序字段 */
+    @Excel(name = "分类练习排序字段")
+    @TableField("class_sort")
+    @ApiModelProperty(value = "分类练习排序字段")
+    private Long classSort;
+
+    /** 精选考题排序字段 */
+    @Excel(name = "精选考题排序字段")
+    @TableField("excell_sort")
+    @ApiModelProperty(value = "精选考题排序字段")
+    private Long excellSort;
+
+    /** 顺序练习排序字段 */
+    @Excel(name = "顺序练习排序字段")
+    @TableField("seque_sort")
+    @ApiModelProperty(value = "顺序练习排序字段")
+    private Long sequeSort;
+
+    /** 地方专题排序字段 */
+    @Excel(name = "地方专题排序字段")
+    @TableField("place_sort")
+    @ApiModelProperty(value = "地方专题排序字段")
+    private Long placeSort;
+
+    /** 科目 */
+    @Excel(name = "科目")
+    @TableField("subject")
+    @ApiModelProperty(value = "科目")
+    private Long subject;
+
+}

zzjs-service/src/main/java/com/miaxis/question/mapper/QuestionCollectionMapper.java

@@ -1,26 +0,0 @@
-package com.miaxis.question.mapper;
-
-import java.util.List;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.question.domain.QuestionCollection;
-import com.miaxis.question.domain.QuestionError;
-import com.miaxis.question.dto.QuestionCollectionDto;
-import com.miaxis.question.dto.QuestionErrorDto;
-
-/**
- * 题目收藏Mapper接口
- *
- * @author miaxis
- * @date 2021-03-18
- */
-public interface QuestionCollectionMapper extends BaseMapper<QuestionCollection> {
-    /**
-     * 查询题目收藏列表
-     *
-     * @param questionCollection 题目收藏
-     * @return 题目收藏集合
-     */
-    public List<QuestionCollection> selectQuestionCollectionList(QuestionCollection questionCollection);
-
-    List<QuestionError> getQuestionCollectionList(QuestionCollectionDto questionCollectionDto);
-}

zzjs-service/src/main/java/com/miaxis/question/mapper/QuestionErrorMapper.java

@@ -1,26 +0,0 @@
-package com.miaxis.question.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.question.domain.QuestionError;
-import com.miaxis.question.dto.QuestionErrorDto;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 错题Mapper接口
- *
- * @author miaxis
- * @date 2021-03-16
- */
-public interface QuestionErrorMapper extends BaseMapper<QuestionError> {
-    /**
-     * 查询错题列表
-     *
-     * @param questionError 错题
-     * @return 错题集合
-     */
-    public List<QuestionError> selectQuestionErrorList(QuestionError questionError);
-
-    List<QuestionError> getQuestionErrorList(QuestionErrorDto questionErrorDto);
-}

zzjs-service/src/main/java/com/miaxis/question/mapper/QuestionInfoKtGetMapper.java

@@ -0,0 +1,69 @@
+package com.miaxis.question.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.question.domain.QuestionInfoKtGet;
+
+/**
+ * 获取快通题库Mapper接口
+ *
+ * @author miaxis
+ * @date 2022-04-08
+ */
+public interface QuestionInfoKtGetMapper extends BaseMapper<QuestionInfoKtGet> {
+    /**
+     * 查询获取快通题库列表
+     *
+     * @param questionInfoKtGet 获取快通题库
+     * @return 获取快通题库集合
+     */
+    public List<QuestionInfoKtGet> selectQuestionInfoKtGetList(QuestionInfoKtGet questionInfoKtGet);
+
+    public int selectQuestionInfoKtGetCount(QuestionInfoKtGet questionInfoKtGet);
+
+
+    /**
+     * ExplainGif
+     * @return
+     */
+    public List<QuestionInfoKtGet> selectQuestionInfoKtGetExplainGifList();
+
+    /**
+     * ExplainMp3
+     * @return
+     */
+    public List<QuestionInfoKtGet> selectQuestionInfoKtGetExplainMp3List();
+
+    /**
+     * Image
+     * @return
+     */
+    public List<QuestionInfoKtGet> selectQuestionInfoKtGetImageList();
+
+    /**
+     * ImageYdt
+     * @return
+     */
+    public List<QuestionInfoKtGet> selectQuestionInfoKtGetImageYdtList();
+
+    /**
+     * Issuemp3
+     * @return
+     */
+    public List<QuestionInfoKtGet> selectQuestionInfoKtGetIssuemp3List();
+
+    /**
+     * Answermp3
+     * @return
+     */
+    public List<QuestionInfoKtGet> selectQuestionInfoKtGetAnswermp3List();
+
+    /**
+     * Explainjsmp3
+     * @return
+     */
+    public List<QuestionInfoKtGet> selectQuestionInfoKtGetExplainjsmp3List();
+
+
+
+}

zzjs-service/src/main/java/com/miaxis/question/mapper/QuestionInfoMapper.java

@@ -1,27 +0,0 @@
-package com.miaxis.question.mapper;
-
-import java.util.List;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.question.domain.QuestionInfo;
-import com.miaxis.question.dto.QuestionInfoDto;
-import com.miaxis.question.dto.QuestionInfoRandDto;
-
-/**
- * 题库Mapper接口
- *
- * @author miaxis
- * @date 2021-03-12
- */
-public interface QuestionInfoMapper extends BaseMapper<QuestionInfo> {
-    /**
-     * 查询题库列表
-     *
-     * @param questionInfo 题库
-     * @return 题库集合
-     */
-    public List<QuestionInfo> selectQuestionInfoList(QuestionInfo questionInfo);
-
-    List<QuestionInfo> getQuestionInfoList(QuestionInfoDto questionInfoDto);
-
-    List<QuestionInfo> getRandQuestionInfoList(QuestionInfoRandDto questionInfoRandDto);
-}

zzjs-service/src/main/java/com/miaxis/question/service/IQuestionCollectionService.java

@@ -1,26 +0,0 @@
-package com.miaxis.question.service;
-
-import java.util.List;
-import com.miaxis.question.domain.QuestionCollection;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.question.domain.QuestionError;
-import com.miaxis.question.dto.QuestionCollectionDto;
-import com.miaxis.question.dto.QuestionErrorDto;
-
-/**
- * 题目收藏Service接口
- *
- * @author miaxis
- * @date 2021-03-18
- */
-public interface IQuestionCollectionService extends IService<QuestionCollection>{
-    /**
-     * 查询题目收藏列表
-     *
-     * @param questionCollection 题目收藏
-     * @return 题目收藏集合
-     */
-    public List<QuestionCollection> selectQuestionCollectionList(QuestionCollection questionCollection);
-
-    List<QuestionError> getQuestionCollectionList(QuestionCollectionDto questionCollectionDto);
-}

zzjs-service/src/main/java/com/miaxis/question/service/IQuestionErrorService.java

@@ -1,24 +0,0 @@
-package com.miaxis.question.service;
-
-import java.util.List;
-import com.miaxis.question.domain.QuestionError;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.question.dto.QuestionErrorDto;
-
-/**
- * 错题Service接口
- *
- * @author miaxis
- * @date 2021-03-16
- */
-public interface IQuestionErrorService extends IService<QuestionError>{
-    /**
-     * 查询错题列表
-     *
-     * @param questionError 错题
-     * @return 错题集合
-     */
-    public List<QuestionError> selectQuestionErrorList(QuestionError questionError);
-
-    public List<QuestionError> getQuestionErrorList(QuestionErrorDto questionErrorDto);
-}

zzjs-service/src/main/java/com/miaxis/question/service/IQuestionInfoKtGetService.java

@@ -0,0 +1,65 @@
+package com.miaxis.question.service;
+
+import java.util.List;
+import com.miaxis.question.domain.QuestionInfoKtGet;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 获取快通题库Service接口
+ *
+ * @author miaxis
+ * @date 2022-04-08
+ */
+public interface IQuestionInfoKtGetService extends IService<QuestionInfoKtGet>{
+    /**
+     * 查询获取快通题库列表
+     *
+     * @param questionInfoKtGet 获取快通题库
+     * @return 获取快通题库集合
+     */
+    public List<QuestionInfoKtGet> selectQuestionInfoKtGetList(QuestionInfoKtGet questionInfoKtGet);
+
+    public int selectQuestionInfoKtGetCount(QuestionInfoKtGet questionInfoKtGet);
+
+    /**
+     * ExplainGif
+     * @return
+     */
+    public List<QuestionInfoKtGet> selectQuestionInfoKtGetExplainGifList();
+
+    /**
+     * ExplainMp3
+     * @return
+     */
+    public List<QuestionInfoKtGet> selectQuestionInfoKtGetExplainMp3List();
+
+    /**
+     * Image
+     * @return
+     */
+    public List<QuestionInfoKtGet> selectQuestionInfoKtGetImageList();
+
+    /**
+     * ImageYdt
+     * @return
+     */
+    public List<QuestionInfoKtGet> selectQuestionInfoKtGetImageYdtList();
+
+    /**
+     * Issuemp3
+     * @return
+     */
+    public List<QuestionInfoKtGet> selectQuestionInfoKtGetIssuemp3List();
+
+    /**
+     * Answermp3
+     * @return
+     */
+    public List<QuestionInfoKtGet> selectQuestionInfoKtGetAnswermp3List();
+
+    /**
+     * Explainjsmp3
+     * @return
+     */
+    public List<QuestionInfoKtGet> selectQuestionInfoKtGetExplainjsmp3List();
+}

zzjs-service/src/main/java/com/miaxis/question/service/IQuestionInfoService.java

@@ -1,20 +0,0 @@
-package com.miaxis.question.service;
-
-import java.util.List;
-import com.miaxis.question.domain.QuestionInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.question.dto.QuestionInfoDto;
-import com.miaxis.question.dto.QuestionInfoRandDto;
-
-/**
- * 题库Service接口
- *
- * @author miaxis
- * @date 2021-03-12
- */
-public interface IQuestionInfoService extends IService<QuestionInfo>{
-
-    List<QuestionInfo> getQuestionInfoList(QuestionInfoDto questionInfoDto);
-
-    List<QuestionInfo> getRandQuestionInfoList(QuestionInfoRandDto questionInfoRandDto);
-}

zzjs-service/src/main/java/com/miaxis/question/service/impl/QuestionCollectionServiceImpl.java

@@ -1,41 +0,0 @@
-package com.miaxis.question.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.question.domain.QuestionCollection;
-import com.miaxis.question.domain.QuestionError;
-import com.miaxis.question.dto.QuestionCollectionDto;
-import com.miaxis.question.mapper.QuestionCollectionMapper;
-import com.miaxis.question.service.IQuestionCollectionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 题目收藏Service业务层处理
- *
- * @author miaxis
- * @date 2021-03-18
- */
-@Service
-public class QuestionCollectionServiceImpl extends ServiceImpl<QuestionCollectionMapper, QuestionCollection> implements IQuestionCollectionService {
-    @Autowired
-    private QuestionCollectionMapper questionCollectionMapper;
-
-    /**
-     * 查询题目收藏列表
-     *
-     * @param questionCollection 题目收藏
-     * @return 题目收藏
-     */
-    @Override
-    public List<QuestionCollection> selectQuestionCollectionList(QuestionCollection questionCollection){
-        return questionCollectionMapper.selectQuestionCollectionList(questionCollection);
-    }
-
-
-    @Override
-    public List<QuestionError> getQuestionCollectionList(QuestionCollectionDto questionCollectionDto) {
-        return questionCollectionMapper.getQuestionCollectionList(questionCollectionDto);
-    }
-}

zzjs-service/src/main/java/com/miaxis/question/service/impl/QuestionErrorServiceImpl.java

@@ -1,42 +0,0 @@
-package com.miaxis.question.service.impl;
-
-import java.util.List;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.miaxis.common.utils.DateUtils;
-import com.miaxis.question.dto.QuestionErrorDto;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.apache.commons.lang3.StringUtils;
-import com.miaxis.question.mapper.QuestionErrorMapper;
-import com.miaxis.question.domain.QuestionError;
-import com.miaxis.question.service.IQuestionErrorService;
-
-/**
- * 错题Service业务层处理
- *
- * @author miaxis
- * @date 2021-03-16
- */
-@Service
-public class QuestionErrorServiceImpl extends ServiceImpl<QuestionErrorMapper, QuestionError> implements IQuestionErrorService {
-    @Autowired
-    private QuestionErrorMapper questionErrorMapper;
-
-    /**
-     * 查询错题列表
-     *
-     * @param questionError 错题
-     * @return 错题
-     */
-    @Override
-    public List<QuestionError> selectQuestionErrorList(QuestionError questionError){
-        return questionErrorMapper.selectQuestionErrorList(questionError);
-    }
-
-    @Override
-    public List<QuestionError> getQuestionErrorList(QuestionErrorDto questionErrorDto) {
-        return questionErrorMapper.getQuestionErrorList(questionErrorDto);
-    }
-}

zzjs-service/src/main/java/com/miaxis/question/service/impl/QuestionInfoKtGetServiceImpl.java

@@ -0,0 +1,100 @@
+package com.miaxis.question.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.miaxis.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+import com.miaxis.question.mapper.QuestionInfoKtGetMapper;
+import com.miaxis.question.domain.QuestionInfoKtGet;
+import com.miaxis.question.service.IQuestionInfoKtGetService;
+
+/**
+ * 获取快通题库Service业务层处理
+ *
+ * @author miaxis
+ * @date 2022-04-08
+ */
+@Service
+public class QuestionInfoKtGetServiceImpl extends ServiceImpl<QuestionInfoKtGetMapper, QuestionInfoKtGet> implements IQuestionInfoKtGetService {
+    @Autowired
+    private QuestionInfoKtGetMapper questionInfoKtGetMapper;
+
+    /**
+     * 查询获取快通题库列表
+     *
+     * @param questionInfoKtGet 获取快通题库
+     * @return 获取快通题库
+     */
+    @Override
+    public List<QuestionInfoKtGet> selectQuestionInfoKtGetList(QuestionInfoKtGet questionInfoKtGet){
+        return questionInfoKtGetMapper.selectQuestionInfoKtGetList(questionInfoKtGet);
+    }
+
+    @Override
+    public int selectQuestionInfoKtGetCount(QuestionInfoKtGet questionInfoKtGet) {
+        return questionInfoKtGetMapper.selectQuestionInfoKtGetCount(questionInfoKtGet);
+    }
+
+
+
+    /**
+     * ExplainGif
+     * @return
+     */
+    public List<QuestionInfoKtGet> selectQuestionInfoKtGetExplainGifList() {
+        return questionInfoKtGetMapper.selectQuestionInfoKtGetExplainGifList();
+    }
+
+    /**
+     * ExplainMp3
+     * @return
+     */
+    public List<QuestionInfoKtGet> selectQuestionInfoKtGetExplainMp3List() {
+        return questionInfoKtGetMapper.selectQuestionInfoKtGetExplainMp3List();
+    }
+
+    /**
+     * Image
+     * @return
+     */
+    public List<QuestionInfoKtGet> selectQuestionInfoKtGetImageList() {
+        return questionInfoKtGetMapper.selectQuestionInfoKtGetImageList();
+    }
+
+    /**
+     * ImageYdt
+     * @return
+     */
+    public List<QuestionInfoKtGet> selectQuestionInfoKtGetImageYdtList() {
+        return questionInfoKtGetMapper.selectQuestionInfoKtGetImageYdtList();
+    }
+
+    /**
+     * Issuemp3
+     * @return
+     */
+    public List<QuestionInfoKtGet> selectQuestionInfoKtGetIssuemp3List() {
+        return questionInfoKtGetMapper.selectQuestionInfoKtGetIssuemp3List();
+    }
+
+    /**
+     * Answermp3
+     * @return
+     */
+    public List<QuestionInfoKtGet> selectQuestionInfoKtGetAnswermp3List() {
+        return questionInfoKtGetMapper.selectQuestionInfoKtGetAnswermp3List();
+    }
+
+    /**
+     * Explainjsmp3
+     * @return
+     */
+    public List<QuestionInfoKtGet> selectQuestionInfoKtGetExplainjsmp3List() {
+        return questionInfoKtGetMapper.selectQuestionInfoKtGetExplainjsmp3List();
+    }
+
+}

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

@@ -1,45 +0,0 @@
-package com.miaxis.question.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.question.domain.QuestionInfo;
-import com.miaxis.question.dto.QuestionInfoDto;
-import com.miaxis.question.dto.QuestionInfoRandDto;
-import com.miaxis.question.mapper.QuestionInfoMapper;
-import com.miaxis.question.service.IQuestionInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 题库Service业务层处理
- *
- * @author miaxis
- * @date 2021-03-12
- */
-@Service
-public class QuestionInfoServiceImpl extends ServiceImpl<QuestionInfoMapper, QuestionInfo> implements IQuestionInfoService {
-    @Autowired
-    private QuestionInfoMapper questionInfoMapper;
-
-//    /**
-//     * 查询题库列表
-//     *
-//     * @param questionInfo 题库
-//     * @return 题库
-//     */
-//    @Override
-//    public List<QuestionInfo> selectQuestionInfoList(QuestionInfo questionInfo){
-//        return questionInfoMapper.selectQuestionInfoList(questionInfo);
-//    }
-
-    @Override
-    public List<QuestionInfo> getQuestionInfoList(QuestionInfoDto questionInfoDto) {
-        return questionInfoMapper.getQuestionInfoList(questionInfoDto);
-    }
-
-    @Override
-    public List<QuestionInfo> getRandQuestionInfoList(QuestionInfoRandDto questionInfoRandDto) {
-        return questionInfoMapper.getRandQuestionInfoList(questionInfoRandDto);
-    }
-}

zzjs-service/src/main/java/com/miaxis/question/vo/QuestionInfoVo.java

@@ -1,198 +0,0 @@
-package com.miaxis.question.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 题库对象 question_info
- *
- * @author miaxis
- * @date 2021-03-12
- */
-@Data
-@ApiModel(value = "QuestionInfoVo", description = "题库对象出参")
-public class QuestionInfoVo extends BaseBusinessEntity {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    @TableId("id")
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    /**
-     * 类型
-     */
-    @Excel(name = "类型 1:选择题 2:单选题 3:多选题")
-    @TableField("type")
-    @ApiModelProperty(value = "类型 1:选择题 2:单选题 3:多选题")
-    private Long type;
-
-
-    /**
-     * 许可车型
-     */
-    @Excel(name = "许可车型")
-    @TableField("license_type")
-    @ApiModelProperty(value = "许可车型")
-    private String licenseType;
-
-    /**
-     * 问题
-     */
-    @Excel(name = "问题")
-    @TableField("question")
-    @ApiModelProperty(value = "问题")
-    private String question;
-
-    /**
-     * 答案1
-     */
-    @Excel(name = "答案1")
-    @TableField("an1")
-    @ApiModelProperty(value = "答案1")
-    private String an1;
-
-    /**
-     * 答案2
-     */
-    @Excel(name = "答案2")
-    @TableField("an2")
-    @ApiModelProperty(value = "答案2")
-    private String an2;
-
-    /**
-     * 答案3
-     */
-    @Excel(name = "答案3")
-    @TableField("an3")
-    @ApiModelProperty(value = "答案3")
-    private String an3;
-
-    /**
-     * 答案4
-     */
-    @Excel(name = "答案4")
-    @TableField("an4")
-    @ApiModelProperty(value = "答案4")
-    private String an4;
-
-    /**
-     * 答案5
-     */
-    @Excel(name = "答案5")
-    @TableField("an5")
-    @ApiModelProperty(value = "答案5")
-    private String an5;
-
-    /**
-     * 答案6
-     */
-    @Excel(name = "答案6")
-    @TableField("an6")
-    @ApiModelProperty(value = "答案6")
-    private String an6;
-
-    /**
-     * 答案7
-     */
-    @Excel(name = "答案7")
-    @TableField("an7")
-    @ApiModelProperty(value = "答案7")
-    private String an7;
-
-    /**
-     * 正确答案
-     */
-    @Excel(name = "正确答案")
-    @TableField("answer_true")
-    @ApiModelProperty(value = "正确答案")
-    private String answerTrue;
-
-    /**
-     * 解释
-     */
-    @Excel(name = "解释")
-    @TableField("explain1")
-    @ApiModelProperty(value = "解释")
-    private String explain1;
-
-    /**
-     * 最佳答案
-     */
-    @Excel(name = "最佳答案")
-    @TableField("best_answer_id")
-    @ApiModelProperty(value = "最佳答案")
-    private String bestAnswerId;
-
-    /**
-     * 科目
-     */
-    @Excel(name = "科目")
-    @TableField("kemu")
-    @ApiModelProperty(value = "科目")
-    private Long kemu;
-
-    /**
-     * 更多类型
-     */
-    @Excel(name = "更多类型")
-    @TableField("moretypes")
-    @ApiModelProperty(value = "更多类型")
-    private String moretypes;
-
-
-    /**
-     * 图片文件名
-     */
-    @Excel(name = "图片文件名")
-    @TableField("sinaimg")
-    @ApiModelProperty(value = "图片文件名")
-    private String sinaimg;
-
-    /**
-     * 视频文件名
-     */
-    @Excel(name = "视频文件名")
-    @TableField("video_url")
-    @ApiModelProperty(value = "视频文件名")
-    private String videoUrl;
-
-
-    /**
-     * 城市
-     */
-    @Excel(name = "城市")
-    @TableField("cityid")
-    @ApiModelProperty(value = "城市")
-    private Long cityid;
-
-
-
-    /**
-     * 文件地址
-     */
-    @Excel(name = "文件地址")
-    @TableField("media_url")
-    @ApiModelProperty(value = "文件地址")
-    private String mediaUrl;
-
-    /**
-     * 是否显示
-     */
-    @Excel(name = "是否显示")
-    @TableField("show_option_type")
-    @ApiModelProperty(value = "是否显示")
-    private Long showOptionType;
-
-}
-

zzjs-service/src/main/resources/mapper/question/QuestionCollectionMapper.xml

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.miaxis.question.mapper.QuestionCollectionMapper">
-
-    <resultMap type="QuestionCollection" id="QuestionCollectionResult">
-        <result property="id"    column="id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="questionId"    column="question_id"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
-
-    <sql id="selectQuestionCollectionVo">
-        select id, user_id, question_id, create_time, update_time from question_collection
-    </sql>
-
-    <select id="selectQuestionCollectionList" parameterType="QuestionCollection" resultMap="QuestionCollectionResult">
-        <include refid="selectQuestionCollectionVo"/>
-        <where>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="questionId != null "> and question_id = #{questionId}</if>
-        </where>
-    </select>
-
-
-
-    <select id="getQuestionCollectionList" parameterType="com.miaxis.question.dto.QuestionCollectionDto" resultType="com.miaxis.question.vo.QuestionInfoVo">
-        select qi.id,type,
-        question, an1,
-        an2, an3,
-        an4,
-        an5,
-        an6,
-        an7,
-        answer_true,
-        explain1,
-        best_answer_id,
-        kemu,
-        sinaimg,
-        video_url,
-        cityid,
-        media_url,
-        show_option_type
-        from question_info qi
-        JOIN question_collection qe
-        ON qi.id = qe.question_id
-        <where>
-            <if test="userId != null"> and qe.user_id = #{userId} </if>
-            <if test="questionId != null "> and question_id = #{questionId}</if>
-            <if test="kemu != null "> and kemu = #{kemu}</if>
-        </where>
-    </select>
-
-
-</mapper>

zzjs-service/src/main/resources/mapper/question/QuestionErrorMapper.xml

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.miaxis.question.mapper.QuestionErrorMapper">
-
-    <resultMap type="QuestionError" id="QuestionErrorResult">
-        <result property="id"    column="id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="questionId"    column="question_id"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
-
-    <sql id="selectQuestionErrorVo">
-        select id, user_id, question_id, create_time, update_time from question_error
-    </sql>
-
-    <select id="selectQuestionErrorList" parameterType="QuestionError" resultMap="QuestionErrorResult">
-        <include refid="selectQuestionErrorVo"/>
-        <where>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="questionId != null "> and question_id = #{questionId}</if>
-        </where>
-    </select>
-
-
-    <select id="getQuestionErrorList" parameterType="com.miaxis.question.dto.QuestionErrorDto" resultType="com.miaxis.question.vo.QuestionInfoVo">
-        select qi.id,type,
-        question, an1,
-        an2, an3,
-        an4,
-        an5,
-        an6,
-        an7,
-        answer_true,
-        explain1,
-        best_answer_id,
-        kemu,
-        sinaimg,
-        video_url,
-        cityid,
-        media_url,
-        show_option_type
-        from question_info qi
-        JOIN question_error qe
-        ON qi.id = qe.question_id
-        <where>
-            <if test="userId != null"> and qe.user_id = #{userId} </if>
-            <if test="questionId != null "> and question_id = #{questionId}</if>
-            <if test="kemu != null "> and kemu = #{kemu}</if>
-        </where>
-    </select>
-
-
-</mapper>

zzjs-service/src/main/resources/mapper/question/QuestionInfoKtGetMapper.xml

@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miaxis.question.mapper.QuestionInfoKtGetMapper">
+
+    <resultMap type="QuestionInfoKtGet" id="QuestionInfoKtGetResult">
+        <result property="id"    column="id"    />
+        <result property="idKt"    column="id_kt"    />
+        <result property="idYdt"    column="id_ydt"    />
+        <result property="number"    column="number"    />
+        <result property="answer"    column="answer"    />
+        <result property="answerkeyword"    column="answerkeyword"    />
+        <result property="explainGif"    column="explain_gif"    />
+        <result property="explainJq"    column="explain_jq"    />
+        <result property="explainJs"    column="explain_js"    />
+        <result property="explainMp3"    column="explain_mp3"    />
+        <result property="image"    column="image"    />
+        <result property="imageYdt"    column="image_ydt"    />
+        <result property="issue"    column="issue"    />
+        <result property="opts"    column="opts"    />
+        <result property="skillkeyword"    column="skillkeyword"    />
+        <result property="titlekeyword"    column="titlekeyword"    />
+        <result property="issuemp3"    column="issuemp3"    />
+        <result property="answermp3"    column="answermp3"    />
+        <result property="explainjsmp3"    column="explainjsmp3"    />
+        <result property="liceCar"    column="lice_car"    />
+        <result property="liceBus"    column="lice_bus"    />
+        <result property="liceTruck"    column="lice_truck"    />
+        <result property="liceMoto"    column="lice_moto"    />
+        <result property="sequeIssue"    column="seque_issue"    />
+        <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"    />
+        <result property="classIssueName"    column="class_issue_name"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="questionType"    column="question_type"    />
+        <result property="classSort"    column="class_sort"    />
+        <result property="excellSort"    column="excell_sort"    />
+        <result property="sequeSort"    column="seque_sort"    />
+        <result property="placeSort"    column="place_sort"    />
+        <result property="subject"    column="subject"    />
+    </resultMap>
+
+    <sql id="selectQuestionInfoKtGetVo">
+        select * from question_info_kt_get
+    </sql>
+
+    <select id="selectQuestionInfoKtGetList" parameterType="QuestionInfoKtGet" resultMap="QuestionInfoKtGetResult">
+        <include refid="selectQuestionInfoKtGetVo"/>
+        <where>
+            <if test="idKt != null "> and id_kt = #{idKt}</if>
+            <if test="idYdt != null "> and id_ydt = #{idYdt}</if>
+            <if test="number != null "> and number = #{number}</if>
+            <if test="answer != null  and answer != ''"> and answer = #{answer}</if>
+            <if test="answerkeyword != null  and answerkeyword != ''"> and answerkeyword = #{answerkeyword}</if>
+            <if test="explainGif != null  and explainGif != ''"> and explain_gif = #{explainGif}</if>
+            <if test="explainJq != null  and explainJq != ''"> and explain_jq = #{explainJq}</if>
+            <if test="explainJs != null  and explainJs != ''"> and explain_js = #{explainJs}</if>
+            <if test="explainMp3 != null  and explainMp3 != ''"> and explain_mp3 = #{explainMp3}</if>
+            <if test="image != null  and image != ''"> and image = #{image}</if>
+            <if test="imageYdt != null  and imageYdt != ''"> and image_ydt = #{imageYdt}</if>
+            <if test="issue != null  and issue != ''"> and issue = #{issue}</if>
+            <if test="opts != null  and opts != ''"> and opts = #{opts}</if>
+            <if test="skillkeyword != null  and skillkeyword != ''"> and skillkeyword = #{skillkeyword}</if>
+            <if test="titlekeyword != null  and titlekeyword != ''"> and titlekeyword = #{titlekeyword}</if>
+            <if test="issuemp3 != null  and issuemp3 != ''"> and issuemp3 = #{issuemp3}</if>
+            <if test="answermp3 != null  and answermp3 != ''"> and answermp3 = #{answermp3}</if>
+            <if test="explainjsmp3 != null  and explainjsmp3 != ''"> and explainjsmp3 = #{explainjsmp3}</if>
+            <if test="liceCar != null  and liceCar != ''"> and lice_car = #{liceCar}</if>
+            <if test="liceBus != null  and liceBus != ''"> and lice_bus = #{liceBus}</if>
+            <if test="liceTruck != null  and liceTruck != ''"> and lice_truck = #{liceTruck}</if>
+            <if test="liceMoto != null  and liceMoto != ''"> and lice_moto = #{liceMoto}</if>
+            <if test="sequeIssue != null  and sequeIssue != ''"> and seque_issue = #{sequeIssue}</if>
+            <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>
+            <if test="classIssueName != null  and classIssueName != ''"> and class_issue_name like concat('%', #{classIssueName}, '%')</if>
+            <if test="questionType != null "> and question_type = #{questionType}</if>
+            <if test="classSort != null "> and class_sort = #{classSort}</if>
+            <if test="excellSort != null "> and excell_sort = #{excellSort}</if>
+            <if test="sequeSort != null "> and seque_sort = #{sequeSort}</if>
+            <if test="placeSort != null "> and place_sort = #{placeSort}</if>
+            <if test="subject != null "> and subject = #{subject}</if>
+        </where>
+    </select>
+
+
+
+    <select id="selectQuestionInfoKtGetCount" parameterType="QuestionInfoKtGet" resultType="int">
+        select count(1) from question_info_kt_get
+        <where>
+            <if test="idKt != null "> and id_kt = #{idKt}</if>
+            <if test="idYdt != null "> and id_ydt = #{idYdt}</if>
+            <if test="number != null "> and number = #{number}</if>
+            <if test="answer != null  and answer != ''"> and answer = #{answer}</if>
+            <if test="answerkeyword != null  and answerkeyword != ''"> and answerkeyword = #{answerkeyword}</if>
+            <if test="explainGif != null  and explainGif != ''"> and explain_gif = #{explainGif}</if>
+            <if test="explainJq != null  and explainJq != ''"> and explain_jq = #{explainJq}</if>
+            <if test="explainJs != null  and explainJs != ''"> and explain_js = #{explainJs}</if>
+            <if test="explainMp3 != null  and explainMp3 != ''"> and explain_mp3 = #{explainMp3}</if>
+            <if test="image != null  and image != ''"> and image = #{image}</if>
+            <if test="imageYdt != null  and imageYdt != ''"> and image_ydt = #{imageYdt}</if>
+            <if test="issue != null  and issue != ''"> and issue = #{issue}</if>
+            <if test="opts != null  and opts != ''"> and opts = #{opts}</if>
+            <if test="skillkeyword != null  and skillkeyword != ''"> and skillkeyword = #{skillkeyword}</if>
+            <if test="titlekeyword != null  and titlekeyword != ''"> and titlekeyword = #{titlekeyword}</if>
+            <if test="issuemp3 != null  and issuemp3 != ''"> and issuemp3 = #{issuemp3}</if>
+            <if test="answermp3 != null  and answermp3 != ''"> and answermp3 = #{answermp3}</if>
+            <if test="explainjsmp3 != null  and explainjsmp3 != ''"> and explainjsmp3 = #{explainjsmp3}</if>
+            <if test="liceCar != null  and liceCar != ''"> and lice_car = #{liceCar}</if>
+            <if test="liceBus != null  and liceBus != ''"> and lice_bus = #{liceBus}</if>
+            <if test="liceTruck != null  and liceTruck != ''"> and lice_truck = #{liceTruck}</if>
+            <if test="liceMoto != null  and liceMoto != ''"> and lice_moto = #{liceMoto}</if>
+            <if test="sequeIssue != null  and sequeIssue != ''"> and seque_issue = #{sequeIssue}</if>
+            <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>
+            <if test="classIssueName != null  and classIssueName != ''"> and class_issue_name like concat('%', #{classIssueName}, '%')</if>
+            <if test="questionType != null "> and question_type = #{questionType}</if>
+            <if test="classSort != null "> and class_sort = #{classSort}</if>
+            <if test="excellSort != null "> and excell_sort = #{excellSort}</if>
+            <if test="sequeSort != null "> and seque_sort = #{sequeSort}</if>
+            <if test="placeSort != null "> and place_sort = #{placeSort}</if>
+            <if test="subject != null "> and subject = #{subject}</if>
+        </where>
+    </select>
+
+
+
+    <select id="selectQuestionInfoKtGetExplainGifList"  resultMap="QuestionInfoKtGetResult">
+        select * from question_info_kt_get where explain_gif!=''
+    </select>
+
+    <select id="selectQuestionInfoKtGetExplainMp3List"  resultMap="QuestionInfoKtGetResult">
+        select * from question_info_kt_get where explain_mp3!=''
+    </select>
+
+    <select id="selectQuestionInfoKtGetImageList"  resultMap="QuestionInfoKtGetResult">
+        select * from question_info_kt_get where image!=''
+    </select>
+
+    <select id="selectQuestionInfoKtGetImageYdtList"  resultMap="QuestionInfoKtGetResult">
+        select * from question_info_kt_get where image_ydt!=''
+    </select>
+
+    <select id="selectQuestionInfoKtGetIssuemp3List"  resultMap="QuestionInfoKtGetResult">
+        select * from question_info_kt_get where issuemp3!=''
+    </select>
+
+    <select id="selectQuestionInfoKtGetAnswermp3List"  resultMap="QuestionInfoKtGetResult">
+        select * from question_info_kt_get where answermp3!=''
+    </select>
+
+    <select id="selectQuestionInfoKtGetExplainjsmp3List"  resultMap="QuestionInfoKtGetResult">
+        select * from question_info_kt_get where explainjsmp3!=''
+    </select>
+
+
+</mapper>

zzjs-service/src/main/resources/mapper/question/QuestionInfoMapper.xml

@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.miaxis.question.mapper.QuestionInfoMapper">
-
-    <resultMap type="QuestionInfo" id="QuestionInfoResult">
-        <result property="id"    column="id"    />
-        <result property="type"    column="type"    />
-        <result property="intNumber"    column="int_number"    />
-        <result property="strTppe"    column="str_tppe"    />
-        <result property="strTypeL"    column="str_type_l"    />
-        <result property="licenseType"    column="license_type"    />
-        <result property="question"    column="question"    />
-        <result property="an1"    column="an1"    />
-        <result property="an2"    column="an2"    />
-        <result property="an3"    column="an3"    />
-        <result property="an4"    column="an4"    />
-        <result property="an5"    column="an5"    />
-        <result property="an6"    column="an6"    />
-        <result property="an7"    column="an7"    />
-        <result property="answerTrue"    column="answer_true"    />
-        <result property="explain1"    column="explain1"    />
-        <result property="bestAnswerId"    column="best_answer_id"    />
-        <result property="kemu"    column="kemu"    />
-        <result property="jieshiFrom"    column="jieshi_from"    />
-        <result property="moretypes"    column="moretypes"    />
-        <result property="chapterid"    column="chapterid"    />
-        <result property="sinaimg"    column="sinaimg"    />
-        <result property="videoUrl"    column="video_url"    />
-        <result property="diffDegree"    column="diff_degree"    />
-        <result property="cityid"    column="cityid"    />
-        <result property="gs"    column="gs"    />
-        <result property="keyword"    column="keyword"    />
-        <result property="errorRate"    column="error_rate"    />
-        <result property="mediaUrl"    column="media_url"    />
-        <result property="showOptionType"    column="show_option_type"    />
-    </resultMap>
-
-    <sql id="selectQuestionInfoVo">
-        select id, type, int_number, str_tppe, str_type_l, license_type, question, an1, an2, an3, an4, an5, an6, an7, answer_true, explain1, best_answer_id, kemu, jieshi_from, moretypes, chapterid, sinaimg, video_url, diff_degree, cityid, gs, keyword, error_rate, media_url, show_option_type from question_info
-    </sql>
-
-    <select id="selectQuestionInfoList" parameterType="QuestionInfo" resultMap="QuestionInfoResult">
-        <include refid="selectQuestionInfoVo"/>
-        <where>
-            <if test="id != null "> and id = #{id}</if>
-            <if test="type != null "> and type = #{type}</if>
-            <if test="intNumber != null  and intNumber != ''"> and int_number = #{intNumber}</if>
-            <if test="strTppe != null  and strTppe != ''"> and str_tppe = #{strTppe}</if>
-            <if test="strTypeL != null  and strTypeL != ''"> and str_type_l = #{strTypeL}</if>
-            <if test="licenseType != null  and licenseType != ''"> and license_type = #{licenseType}</if>
-            <if test="question != null  and question != ''"> and question = #{question}</if>
-            <if test="an1 != null  and an1 != ''"> and an1 = #{an1}</if>
-            <if test="an2 != null  and an2 != ''"> and an2 = #{an2}</if>
-            <if test="an3 != null  and an3 != ''"> and an3 = #{an3}</if>
-            <if test="an4 != null  and an4 != ''"> and an4 = #{an4}</if>
-            <if test="an5 != null  and an5 != ''"> and an5 = #{an5}</if>
-            <if test="an6 != null  and an6 != ''"> and an6 = #{an6}</if>
-            <if test="an7 != null  and an7 != ''"> and an7 = #{an7}</if>
-            <if test="answerTrue != null  and answerTrue != ''"> and answer_true = #{answerTrue}</if>
-            <if test="explain1 != null  and explain1 != ''"> and explain1 = #{explain1}</if>
-            <if test="bestAnswerId != null  and bestAnswerId != ''"> and best_answer_id = #{bestAnswerId}</if>
-            <if test="kemu != null "> and kemu = #{kemu}</if>
-            <if test="jieshiFrom != null  and jieshiFrom != ''"> and jieshi_from = #{jieshiFrom}</if>
-            <if test="moretypes != null  and moretypes != ''"> and moretypes = #{moretypes}</if>
-            <if test="chapterid != null "> and chapterid = #{chapterid}</if>
-            <if test="sinaimg != null  and sinaimg != ''"> and sinaimg = #{sinaimg}</if>
-            <if test="videoUrl != null  and videoUrl != ''"> and video_url = #{videoUrl}</if>
-            <if test="diffDegree != null "> and diff_degree = #{diffDegree}</if>
-            <if test="cityid != null "> and cityid = #{cityid}</if>
-            <if test="gs != null  and gs != ''"> and gs = #{gs}</if>
-            <if test="keyword != null  and keyword != ''"> and keyword = #{keyword}</if>
-            <if test="errorRate != null "> and error_rate = #{errorRate}</if>
-            <if test="mediaUrl != null  and mediaUrl != ''"> and media_url = #{mediaUrl}</if>
-            <if test="showOptionType != null "> and show_option_type = #{showOptionType}</if>
-        </where>
-    </select>
-
-
-    <select id="getQuestionInfoList" parameterType="com.miaxis.question.dto.QuestionInfoDto" resultType="com.miaxis.question.vo.QuestionInfoVo">
-        select id, type, question, an1, an2, an3, an4, an5, an6, an7, answer_true, explain1, best_answer_id, kemu, sinaimg, video_url, cityid, media_url, show_option_type from question_info
-        <where>
-            <if test="id != null "> and id = #{id}</if>
-            <if test="type != null "> and type = #{type}</if>
-            <if test="licenseType != null  and licenseType != ''"> and license_type like #{licenseType}</if>
-            <if test="kemu != null "> and kemu = #{kemu}</if>
-            <if test="showOptionType != null "> and show_option_type = #{showOptionType}</if>
-        </where>
-        <if test="orderByClause != null">
-            order by id ${orderByClause}
-        </if>
-    </select>
-
-
-    <select id="getRandQuestionInfoList" parameterType="com.miaxis.question.dto.QuestionInfoRandDto" resultType="com.miaxis.question.vo.QuestionInfoVo">
-        select id, type, question, an1, an2, an3, an4, an5, an6, an7, answer_true, explain1, best_answer_id, kemu, sinaimg, video_url, cityid, media_url, show_option_type from question_info
-        <where>
-            <if test="type != null "> and type = #{type}</if>
-            <if test="licenseType != null  and licenseType != ''"> and license_type like #{licenseType}</if>
-            <if test="kemu != null "> and kemu = #{kemu}</if>
-        </where>
-         order by rand() limit #{num}
-    </select>
-
-
-</mapper>