取驾校一点通ID

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

@@ -6,13 +6,18 @@ import com.miaxis.ZzjsApplication;
 import com.miaxis.feign.dto.Ydt;
 import com.miaxis.feign.service.IYdtService;
 import com.miaxis.question.domain.QuestionInfoGet;
+import com.miaxis.question.domain.QuestionYdtJs;
+import com.miaxis.question.domain.WebNoteAll;
 import com.miaxis.question.service.IQuestionInfoGetService;
+import com.miaxis.question.service.IQuestionYdtJsService;
+import com.miaxis.question.service.IWebNoteAllService;
 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 org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
 
 @SpringBootTest(classes = ZzjsApplication.class)
 @RunWith(SpringRunner.class)
@@ -25,26 +30,34 @@ public class YdtTest {
     @Autowired
     private IQuestionInfoGetService questionInfoGetService;
 
+
+    @Autowired
+    private IQuestionYdtJsService questionYdtJsService;
+
+    @Autowired
+    private IWebNoteAllService webNoteAllService;
+
+
     /**
      * 获取一点通题库
      */
     @Test
-    public void getInfo(){
+    public void getInfo() {
         Long kemu = 1l;
         String cartype = "3"; //0:小车(313) 1:货车(325) 2:客车(328) 3:摩托车(40)
 
-        String result = ydtService.getInfo(kemu,cartype);
+        String result = ydtService.getInfo(kemu, cartype);
         JSONObject json = JSONObject.parseObject(result);
         JSONObject result2 = json.getJSONObject("result");
         JSONArray questionList = result2.getJSONArray("questionList");
 
         for (int i = 0; i < questionList.size(); i++) {
-            JSONObject json1 = (JSONObject)questionList.get(i);
+            JSONObject json1 = (JSONObject) questionList.get(i);
             String id = json1.getString("id");
             String name = json1.getString("name");
             String rightAnswer = json1.getString("rightAnswer");
             String image = json1.getString("image");
-            if("".equals(image)){
+            if ("".equals(image)) {
                 image = null;
             }
             String explain = json1.getString("explain");
@@ -53,11 +66,11 @@ public class YdtTest {
 
             JSONArray option = json1.getJSONArray("option");
             QuestionInfoGet questionInfoGet = new QuestionInfoGet();
-            for (int j = 0; j <option.size() ; j++) {
-                JSONObject json2 = (JSONObject)option.get(j);
+            for (int j = 0; j < option.size(); j++) {
+                JSONObject json2 = (JSONObject) option.get(j);
                 String oid = json2.getString("id");
                 String oname = json2.getString("name");
-                if("A".equals(oid)) {
+                if ("A".equals(oid)) {
                     questionInfoGet.setAn1(oname);
                 } else if ("B".equals(oid)) {
                     questionInfoGet.setAn2(oname);
@@ -89,24 +102,91 @@ public class YdtTest {
     }
 
 
-
-
     @Test
     public void getSkillInfo() {
-        Ydt ydt = new Ydt();
-        ydt.setNonceStr("0E1EE833-16AE-4BBE-A3ED-5697E3FC21FF");
-        ydt.setQuestionId("23388");
-        ydt.setQuestionId("1539");
-        //String str = "{\"nonceStr\":\"0E1EE833-16AE-4BBE-A3ED-5697E3FC21FF\",\"questionId\":\"13581\"}";
 
-        String jsonObject =  JSONObject.toJSONString(ydt);
-        System.out.println(jsonObject);
-        String result = ydtService.getSkillInfo(jsonObject);
+        List<WebNoteAll> list = webNoteAllService.selectWebNoteAllList(null);
+        System.out.println(list.size());
+
+        for (int i = 0; i < list.size(); i++) {
+            WebNoteAll webNoteAll = list.get(i);
+            Ydt ydt = new Ydt();
+            ydt.setNonceStr("0E1EE833-16AE-4BBE-A3ED-5697E3FC21FF");
+            ydt.setQuestionId(String.valueOf(webNoteAll.getId()));
+            //String str = "{\"nonceStr\":\"0E1EE833-16AE-4BBE-A3ED-5697E3FC21FF\",\"questionId\":\"13581\"}";
+
+            String jsonObject = JSONObject.toJSONString(ydt);
+            System.out.println(jsonObject);
+            String result = ydtService.getSkillInfo(jsonObject);
+            JSONObject json = JSONObject.parseObject(result);
+
+
+            System.out.println(result);
+
+            JSONObject data = json.getJSONObject("result");
+
+            JSONObject skillEntity = data.getJSONObject("skillEntity");
+            String kemn = skillEntity.getString("kemu");
+            if (!"0".equals(kemn) && !"2".equals(kemn)) {
+                String qbAnalyse = skillEntity.getString("qbAnalyse");
+                JSONArray qbAnswers = skillEntity.getJSONArray("qbAnswers");
+                String qbContent = skillEntity.getString("qbContent");
+                String qbReadAnalyse = skillEntity.getString("qbReadAnalyse");
+                String qbSkillpicture = skillEntity.getString("qbSkillpicture");
+                String questionIds = skillEntity.getString("questionIds");
+                String shortVideoDuration = skillEntity.getString("shortVideoDuration");
+                String shortVideoImage = skillEntity.getString("shortVideoImage");
+                String shortVideoSize = skillEntity.getString("shortVideoSize");
+                String shortVideoUrl = skillEntity.getString("shortVideoUrl");
+
+                String ydtAnalyse = skillEntity.getString("ydtAnalyse");
+                String ydtVideo = skillEntity.getString("ydtVideo");
+                String ydtVideoLen = skillEntity.getString("ydtVideoLen");
+                String ydtVideoPic = skillEntity.getString("ydtVideoPic");
+                String ydtVideoSize = skillEntity.getString("ydtVideoSize");
+
+
+                QuestionYdtJs questionYdtJs = new QuestionYdtJs();
+                questionYdtJs.setId(Long.parseLong(questionIds));
+                questionYdtJs.setKemu(kemn);
+                questionYdtJs.setQbAnalyse(qbAnalyse);
+                questionYdtJs.setQbContent(qbContent);
+                questionYdtJs.setQbReadAnalyse(qbReadAnalyse);
+                questionYdtJs.setQbSkillPicture(qbSkillpicture);
+                questionYdtJs.setQuestionids(questionIds);
+                questionYdtJs.setShortVideoDuration(shortVideoDuration);
+                questionYdtJs.setShortVideoImage(shortVideoImage);
+                questionYdtJs.setShortVideoSize(shortVideoSize);
+                questionYdtJs.setShortVideoUrl(shortVideoUrl);
+
+                questionYdtJs.setYdtAnalyse(ydtAnalyse);
+                questionYdtJs.setYdtVideo(ydtVideo);
+                questionYdtJs.setYdtVideoLen(ydtVideoLen);
+                questionYdtJs.setYdtVideoPic(ydtVideoPic);
+                questionYdtJs.setYdtVideoSize(ydtVideoSize);
+
+
+
+
+
+                String answers = "";
+                if(qbAnswers!=null) {
+                    for (int j = 0; j < qbAnswers.size(); j++) {
+                        String answer = qbAnswers.getString(j);
+                        if (j == 0) {
+                            answers = answer;
+                        } else {
+                            answers = "," + answer;
+                        }
+                    }
+                }
+                questionYdtJs.setQbAnswers(answers);
+                questionYdtJsService.saveOrUpdate(questionYdtJs);
+            }
+        }
 
 
-        System.out.println(result);
     }
 
 
-
 }

zzjs-service/src/main/java/com/miaxis/question/controller/WebNoteAllController.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.WebNoteAll;
+import com.miaxis.question.service.IWebNoteAllService;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.common.core.page.ResponsePageInfo;
+
+/**
+ * 【一点通整合题库】Controller
+ *
+ * @author miaxis
+ * @date 2022-05-06
+ */
+@RestController
+@RequestMapping("/question/all")
+@Api(tags={"【小程序-一点通整合题库】"})
+public class WebNoteAllController extends BaseController{
+    @Autowired
+    private IWebNoteAllService webNoteAllService;
+
+    /**
+     * 查询一点通整合题库列表
+     */
+    @PreAuthorize("@ss.hasPermi('question:all: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<WebNoteAll> list(@ModelAttribute WebNoteAll webNoteAll){
+        startPage();
+        List<WebNoteAll> list = webNoteAllService.selectWebNoteAllList(webNoteAll);
+        return toResponsePageInfo(list);
+    }
+    
+    /**
+     * 导出一点通整合题库列表
+     */
+    @PreAuthorize("@ss.hasPermi('question:all:export')")
+    @Log(title = "一点通整合题库", businessType = BusinessTypeEnum.EXPORT)
+    @GetMapping("/export")
+    @ApiOperation("导出一点通整合题库列表Excel")
+    public Response<String> export(@ModelAttribute WebNoteAll webNoteAll){
+        List<WebNoteAll> list = webNoteAllService.selectWebNoteAllList(webNoteAll);
+        ExcelUtil<WebNoteAll> util = new ExcelUtil<WebNoteAll>(WebNoteAll.class);
+        return util.exportExcel(list, "all");
+    }
+
+    /**
+     * 获取一点通整合题库详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('question:all:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取一点通整合题库详细信息")
+    public Response<WebNoteAll> getInfo(
+            @ApiParam(name = "id", value = "一点通整合题库参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(webNoteAllService.getById(id));
+    }
+
+    /**
+     * 新增一点通整合题库
+     */
+    @PreAuthorize("@ss.hasPermi('question:all:add')")
+    @Log(title = "一点通整合题库", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增一点通整合题库")
+    public Response<Integer> add(@RequestBody WebNoteAll webNoteAll){
+        return toResponse(webNoteAllService.save(webNoteAll) ? 1 : 0);
+    }
+
+    /**
+     * 修改一点通整合题库
+     */
+    @PreAuthorize("@ss.hasPermi('question:all:edit')")
+    @Log(title = "一点通整合题库", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改一点通整合题库")
+    public Response<Integer> edit(@RequestBody WebNoteAll webNoteAll){
+        return toResponse(webNoteAllService.updateById(webNoteAll) ? 1 : 0);
+    }
+
+    /**
+     * 删除一点通整合题库
+     */
+    @PreAuthorize("@ss.hasPermi('question:all: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(webNoteAllService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

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

@@ -0,0 +1,284 @@
+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_ydt_js
+ *
+ * @author miaxis
+ * @date 2022-05-06
+ */
+@Data
+@TableName("question_ydt_js")
+@ApiModel(value = "QuestionYdtJs", description = "驾校一点通解释对象 question_ydt_js")
+public class QuestionYdtJs extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** 一点通ID */
+    @TableId(value = "id",type = IdType.INPUT)
+    @ApiModelProperty(value = "一点通ID")
+    private Long id;
+
+    /** 科目 */
+    @Excel(name = "科目")
+    @TableField("kemu")
+    @ApiModelProperty(value = "科目")
+    private String kemu;
+
+    /** 分析 */
+    @Excel(name = "分析")
+    @TableField("qb_analyse")
+    @ApiModelProperty(value = "分析")
+    private String qbAnalyse;
+
+    /** 内容 题目 */
+    @Excel(name = "内容 题目")
+    @TableField("qb_content")
+    @ApiModelProperty(value = "内容 题目")
+    private String qbContent;
+
+    /** 语音分板 */
+    @Excel(name = "语音分板")
+    @TableField("qb_read_analyse")
+    @ApiModelProperty(value = "语音分板")
+    private String qbReadAnalyse;
+
+    /** 技术照片 */
+    @Excel(name = "技术照片")
+    @TableField("qb_skill_picture")
+    @ApiModelProperty(value = "技术照片")
+    private String qbSkillPicture;
+
+    /** 答案 */
+    @Excel(name = "答案")
+    @TableField("qb_answers")
+    @ApiModelProperty(value = "答案")
+    private String qbAnswers;
+
+    /** 题目ID */
+    @Excel(name = "题目ID")
+    @TableField("questionIds")
+    @ApiModelProperty(value = "题目ID")
+    private String questionids;
+
+    /** 短视频VIDEO */
+    @Excel(name = "短视频VIDEO")
+    @TableField("short_video_duration")
+    @ApiModelProperty(value = "短视频VIDEO")
+    private String shortVideoDuration;
+
+    /** 短视频尺寸 */
+    @Excel(name = "短视频尺寸")
+    @TableField("short_video_size")
+    @ApiModelProperty(value = "短视频尺寸")
+    private String shortVideoSize;
+
+    /** 短视频URL */
+    @Excel(name = "短视频URL")
+    @TableField("short_video_url")
+    @ApiModelProperty(value = "短视频URL")
+    private String shortVideoUrl;
+
+    /** 短视频图片 */
+    @Excel(name = "短视频图片")
+    @TableField("short_video_image")
+    @ApiModelProperty(value = "短视频图片")
+    private String shortVideoImage;
+
+    /** 一点通分析 */
+    @Excel(name = "一点通分析")
+    @TableField("ydt_analyse")
+    @ApiModelProperty(value = "一点通分析")
+    private String ydtAnalyse;
+
+    /** 一点通分析图片 */
+    @Excel(name = "一点通分析图片")
+    @TableField("ydt_analyse_pic")
+    @ApiModelProperty(value = "一点通分析图片")
+    private String ydtAnalysePic;
+
+    /** 一点通视频 */
+    @Excel(name = "一点通视频")
+    @TableField("ydt_video")
+    @ApiModelProperty(value = "一点通视频")
+    private String ydtVideo;
+
+    /** 一点通视频长度 */
+    @Excel(name = "一点通视频长度")
+    @TableField("ydt_video_len")
+    @ApiModelProperty(value = "一点通视频长度")
+    private String ydtVideoLen;
+
+    /** 一点通视频图片 */
+    @Excel(name = "一点通视频图片")
+    @TableField("ydt_video_pic")
+    @ApiModelProperty(value = "一点通视频图片")
+    private String ydtVideoPic;
+
+    /** 一点通视频尺寸 */
+    @Excel(name = "一点通视频尺寸")
+    @TableField("ydt_video_size")
+    @ApiModelProperty(value = "一点通视频尺寸")
+    private String ydtVideoSize;
+
+    public void setId(Long id){
+        this.id = id;
+    }
+
+    public Long getId(){
+        return id;
+    }
+    public void setKemu(String kemu){
+        this.kemu = kemu;
+    }
+
+    public String getKemu(){
+        return kemu;
+    }
+    public void setQbAnalyse(String qbAnalyse){
+        this.qbAnalyse = qbAnalyse;
+    }
+
+    public String getQbAnalyse(){
+        return qbAnalyse;
+    }
+    public void setQbContent(String qbContent){
+        this.qbContent = qbContent;
+    }
+
+    public String getQbContent(){
+        return qbContent;
+    }
+    public void setQbReadAnalyse(String qbReadAnalyse){
+        this.qbReadAnalyse = qbReadAnalyse;
+    }
+
+    public String getQbReadAnalyse(){
+        return qbReadAnalyse;
+    }
+    public void setQbSkillPicture(String qbSkillPicture){
+        this.qbSkillPicture = qbSkillPicture;
+    }
+
+    public String getQbSkillPicture(){
+        return qbSkillPicture;
+    }
+    public void setQbAnswers(String qbAnswers){
+        this.qbAnswers = qbAnswers;
+    }
+
+    public String getQbAnswers(){
+        return qbAnswers;
+    }
+    public void setQuestionids(String questionids){
+        this.questionids = questionids;
+    }
+
+    public String getQuestionids(){
+        return questionids;
+    }
+    public void setShortVideoDuration(String shortVideoDuration){
+        this.shortVideoDuration = shortVideoDuration;
+    }
+
+    public String getShortVideoDuration(){
+        return shortVideoDuration;
+    }
+    public void setShortVideoSize(String shortVideoSize){
+        this.shortVideoSize = shortVideoSize;
+    }
+
+    public String getShortVideoSize(){
+        return shortVideoSize;
+    }
+    public void setShortVideoUrl(String shortVideoUrl){
+        this.shortVideoUrl = shortVideoUrl;
+    }
+
+    public String getShortVideoUrl(){
+        return shortVideoUrl;
+    }
+    public void setShortVideoImage(String shortVideoImage){
+        this.shortVideoImage = shortVideoImage;
+    }
+
+    public String getShortVideoImage(){
+        return shortVideoImage;
+    }
+    public void setYdtAnalyse(String ydtAnalyse){
+        this.ydtAnalyse = ydtAnalyse;
+    }
+
+    public String getYdtAnalyse(){
+        return ydtAnalyse;
+    }
+    public void setYdtAnalysePic(String ydtAnalysePic){
+        this.ydtAnalysePic = ydtAnalysePic;
+    }
+
+    public String getYdtAnalysePic(){
+        return ydtAnalysePic;
+    }
+    public void setYdtVideo(String ydtVideo){
+        this.ydtVideo = ydtVideo;
+    }
+
+    public String getYdtVideo(){
+        return ydtVideo;
+    }
+    public void setYdtVideoLen(String ydtVideoLen){
+        this.ydtVideoLen = ydtVideoLen;
+    }
+
+    public String getYdtVideoLen(){
+        return ydtVideoLen;
+    }
+    public void setYdtVideoPic(String ydtVideoPic){
+        this.ydtVideoPic = ydtVideoPic;
+    }
+
+    public String getYdtVideoPic(){
+        return ydtVideoPic;
+    }
+    public void setYdtVideoSize(String ydtVideoSize){
+        this.ydtVideoSize = ydtVideoSize;
+    }
+
+    public String getYdtVideoSize(){
+        return ydtVideoSize;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("kemu", getKemu())
+            .append("qbAnalyse", getQbAnalyse())
+            .append("qbContent", getQbContent())
+            .append("qbReadAnalyse", getQbReadAnalyse())
+            .append("qbSkillPicture", getQbSkillPicture())
+            .append("qbAnswers", getQbAnswers())
+            .append("questionids", getQuestionids())
+            .append("shortVideoDuration", getShortVideoDuration())
+            .append("shortVideoSize", getShortVideoSize())
+            .append("shortVideoUrl", getShortVideoUrl())
+            .append("shortVideoImage", getShortVideoImage())
+            .append("ydtAnalyse", getYdtAnalyse())
+            .append("ydtAnalysePic", getYdtAnalysePic())
+            .append("ydtVideo", getYdtVideo())
+            .append("ydtVideoLen", getYdtVideoLen())
+            .append("ydtVideoPic", getYdtVideoPic())
+            .append("ydtVideoSize", getYdtVideoSize())
+            .toString();
+    }
+}

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

@@ -0,0 +1,481 @@
+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;
+/**
+ * 一点通整合题库对象 web_note_all
+ *
+ * @author miaxis
+ * @date 2022-05-06
+ */
+@Data
+@TableName("web_note_all")
+@ApiModel(value = "WebNoteAll", description = "一点通整合题库对象 web_note_all")
+public class WebNoteAll extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @Excel(name = "ID")
+    @TableField("ID")
+    @ApiModelProperty(value = "ID")
+    private Long id;
+
+    /** Type */
+    @Excel(name = "Type")
+    @TableField("Type")
+    @ApiModelProperty(value = "Type")
+    private Long type;
+
+    /** intNumber */
+    @Excel(name = "intNumber")
+    @TableField("intNumber")
+    @ApiModelProperty(value = "intNumber")
+    private String intnumber;
+
+    /** strTppe */
+    @Excel(name = "strTppe")
+    @TableField("strTppe")
+    @ApiModelProperty(value = "strTppe")
+    private String strtppe;
+
+    /** strType_l */
+    @Excel(name = "strType_l")
+    @TableField("strType_l")
+    @ApiModelProperty(value = "strType_l")
+    private String strtypeL;
+
+    /** LicenseType */
+    @Excel(name = "LicenseType")
+    @TableField("LicenseType")
+    @ApiModelProperty(value = "LicenseType")
+    private String licensetype;
+
+    /** Question */
+    @Excel(name = "Question")
+    @TableField("Question")
+    @ApiModelProperty(value = "Question")
+    private String question;
+
+    /** An1 */
+    @Excel(name = "An1")
+    @TableField("An1")
+    @ApiModelProperty(value = "An1")
+    private String an1;
+
+    /** An2 */
+    @Excel(name = "An2")
+    @TableField("An2")
+    @ApiModelProperty(value = "An2")
+    private String an2;
+
+    /** An3 */
+    @Excel(name = "An3")
+    @TableField("An3")
+    @ApiModelProperty(value = "An3")
+    private String an3;
+
+    /** An4 */
+    @Excel(name = "An4")
+    @TableField("An4")
+    @ApiModelProperty(value = "An4")
+    private String an4;
+
+    /** An5 */
+    @Excel(name = "An5")
+    @TableField("An5")
+    @ApiModelProperty(value = "An5")
+    private String an5;
+
+    /** An6 */
+    @Excel(name = "An6")
+    @TableField("An6")
+    @ApiModelProperty(value = "An6")
+    private String an6;
+
+    /** An7 */
+    @Excel(name = "An7")
+    @TableField("An7")
+    @ApiModelProperty(value = "An7")
+    private String an7;
+
+    /** AnswerTrue */
+    @Excel(name = "AnswerTrue")
+    @TableField("AnswerTrue")
+    @ApiModelProperty(value = "AnswerTrue")
+    private String answertrue;
+
+    /** explain */
+    @Excel(name = "explain")
+    @TableField("explain")
+    @ApiModelProperty(value = "explain")
+    private String explain;
+
+    /** BestAnswerId */
+    @Excel(name = "BestAnswerId")
+    @TableField("BestAnswerId")
+    @ApiModelProperty(value = "BestAnswerId")
+    private String bestanswerid;
+
+    /** kemu */
+    @Excel(name = "kemu")
+    @TableField("kemu")
+    @ApiModelProperty(value = "kemu")
+    private Long kemu;
+
+    /** jieshi_from */
+    @Excel(name = "jieshi_from")
+    @TableField("jieshi_from")
+    @ApiModelProperty(value = "jieshi_from")
+    private String jieshiFrom;
+
+    /** moretypes */
+    @Excel(name = "moretypes")
+    @TableField("moretypes")
+    @ApiModelProperty(value = "moretypes")
+    private String moretypes;
+
+    /** chapterid */
+    @Excel(name = "chapterid")
+    @TableField("chapterid")
+    @ApiModelProperty(value = "chapterid")
+    private Long chapterid;
+
+    /** sinaimg */
+    @Excel(name = "sinaimg")
+    @TableField("sinaimg")
+    @ApiModelProperty(value = "sinaimg")
+    private String sinaimg;
+
+    /** video_url */
+    @Excel(name = "video_url")
+    @TableField("video_url")
+    @ApiModelProperty(value = "video_url")
+    private String videoUrl;
+
+    /** diff_degree */
+    @Excel(name = "diff_degree")
+    @TableField("diff_degree")
+    @ApiModelProperty(value = "diff_degree")
+    private Long diffDegree;
+
+    /** cityid */
+    @Excel(name = "cityid")
+    @TableField("cityid")
+    @ApiModelProperty(value = "cityid")
+    private Long cityid;
+
+    /** gs */
+    @Excel(name = "gs")
+    @TableField("gs")
+    @ApiModelProperty(value = "gs")
+    private String gs;
+
+    /** keyword */
+    @Excel(name = "keyword")
+    @TableField("keyword")
+    @ApiModelProperty(value = "keyword")
+    private String keyword;
+
+    /** error_rate */
+    @Excel(name = "error_rate")
+    @TableField("error_rate")
+    @ApiModelProperty(value = "error_rate")
+    private Long errorRate;
+
+    /** media_url */
+    @Excel(name = "media_url")
+    @TableField("media_url")
+    @ApiModelProperty(value = "media_url")
+    private String mediaUrl;
+
+    /** show_option_type */
+    @Excel(name = "show_option_type")
+    @TableField("show_option_type")
+    @ApiModelProperty(value = "show_option_type")
+    private Long showOptionType;
+
+    /** question_source */
+    @Excel(name = "question_source")
+    @TableField("question_source")
+    @ApiModelProperty(value = "question_source")
+    private Long questionSource;
+
+    /** best_explain_new */
+    @Excel(name = "best_explain_new")
+    @TableField("best_explain_new")
+    @ApiModelProperty(value = "best_explain_new")
+    private String bestExplainNew;
+
+    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 setExplain(String explain){
+        this.explain = explain;
+    }
+
+    public String getExplain(){
+        return explain;
+    }
+    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;
+    }
+    public void setQuestionSource(Long questionSource){
+        this.questionSource = questionSource;
+    }
+
+    public Long getQuestionSource(){
+        return questionSource;
+    }
+    public void setBestExplainNew(String bestExplainNew){
+        this.bestExplainNew = bestExplainNew;
+    }
+
+    public String getBestExplainNew(){
+        return bestExplainNew;
+    }
+
+    @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("explain", getExplain())
+            .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())
+            .append("questionSource", getQuestionSource())
+            .append("bestExplainNew", getBestExplainNew())
+            .toString();
+    }
+}

zzjs-service/src/main/java/com/miaxis/question/mapper/QuestionYdtJsMapper.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.QuestionYdtJs;
+
+/**
+ * 驾校一点通解释Mapper接口
+ *
+ * @author miaxis
+ * @date 2022-05-06
+ */
+public interface QuestionYdtJsMapper extends BaseMapper<QuestionYdtJs> {
+    /**
+     * 查询驾校一点通解释列表
+     *
+     * @param questionYdtJs 驾校一点通解释
+     * @return 驾校一点通解释集合
+     */
+    public List<QuestionYdtJs> selectQuestionYdtJsList(QuestionYdtJs questionYdtJs);
+
+}

zzjs-service/src/main/java/com/miaxis/question/mapper/WebNoteAllMapper.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.WebNoteAll;
+
+/**
+ * 一点通整合题库Mapper接口
+ *
+ * @author miaxis
+ * @date 2022-05-06
+ */
+public interface WebNoteAllMapper extends BaseMapper<WebNoteAll> {
+    /**
+     * 查询一点通整合题库列表
+     *
+     * @param webNoteAll 一点通整合题库
+     * @return 一点通整合题库集合
+     */
+    public List<WebNoteAll> selectWebNoteAllList(WebNoteAll webNoteAll);
+
+}

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

@@ -0,0 +1,21 @@
+package com.miaxis.question.service;
+
+import java.util.List;
+import com.miaxis.question.domain.QuestionYdtJs;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 驾校一点通解释Service接口
+ *
+ * @author miaxis
+ * @date 2022-05-06
+ */
+public interface IQuestionYdtJsService extends IService<QuestionYdtJs>{
+    /**
+     * 查询驾校一点通解释列表
+     *
+     * @param questionYdtJs 驾校一点通解释
+     * @return 驾校一点通解释集合
+     */
+    public List<QuestionYdtJs> selectQuestionYdtJsList(QuestionYdtJs questionYdtJs);
+}

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

@@ -0,0 +1,21 @@
+package com.miaxis.question.service;
+
+import java.util.List;
+import com.miaxis.question.domain.WebNoteAll;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 一点通整合题库Service接口
+ *
+ * @author miaxis
+ * @date 2022-05-06
+ */
+public interface IWebNoteAllService extends IService<WebNoteAll>{
+    /**
+     * 查询一点通整合题库列表
+     *
+     * @param webNoteAll 一点通整合题库
+     * @return 一点通整合题库集合
+     */
+    public List<WebNoteAll> selectWebNoteAllList(WebNoteAll webNoteAll);
+}

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

@@ -0,0 +1,35 @@
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+import com.miaxis.question.mapper.QuestionYdtJsMapper;
+import com.miaxis.question.domain.QuestionYdtJs;
+import com.miaxis.question.service.IQuestionYdtJsService;
+
+/**
+ * 驾校一点通解释Service业务层处理
+ *
+ * @author miaxis
+ * @date 2022-05-06
+ */
+@Service
+public class QuestionYdtJsServiceImpl extends ServiceImpl<QuestionYdtJsMapper, QuestionYdtJs> implements IQuestionYdtJsService {
+    @Autowired
+    private QuestionYdtJsMapper questionYdtJsMapper;
+
+    /**
+     * 查询驾校一点通解释列表
+     *
+     * @param questionYdtJs 驾校一点通解释
+     * @return 驾校一点通解释
+     */
+    @Override
+    public List<QuestionYdtJs> selectQuestionYdtJsList(QuestionYdtJs questionYdtJs){
+        return questionYdtJsMapper.selectQuestionYdtJsList(questionYdtJs);
+    }
+}

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

@@ -0,0 +1,35 @@
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+import com.miaxis.question.mapper.WebNoteAllMapper;
+import com.miaxis.question.domain.WebNoteAll;
+import com.miaxis.question.service.IWebNoteAllService;
+
+/**
+ * 一点通整合题库Service业务层处理
+ *
+ * @author miaxis
+ * @date 2022-05-06
+ */
+@Service
+public class WebNoteAllServiceImpl extends ServiceImpl<WebNoteAllMapper, WebNoteAll> implements IWebNoteAllService {
+    @Autowired
+    private WebNoteAllMapper webNoteAllMapper;
+
+    /**
+     * 查询一点通整合题库列表
+     *
+     * @param webNoteAll 一点通整合题库
+     * @return 一点通整合题库
+     */
+    @Override
+    public List<WebNoteAll> selectWebNoteAllList(WebNoteAll webNoteAll){
+        return webNoteAllMapper.selectWebNoteAllList(webNoteAll);
+    }
+}

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

@@ -0,0 +1,84 @@
+<?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.WebNoteAllMapper">
+
+    <resultMap type="WebNoteAll" id="WebNoteAllResult">
+        <result property="id"    column="ID"    />
+        <result property="type"    column="Type"    />
+        <result property="intnumber"    column="intNumber"    />
+        <result property="strtppe"    column="strTppe"    />
+        <result property="strtypeL"    column="strType_l"    />
+        <result property="licensetype"    column="LicenseType"    />
+        <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="AnswerTrue"    />
+        <result property="explain"    column="explain"    />
+        <result property="bestanswerid"    column="BestAnswerId"    />
+        <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"    />
+        <result property="questionSource"    column="question_source"    />
+        <result property="bestExplainNew"    column="best_explain_new"    />
+    </resultMap>
+
+    <sql id="selectWebNoteAllVo">
+        select DISTINCT * from web_note_all
+    </sql>
+
+    <select id="selectWebNoteAllList" parameterType="WebNoteAll" resultMap="WebNoteAllResult">
+        <include refid="selectWebNoteAllVo"/>
+        <where>
+            <if test="id != null "> and ID = #{id}</if>
+            <if test="type != null "> and Type = #{type}</if>
+            <if test="intnumber != null  and intnumber != ''"> and intNumber = #{intnumber}</if>
+            <if test="strtppe != null  and strtppe != ''"> and strTppe = #{strtppe}</if>
+            <if test="strtypeL != null  and strtypeL != ''"> and strType_l = #{strtypeL}</if>
+            <if test="licensetype != null  and licensetype != ''"> and LicenseType = #{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 AnswerTrue = #{answertrue}</if>
+            <if test="explain != null  and explain != ''"> and explain = #{explain}</if>
+            <if test="bestanswerid != null  and bestanswerid != ''"> and BestAnswerId = #{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>
+            <if test="questionSource != null "> and question_source = #{questionSource}</if>
+            <if test="bestExplainNew != null  and bestExplainNew != ''"> and best_explain_new = #{bestExplainNew}</if>
+        </where>
+    </select>
+
+</mapper>

zzjs-service/src/main/resources/mapper/ydt/QuestionYdtJsMapper.xml

@@ -0,0 +1,55 @@
+<?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.QuestionYdtJsMapper">
+
+    <resultMap type="QuestionYdtJs" id="QuestionYdtJsResult">
+        <result property="id"    column="id"    />
+        <result property="kemu"    column="kemu"    />
+        <result property="qbAnalyse"    column="qb_analyse"    />
+        <result property="qbContent"    column="qb_content"    />
+        <result property="qbReadAnalyse"    column="qb_read_analyse"    />
+        <result property="qbSkillPicture"    column="qb_skill_picture"    />
+        <result property="qbAnswers"    column="qb_answers"    />
+        <result property="questionids"    column="questionIds"    />
+        <result property="shortVideoDuration"    column="short_video_duration"    />
+        <result property="shortVideoSize"    column="short_video_size"    />
+        <result property="shortVideoUrl"    column="short_video_url"    />
+        <result property="shortVideoImage"    column="short_video_image"    />
+        <result property="ydtAnalyse"    column="ydt_analyse"    />
+        <result property="ydtAnalysePic"    column="ydt_analyse_pic"    />
+        <result property="ydtVideo"    column="ydt_video"    />
+        <result property="ydtVideoLen"    column="ydt_video_len"    />
+        <result property="ydtVideoPic"    column="ydt_video_pic"    />
+        <result property="ydtVideoSize"    column="ydt_video_size"    />
+    </resultMap>
+
+    <sql id="selectQuestionYdtJsVo">
+        select * from question_ydt_js
+    </sql>
+
+    <select id="selectQuestionYdtJsList" parameterType="QuestionYdtJs" resultMap="QuestionYdtJsResult">
+        <include refid="selectQuestionYdtJsVo"/>
+        <where>
+            <if test="kemu != null  and kemu != ''"> and kemu = #{kemu}</if>
+            <if test="qbAnalyse != null  and qbAnalyse != ''"> and qb_analyse = #{qbAnalyse}</if>
+            <if test="qbContent != null  and qbContent != ''"> and qb_content = #{qbContent}</if>
+            <if test="qbReadAnalyse != null  and qbReadAnalyse != ''"> and qb_read_analyse = #{qbReadAnalyse}</if>
+            <if test="qbSkillPicture != null  and qbSkillPicture != ''"> and qb_skill_picture = #{qbSkillPicture}</if>
+            <if test="qbAnswers != null  and qbAnswers != ''"> and qb_answers = #{qbAnswers}</if>
+            <if test="questionids != null  and questionids != ''"> and questionIds = #{questionids}</if>
+            <if test="shortVideoDuration != null  and shortVideoDuration != ''"> and short_video_duration = #{shortVideoDuration}</if>
+            <if test="shortVideoSize != null  and shortVideoSize != ''"> and short_video_size = #{shortVideoSize}</if>
+            <if test="shortVideoUrl != null  and shortVideoUrl != ''"> and short_video_url = #{shortVideoUrl}</if>
+            <if test="shortVideoImage != null  and shortVideoImage != ''"> and short_video_image = #{shortVideoImage}</if>
+            <if test="ydtAnalyse != null  and ydtAnalyse != ''"> and ydt_analyse = #{ydtAnalyse}</if>
+            <if test="ydtAnalysePic != null  and ydtAnalysePic != ''"> and ydt_analyse_pic = #{ydtAnalysePic}</if>
+            <if test="ydtVideo != null  and ydtVideo != ''"> and ydt_video = #{ydtVideo}</if>
+            <if test="ydtVideoLen != null  and ydtVideoLen != ''"> and ydt_video_len = #{ydtVideoLen}</if>
+            <if test="ydtVideoPic != null  and ydtVideoPic != ''"> and ydt_video_pic = #{ydtVideoPic}</if>
+            <if test="ydtVideoSize != null  and ydtVideoSize != ''"> and ydt_video_size = #{ydtVideoSize}</if>
+        </where>
+    </select>
+
+</mapper>