抓取一点通解释视频

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

@@ -45,6 +45,7 @@ public class KTDownload {
         List<QuestionInfoKtGet> issuemp3List = questionInfoGetService.selectQuestionInfoKtGetIssuemp3List(); //要修改
         downLoadList(issuemp3List, "issuemp3List");
 
+
         //answermp3
         List<QuestionInfoKtGet> answermp3List = questionInfoGetService.selectQuestionInfoKtGetAnswermp3List(); //要修改
         downLoadList(answermp3List, "answermp3List");
@@ -67,7 +68,7 @@ public class KTDownload {
                 String fileName = mediaUrl.substring(index + 1);
                 System.out.println(mediaUrl + "," + fileName);
                 try {
-                    downLoadFromUrl(mediaUrl, fileName, "G:\\中正\\题库图\\kt20220516\\explain_gif"); //要修改
+                    downLoadFromUrl(mediaUrl, fileName, "G:\\中正\\题库图\\kt20221009\\explain_gif"); //要修改
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -84,7 +85,7 @@ public class KTDownload {
                 String fileName = mediaUrl.substring(index + 1);
                 System.out.println(mediaUrl + "," + fileName);
                 try {
-                    downLoadFromUrl(mediaUrl, fileName, "G:\\中正\\题库图\\kt20220516\\explain_mp3"); //要修改
+                    downLoadFromUrl(mediaUrl, fileName, "G:\\中正\\题库图\\kt20221009\\explain_mp3"); //要修改
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -99,7 +100,7 @@ public class KTDownload {
                 String fileName = mediaUrl.substring(index + 1);
                 System.out.println(mediaUrl + "," + fileName);
                 try {
-                    downLoadFromUrl(mediaUrl, fileName, "G:\\中正\\题库图\\kt20220516\\image"); //要修改
+                    downLoadFromUrl(mediaUrl, fileName, "G:\\中正\\题库图\\kt20221009\\image"); //要修改
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -115,7 +116,7 @@ public class KTDownload {
                 String fileName = mediaUrl.substring(index + 1);
                 System.out.println(mediaUrl + "," + fileName);
                 try {
-                    downLoadFromUrl(mediaUrl, fileName, "G:\\中正\\题库图\\kt20220516\\issue_mp3"); //要修改
+                    downLoadFromUrl(mediaUrl, fileName, "G:\\中正\\题库图\\kt20221009\\issue_mp3"); //要修改
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -130,7 +131,7 @@ public class KTDownload {
                 String fileName = mediaUrl.substring(index + 1);
                 System.out.println(mediaUrl + "," + fileName);
                 try {
-                    downLoadFromUrl(mediaUrl, fileName, "G:\\中正\\题库图\\kt20220516\\answer_mp3"); //要修改
+                    downLoadFromUrl(mediaUrl, fileName, "G:\\中正\\题库图\\kt20221009\\answer_mp3"); //要修改
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -145,7 +146,7 @@ public class KTDownload {
                 String fileName = mediaUrl.substring(index + 1);
                 System.out.println(mediaUrl + "," + fileName);
                 try {
-                    downLoadFromUrl(mediaUrl, fileName, "G:\\中正\\题库图\\kt20220516\\explain_js_mp3");
+                    downLoadFromUrl(mediaUrl, fileName, "G:\\中正\\题库图\\kt20221009\\explain_js_mp3");
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

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

@@ -4,7 +4,9 @@ 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.QuestionFree;
 import com.miaxis.question.domain.QuestionInfoKtGet;
+import com.miaxis.question.service.IQuestionFreeService;
 import com.miaxis.question.service.IQuestionInfoKtGetService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -28,6 +30,9 @@ public class KtTest2 {
     @Autowired
     private IQuestionInfoKtGetService questionInfoGetService;
 
+    @Autowired
+    private IQuestionFreeService questionFreeService;
+
     /**
      * 获取一点通题库
      */
@@ -47,7 +52,7 @@ public class KtTest2 {
         for (Map<String, String> m : mapList) {
 
             String time = String.valueOf(System.currentTimeMillis() / 1000);
-            System.out.println(m.get("model")+","+m.get("subject"));
+            System.out.println(m.get("model") + "," + m.get("subject"));
             String result = ktService.getInfo(m.get("model"), m.get("subject"), time);
             JSONObject json = JSONObject.parseObject(result);
             JSONArray data = json.getJSONArray("data");
@@ -91,13 +96,13 @@ public class KtTest2 {
                     //查询当前是否数据是否存在
                     QuestionInfoKtGet questionInfoKtQuery = new QuestionInfoKtGet();
                     questionInfoKtQuery.setId(Long.parseLong(id2));
-                    int count = questionInfoGetService.selectQuestionInfoKtGetCount(questionInfoKtQuery);
-                    if(count==0) {
+                    int count = questionInfoGetService.selectQuestionInfoKtGetCount(questionInfoKtQuery);  //快通ID查询是否存在
+                    if (count == 0) {
                         QuestionInfoKtGet questionInfoKt = new QuestionInfoKtGet();
                         questionInfoKt.setId(Long.parseLong(id2));
-                        questionInfoKt.setIdYdt(idYdt==null?null:Long.parseLong(idYdt));
-                        questionInfoKt.setNumber(number==null?null:Long.parseLong(number));
-                        questionInfoKt.setQuestionType(type==null?null:Long.parseLong(type));
+                        questionInfoKt.setIdYdt(idYdt == null ? null : Long.parseLong(idYdt));
+                        questionInfoKt.setNumber(number == null ? null : Long.parseLong(number));
+                        questionInfoKt.setQuestionType(type == null ? null : Long.parseLong(type));
                         questionInfoKt.setAnswer(answer);
                         questionInfoKt.setAnswerkeyword(answerkeyword);
                         questionInfoKt.setExplainGif(explainGif);
@@ -128,62 +133,62 @@ public class KtTest2 {
                             questionInfoKt.setSubject(1l);
                             questionInfoKt.setSequeIssue(countid);
                             questionInfoKt.setSequeIssueName(title);
-                            long sort = j+1;
+                            long sort = j + 1;
                             questionInfoKt.setSequeSort(sort);
                         } else if ("k1_2".equals(m.get("subject"))) { // 科目一 精选必考题
                             questionInfoKt.setSubject(1l);
                             questionInfoKt.setExcellIssue(countid);
                             questionInfoKt.setExcellIssueName(title);
-                            long sort = j+1;
+                            long sort = j + 1;
                             questionInfoKt.setExcellSort(sort);
                         } else if ("k1_3".equals(m.get("subject"))) { // 科目一 分类练习
                             questionInfoKt.setSubject(1l);
                             questionInfoKt.setClassIssue(countid);
                             questionInfoKt.setClassIssueName(title);
-                            long sort = j+1;
+                            long sort = j + 1;
                             questionInfoKt.setClassSort(sort);
                         } else if ("k1_4".equals(m.get("subject"))) { //科目一 地方题库
                             questionInfoKt.setSubject(1l);
                             questionInfoKt.setPlaceIssue(countid);
                             questionInfoKt.setPlaceIssueName(title);
-                            long sort = j+1;
+                            long sort = j + 1;
                             questionInfoKt.setPlaceSort(sort);
                         } else if ("k4".equals(m.get("subject"))) {  //科目四   顺序练习
                             questionInfoKt.setSubject(4l);
                             questionInfoKt.setSequeIssue(countid);
                             questionInfoKt.setSequeIssueName(title);
-                            long sort = j+1;
+                            long sort = j + 1;
                             questionInfoKt.setSequeSort(sort);
                         } else if ("k4_2".equals(m.get("subject"))) { // 科目四 精选必考题
                             questionInfoKt.setSubject(4l);
                             questionInfoKt.setExcellIssue(countid);
                             questionInfoKt.setExcellIssueName(title);
-                            long sort = j+1;
+                            long sort = j + 1;
                             questionInfoKt.setExcellSort(sort);
                         } else if ("k4_3".equals(m.get("subject"))) { // 科目四 分类练习
                             questionInfoKt.setSubject(4l);
                             questionInfoKt.setClassIssue(countid);
                             questionInfoKt.setClassIssueName(title);
-                            long sort = j+1;
+                            long sort = j + 1;
                             questionInfoKt.setClassSort(sort);
                         } else if ("k4_4".equals(m.get("subject"))) { //科目四 地方题库
                             questionInfoKt.setSubject(4l);
                             questionInfoKt.setPlaceIssue(countid);
                             questionInfoKt.setPlaceIssueName(title);
-                            long sort = j+1;
+                            long sort = j + 1;
                             questionInfoKt.setPlaceSort(sort);
                         }
 
                         addList.add(questionInfoKt);
-                       // questionInfoGetService.save(questionInfoKt);
+                        // questionInfoGetService.save(questionInfoKt);
                     } else {
-                        List<QuestionInfoKtGet> list=questionInfoGetService.selectQuestionInfoKtGetList(questionInfoKtQuery);
-                        QuestionInfoKtGet questionInfoKtGet= list.get(0);
+                        List<QuestionInfoKtGet> list = questionInfoGetService.selectQuestionInfoKtGetList(questionInfoKtQuery);
+                        QuestionInfoKtGet questionInfoKtGet = list.get(0);
 
                         questionInfoKtGet.setId(Long.parseLong(id2));
-                        questionInfoKtGet.setIdYdt(idYdt==null?null:Long.parseLong(idYdt));
-                        questionInfoKtGet.setNumber(number==null?null:Long.parseLong(number));
-                        questionInfoKtGet.setQuestionType(type==null?null:Long.parseLong(type));
+                        questionInfoKtGet.setIdYdt(idYdt == null ? null : Long.parseLong(idYdt));
+                        questionInfoKtGet.setNumber(number == null ? null : Long.parseLong(number));
+                        questionInfoKtGet.setQuestionType(type == null ? null : Long.parseLong(type));
                         questionInfoKtGet.setAnswer(answer);
                         questionInfoKtGet.setAnswerkeyword(answerkeyword);
                         questionInfoKtGet.setExplainGif(explainGif);
@@ -214,19 +219,19 @@ public class KtTest2 {
                             questionInfoKtGet.setSubject(1l);
                             questionInfoKtGet.setSequeIssue(countid);
                             questionInfoKtGet.setSequeIssueName(title);
-                            long sort = j+1;
+                            long sort = j + 1;
                             questionInfoKtGet.setSequeSort(sort);
                         } else if ("k1_2".equals(m.get("subject"))) { // 科目一 精选必考题
                             questionInfoKtGet.setSubject(1l);
                             questionInfoKtGet.setExcellIssue(countid);
                             questionInfoKtGet.setExcellIssueName(title);
-                            long sort = j+1;
+                            long sort = j + 1;
                             questionInfoKtGet.setExcellSort(sort);
                         } else if ("k1_3".equals(m.get("subject"))) { // 科目一 分类练习
                             questionInfoKtGet.setSubject(1l);
                             questionInfoKtGet.setClassIssue(countid);
                             questionInfoKtGet.setClassIssueName(title);
-                            long sort = j+1;
+                            long sort = j + 1;
                             questionInfoKtGet.setClassSort(sort);
                         } else if ("k1_4".equals(m.get("subject"))) { //科目一 地方题库
                             questionInfoKtGet.setSubject(1l);
@@ -238,25 +243,25 @@ public class KtTest2 {
                             questionInfoKtGet.setSubject(4l);
                             questionInfoKtGet.setSequeIssue(countid);
                             questionInfoKtGet.setSequeIssueName(title);
-                            long sort = j+1;
+                            long sort = j + 1;
                             questionInfoKtGet.setSequeSort(sort);
                         } else if ("k4_2".equals(m.get("subject"))) { // 科目四 精选必考题
                             questionInfoKtGet.setSubject(4l);
                             questionInfoKtGet.setExcellIssue(countid);
                             questionInfoKtGet.setExcellIssueName(title);
-                            long sort = j+1;
+                            long sort = j + 1;
                             questionInfoKtGet.setExcellSort(sort);
                         } else if ("k4_3".equals(m.get("subject"))) { // 科目四 分类练习
                             questionInfoKtGet.setSubject(4l);
                             questionInfoKtGet.setClassIssue(countid);
                             questionInfoKtGet.setClassIssueName(title);
-                            long sort = j+1;
+                            long sort = j + 1;
                             questionInfoKtGet.setClassSort(sort);
                         } else if ("k4_4".equals(m.get("subject"))) { //科目四 地方题库
                             questionInfoKtGet.setSubject(4l);
                             questionInfoKtGet.setPlaceIssue(countid);
                             questionInfoKtGet.setPlaceIssueName(title);
-                            long sort = j+1;
+                            long sort = j + 1;
                             questionInfoKtGet.setPlaceSort(sort);
                         }
 
@@ -391,7 +396,6 @@ public class KtTest2 {
         mtc_k4_4.put("subject", "k4_4");
 
 
-
         List<Map<String, String>> mapList = new ArrayList<Map<String, String>>();
         //小车 科目一
         mapList.add(cart_k1);
@@ -525,4 +529,90 @@ public class KtTest2 {
     }
 
 
+    @Test
+    public void getFree() {
+        String time = String.valueOf(System.currentTimeMillis() / 1000);
+
+
+        String result2 = ktService.getFreeQuestions("", "k4", time);
+        JSONObject json2 = JSONObject.parseObject(result2);
+        JSONArray data2 = json2.getJSONArray("data");
+        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 issue = n2.getString("issue");  //题目
+            //查询当前是否数据是否存在
+            QuestionInfoKtGet questionInfoKtQuery = new QuestionInfoKtGet();
+
+            questionInfoKtQuery.setIdYdt(idYdt!=null?Long.parseLong(idYdt):0l);
+            int count = questionInfoGetService.selectQuestionInfoKtGetCount(questionInfoKtQuery);  //快通ID查询是否存在
+            if(idYdt==null){
+                System.out.println(issue);
+                System.out.println(j+1);
+            }
+            if (count == 0) {
+                continue;
+            } else {
+                List<QuestionInfoKtGet> list = questionInfoGetService.selectQuestionInfoKtGetList(questionInfoKtQuery);
+                QuestionInfoKtGet questionInfoKtGet = list.get(0);
+                questionInfoKtGet.setIsFree(1l);
+               long sort = j + 1;
+                questionInfoKtGet.setFreeSort(sort);
+               upList.add(questionInfoKtGet);
+            }
+        }
+       questionInfoGetService.updateBatchById(upList);
+    }
+
+
+    @Test
+    public void getFree2() {
+        String time = String.valueOf(System.currentTimeMillis() / 1000);
+        String km = "k4";
+
+        String result2 = ktService.getFreeQuestions("", km, time);
+        JSONObject json2 = JSONObject.parseObject(result2);
+        JSONArray data2 = json2.getJSONArray("data");
+        List<QuestionFree> addList = new ArrayList<QuestionFree>();
+        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 issue = n2.getString("issue");  //题目
+            //查询当前是否数据是否存在
+            QuestionInfoKtGet questionInfoKtQuery = new QuestionInfoKtGet();
+
+            questionInfoKtQuery.setIdYdt(idYdt!=null?Long.parseLong(idYdt):0l);
+            int count = questionInfoGetService.selectQuestionInfoKtGetCount(questionInfoKtQuery);  //快通ID查询是否存在
+            if(idYdt==null){
+                System.out.println(issue);
+                System.out.println(j+1);
+            }
+            if (count == 0) {
+                continue;
+            } else {
+                List<QuestionInfoKtGet> list = questionInfoGetService.selectQuestionInfoKtGetList(questionInfoKtQuery);
+                QuestionInfoKtGet questionInfoKtGet = list.get(0);
+                long sort = j + 1;
+                QuestionFree questionFree = new QuestionFree();
+                questionFree.setId(questionInfoKtGet.getId());
+                questionFree.setIdYdt(questionInfoKtGet.getIdYdt());
+                if("k4".equals(km)) {
+                    questionFree.setSubject(4);
+                } else if ("k1".equals(km)){
+                    questionFree.setSubject(1);
+                }
+                questionFree.setFreeSort(sort);
+
+                addList.add(questionFree);
+            }
+        }
+        questionFreeService.saveBatch(addList);
+    }
+
 }
+
+
+

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

@@ -14,7 +14,7 @@ public class Test03 {
 
     public void testExcel() throws Exception {
 
-        File file = new File("G:\\中正\\题库图\\一点通题库图片.xls");
+        File file = new File("G:\\中正\\题库图\\一点通题资格证库图片20220707.xls");
         InputStream inputStream = new FileInputStream(file);
         ExcelUtil<Test> util = new ExcelUtil<Test>(Test.class);
         List<Test> testList = util.importExcel(inputStream);
@@ -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:\\中正\\题库图\\media2");
+                downLoadFromUrl(t.mediaUrl,fileName,"G:\\中正\\题库图\\zgz20220707");
 
             }
 
@@ -55,10 +55,8 @@ public class Test03 {
         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+first);
+        File file = new File(saveDir+File.separator+fileName);
 
         FileOutputStream fos = new FileOutputStream(file);
 

zzjs-service/src/main/java/com/miaxis/feign/service/IKtService.java

@@ -45,4 +45,19 @@ public interface IKtService {
             @RequestParam("subject") String subject,
             @RequestParam("time") String time);
 
+
+    /**
+     *  获取题目
+     * @param model 小车：cart | 客车：bus | 货车：truck | 摩托车：mtc
+     * @param subject k1:顺序练习 | k1_2:精选必考题 | k1_3:分类练习 |k1_4:地方题库
+     * @param time 时间戳
+     * @return
+     */
+    @GetMapping(value = "question/getFreeQuestions")
+    String getFreeQuestions(
+            @RequestParam("model") String model,
+            @RequestParam("subject") String subject,
+            @RequestParam("time") String time);
+
+
 }

zzjs-service/src/main/java/com/miaxis/question/controller/QuestionFreeController.java

@@ -0,0 +1,117 @@
+package com.miaxis.question.controller;
+
+import com.miaxis.common.constant.Constants;
+import java.util.List;
+import java.util.Arrays;
+import io.swagger.annotations.*;
+import com.miaxis.common.core.domain.Response;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.question.domain.QuestionFree;
+import com.miaxis.question.service.IQuestionFreeService;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.common.core.page.ResponsePageInfo;
+
+/**
+ * 【 免费试用题】Controller
+ *
+ * @author miaxis
+ * @date 2022-06-10
+ */
+@RestController
+@RequestMapping("/free/free")
+@Api(tags={"【小程序- 免费试用题】"})
+public class QuestionFreeController extends BaseController{
+    @Autowired
+    private IQuestionFreeService questionFreeService;
+
+    /**
+     * 查询 免费试用题列表
+     */
+    @PreAuthorize("@ss.hasPermi('free:free: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<QuestionFree> list(@ModelAttribute QuestionFree questionFree){
+        startPage();
+        List<QuestionFree> list = questionFreeService.selectQuestionFreeList(questionFree);
+        return toResponsePageInfo(list);
+    }
+    
+    /**
+     * 导出 免费试用题列表
+     */
+    @PreAuthorize("@ss.hasPermi('free:free:export')")
+    @Log(title = " 免费试用题", businessType = BusinessTypeEnum.EXPORT)
+    @GetMapping("/export")
+    @ApiOperation("导出 免费试用题列表Excel")
+    public Response<String> export(@ModelAttribute QuestionFree questionFree){
+        List<QuestionFree> list = questionFreeService.selectQuestionFreeList(questionFree);
+        ExcelUtil<QuestionFree> util = new ExcelUtil<QuestionFree>(QuestionFree.class);
+        return util.exportExcel(list, "free");
+    }
+
+    /**
+     * 获取 免费试用题详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('free:free:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取 免费试用题详细信息")
+    public Response<QuestionFree> getInfo(
+            @ApiParam(name = "id", value = " 免费试用题参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(questionFreeService.getById(id));
+    }
+
+    /**
+     * 新增 免费试用题
+     */
+    @PreAuthorize("@ss.hasPermi('free:free:add')")
+    @Log(title = " 免费试用题", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增 免费试用题")
+    public Response<Integer> add(@RequestBody QuestionFree questionFree){
+        return toResponse(questionFreeService.save(questionFree) ? 1 : 0);
+    }
+
+    /**
+     * 修改 免费试用题
+     */
+    @PreAuthorize("@ss.hasPermi('free:free:edit')")
+    @Log(title = " 免费试用题", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改 免费试用题")
+    public Response<Integer> edit(@RequestBody QuestionFree questionFree){
+        return toResponse(questionFreeService.updateById(questionFree) ? 1 : 0);
+    }
+
+    /**
+     * 删除 免费试用题
+     */
+    @PreAuthorize("@ss.hasPermi('free:free: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(questionFreeService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

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

@@ -0,0 +1,51 @@
+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_free
+ *
+ * @author miaxis
+ * @date 2022-06-10
+ */
+@Data
+@TableName("question_free")
+@ApiModel(value = "QuestionFree", description = " 免费试用题对象 question_free")
+public class QuestionFree extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @TableId(value = "id",type = IdType.INPUT)
+    @ApiModelProperty(value = "ID")
+    private Long id;
+
+    /** ydt ID */
+    @Excel(name = "ydt ID")
+    @TableField("id_ydt")
+    @ApiModelProperty(value = "ydt ID")
+    private Long idYdt;
+
+    /** 科目 */
+    @Excel(name = "科目")
+    @TableField("subject")
+    @ApiModelProperty(value = "科目")
+    private Integer subject;
+
+    /** 免费题排序 */
+    @Excel(name = "免费题排序")
+    @TableField("free_sort")
+    @ApiModelProperty(value = "免费题排序")
+    private Long freeSort;
+
+
+}

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

@@ -253,4 +253,18 @@ public class QuestionInfoKtGet extends BaseBusinessEntity{
     @ApiModelProperty(value = "科目")
     private Long subject;
 
+
+    /** 是否免费试用  0 不是  1是 */
+    @Excel(name = "是否免费试用")
+    @TableField("is_free")
+    @ApiModelProperty(value = "是否免费试用 0 不是  1是")
+    private Long isFree;
+
+
+    /** 是否免费试用  0 不是  1是 */
+    @Excel(name = "是否免费试用")
+    @TableField("free_sort")
+    @ApiModelProperty(value = "是否免费试用 0 不是  1是")
+    private Long freeSort;
+
 }

zzjs-service/src/main/java/com/miaxis/question/dto/QuestionInfoDTO.java

@@ -119,13 +119,6 @@ public class QuestionInfoDTO extends BaseBusinessEntity {
     @ApiModelProperty(value = "精选题 0否 1是")
     private String excellIssue;
 
-    /** 是否是仿真考试题目 */
-    @ApiModelProperty(value = "是否是仿真考试题目")
-    private String copyIssue;
-
-    /** 是否是真实考场模拟题目 */
-    @ApiModelProperty(value = "是否是真实考场模拟题目")
-    private String mockIssue;
 
     /** 题目在顺序练习中所属的模块名称 */
     @ApiModelProperty(value = "题目在顺序练习中所属的模块名称")

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

@@ -0,0 +1,22 @@
+package com.miaxis.question.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.question.domain.QuestionFree;
+
+/**
+ *  免费试用题Mapper接口
+ *
+ * @author miaxis
+ * @date 2022-06-10
+ */
+public interface QuestionFreeMapper extends BaseMapper<QuestionFree> {
+    /**
+     * 查询 免费试用题列表
+     *
+     * @param questionFree  免费试用题
+     * @return  免费试用题集合
+     */
+    public List<QuestionFree> selectQuestionFreeList(QuestionFree questionFree);
+
+}

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

@@ -0,0 +1,21 @@
+package com.miaxis.question.service;
+
+import java.util.List;
+import com.miaxis.question.domain.QuestionFree;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *  免费试用题Service接口
+ *
+ * @author miaxis
+ * @date 2022-06-10
+ */
+public interface IQuestionFreeService extends IService<QuestionFree>{
+    /**
+     * 查询 免费试用题列表
+     *
+     * @param questionFree  免费试用题
+     * @return  免费试用题集合
+     */
+    public List<QuestionFree> selectQuestionFreeList(QuestionFree questionFree);
+}

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

@@ -0,0 +1,36 @@
+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.QuestionFreeMapper;
+import com.miaxis.question.domain.QuestionFree;
+import com.miaxis.question.service.IQuestionFreeService;
+
+/**
+ *  免费试用题Service业务层处理
+ *
+ * @author miaxis
+ * @date 2022-06-10
+ */
+@Service
+public class QuestionFreeServiceImpl extends ServiceImpl<QuestionFreeMapper, QuestionFree> implements IQuestionFreeService {
+    @Autowired
+    private QuestionFreeMapper questionFreeMapper;
+
+    /**
+     * 查询 免费试用题列表
+     *
+     * @param questionFree  免费试用题
+     * @return  免费试用题
+     */
+    @Override
+    public List<QuestionFree> selectQuestionFreeList(QuestionFree questionFree){
+        return questionFreeMapper.selectQuestionFreeList(questionFree);
+    }
+}

zzjs-service/src/main/resources/mapper/free/QuestionFreeMapper.xml

@@ -0,0 +1,29 @@
+<?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.QuestionFreeMapper">
+
+    <resultMap type="QuestionFree" id="QuestionFreeResult">
+        <result property="id"    column="id"    />
+        <result property="idYdt"    column="id_ydt"    />
+        <result property="subject"    column="subject"    />
+        <result property="freeSort"    column="free_sort"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectQuestionFreeVo">
+        select * from question_free
+    </sql>
+
+    <select id="selectQuestionFreeList" parameterType="QuestionFree" resultMap="QuestionFreeResult">
+        <include refid="selectQuestionFreeVo"/>
+        <where>
+            <if test="idYdt != null "> and id_ydt = #{idYdt}</if>
+            <if test="subject != null "> and subject = #{subject}</if>
+            <if test="freeSort != null "> and free_sort = #{freeSort}</if>
+        </where>
+    </select>
+
+</mapper>

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

@@ -45,6 +45,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sequeSort"    column="seque_sort"    />
         <result property="placeSort"    column="place_sort"    />
         <result property="subject"    column="subject"    />
+        <result property="isFree"    column="is_free"    />
+        <result property="freeSort"    column="free_sort"    />
     </resultMap>
 
     <sql id="selectQuestionInfoKtGetVo">
@@ -92,6 +94,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
+            <if test="isFree != null "> and is_free = #{isFree}</if>
+            <if test="freeSort != null "> and free_sort = #{freeSort}</if>
         </where>
     </select>
 
@@ -138,6 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
+            <if test="isFree != null "> and is_free = #{isFree}</if>
         </where>
     </select>