一点通抓取修改

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

@@ -3,6 +3,7 @@ package com.miaxis.test;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.miaxis.ZzjsApplication;
+import com.miaxis.common.utils.StringUtils;
 import com.miaxis.feign.service.IKtService;
 import com.miaxis.question.domain.QuestionFree;
 import com.miaxis.question.domain.QuestionInfoKtGet;
@@ -48,7 +49,7 @@ public class KtTest2 {
     @Test
     public void getInfo() {
 
-        List<Map<String, String>> mapList = this.get1Map();
+        List<Map<String, String>> mapList = this.getMap();
         for (Map<String, String> m : mapList) {
 
             String time = String.valueOf(System.currentTimeMillis() / 1000);
@@ -62,7 +63,7 @@ public class KtTest2 {
                 String countid = n1.getString("id");
                 String title = n1.getString("title");
                 //String model = n1.getString("model");
-                String model = model=m.get("model");
+                String model = m.get("model");
                 String subject = n1.getString("subject");
                 System.out.println(countid + "," + title + "," + model);
                 String result2 = ktService.getQuestion(model, countid, title, subject, time);
@@ -218,49 +219,92 @@ public class KtTest2 {
 
                         if ("k1".equals(m.get("subject"))) {  //科目一   顺序练习
                             questionInfoKtGet.setSubject(1l);
-                            questionInfoKtGet.setSequeIssue(countid);
+                            if(StringUtils.isNotEmpty(questionInfoKtGet.getSequeIssue()) && questionInfoKtGet.getSequeIssue().indexOf(countid)==-1) {
+                                questionInfoKtGet.setSequeIssue(questionInfoKtGet.getSequeIssue()+","+countid);
+                            } else {
+                                questionInfoKtGet.setSequeIssue(countid);
+                            }
+
+                            if(StringUtils.isNotEmpty(questionInfoKtGet.getSequeIssueName()) && questionInfoKtGet.getSequeIssueName().indexOf(title)==-1) {
+                                questionInfoKtGet.setSequeIssueName(questionInfoKtGet.getSequeIssueName()+","+title);
+                            } else {
+                                questionInfoKtGet.setSequeIssueName(title);
+                            }
                             questionInfoKtGet.setSequeIssueName(title);
                             long sort = j + 1;
                             questionInfoKtGet.setSequeSort(sort);
                         } else if ("k1_2".equals(m.get("subject"))) { // 科目一 精选必考题
                             questionInfoKtGet.setSubject(1l);
-                            questionInfoKtGet.setExcellIssue(countid);
+                            if(StringUtils.isNotEmpty(questionInfoKtGet.getExcellIssue()) && questionInfoKtGet.getExcellIssue().indexOf(countid)==-1) {
+                                questionInfoKtGet.setExcellIssue(questionInfoKtGet.getExcellIssue()+","+countid);
+                            } else {
+                                questionInfoKtGet.setExcellIssue(countid);
+                            }
                             questionInfoKtGet.setExcellIssueName(title);
                             long sort = j + 1;
                             questionInfoKtGet.setExcellSort(sort);
                         } else if ("k1_3".equals(m.get("subject"))) { // 科目一 分类练习
                             questionInfoKtGet.setSubject(1l);
-                            questionInfoKtGet.setClassIssue(countid);
+                            if(StringUtils.isNotEmpty(questionInfoKtGet.getClassIssue()) && questionInfoKtGet.getClassIssue().indexOf(countid)==-1) {
+                                questionInfoKtGet.setClassIssue(questionInfoKtGet.getClassIssue()+","+countid);
+                            } else {
+                                questionInfoKtGet.setClassIssue(countid);
+                            }
                             questionInfoKtGet.setClassIssueName(title);
                             long sort = j + 1;
                             questionInfoKtGet.setClassSort(sort);
                         } else if ("k1_4".equals(m.get("subject"))) { //科目一 地方题库
                             questionInfoKtGet.setSubject(1l);
-                            questionInfoKtGet.setPlaceIssue(countid);
+
+                            if(StringUtils.isNotEmpty(questionInfoKtGet.getPlaceIssue()) && questionInfoKtGet.getPlaceIssue().indexOf(countid)==-1) {
+                                questionInfoKtGet.setPlaceIssue(questionInfoKtGet.getPlaceIssue()+","+countid);
+                            } else {
+                                questionInfoKtGet.setPlaceIssue(countid);
+                            }
                             questionInfoKtGet.setPlaceIssueName(title);
                             long sort = j + 1;
                             questionInfoKtGet.setPlaceSort(sort);
                         } else if ("k4".equals(m.get("subject"))) {  //科目四   顺序练习
                             questionInfoKtGet.setSubject(4l);
-                            questionInfoKtGet.setSequeIssue(countid);
+
+                            if(StringUtils.isNotEmpty(questionInfoKtGet.getSequeIssue()) && questionInfoKtGet.getSequeIssue().indexOf(countid)==-1) {
+                                questionInfoKtGet.setSequeIssue(questionInfoKtGet.getSequeIssue()+","+countid);
+                            } else {
+                                questionInfoKtGet.setSequeIssue(countid);
+                            }
                             questionInfoKtGet.setSequeIssueName(title);
                             long sort = j + 1;
                             questionInfoKtGet.setSequeSort(sort);
                         } else if ("k4_2".equals(m.get("subject"))) { // 科目四 精选必考题
                             questionInfoKtGet.setSubject(4l);
-                            questionInfoKtGet.setExcellIssue(countid);
+
+                            if(StringUtils.isNotEmpty(questionInfoKtGet.getExcellIssue()) && questionInfoKtGet.getExcellIssue().indexOf(countid)==-1 ) {
+                                questionInfoKtGet.setExcellIssue(questionInfoKtGet.getExcellIssue()+","+countid);
+                            } else {
+                                questionInfoKtGet.setExcellIssue(countid);
+                            }
                             questionInfoKtGet.setExcellIssueName(title);
                             long sort = j + 1;
                             questionInfoKtGet.setExcellSort(sort);
                         } else if ("k4_3".equals(m.get("subject"))) { // 科目四 分类练习
                             questionInfoKtGet.setSubject(4l);
                             questionInfoKtGet.setClassIssue(countid);
+                            if(StringUtils.isNotEmpty(questionInfoKtGet.getClassIssue()) && questionInfoKtGet.getClassIssue().indexOf(countid)==-1) {
+                                questionInfoKtGet.setClassIssue(questionInfoKtGet.getClassIssue()+","+countid);
+                            } else {
+                                questionInfoKtGet.setClassIssue(countid);
+                            }
                             questionInfoKtGet.setClassIssueName(title);
                             long sort = j + 1;
                             questionInfoKtGet.setClassSort(sort);
                         } else if ("k4_4".equals(m.get("subject"))) { //科目四 地方题库
                             questionInfoKtGet.setSubject(4l);
-                            questionInfoKtGet.setPlaceIssue(countid);
+
+                            if(StringUtils.isNotEmpty(questionInfoKtGet.getPlaceIssue()) && questionInfoKtGet.getPlaceIssue().indexOf(countid)==-1 ) {
+                                questionInfoKtGet.setPlaceIssue(questionInfoKtGet.getPlaceIssue()+","+countid);
+                            } else {
+                                questionInfoKtGet.setPlaceIssue(countid);
+                            }
                             questionInfoKtGet.setPlaceIssueName(title);
                             long sort = j + 1;
                             questionInfoKtGet.setPlaceSort(sort);

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

@@ -0,0 +1,161 @@
+package com.miaxis.question.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+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;
+
+/**
+ * 获取快通题库对象 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 QuestionInfoKtNew extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /**  主键 */
+    @TableId(value = "id",type = IdType.INPUT)
+    @ApiModelProperty(value = " 主键")
+    private Long id;
+
+
+    /** 一点通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;
+
+    /** 车型 */
+    @Excel(name = "车型")
+    @TableField("model")
+    @ApiModelProperty(value = "车型")
+    private String model;
+
+    /** 本题属于哪些分类ID */
+    @Excel(name = "本题属于哪些分类ID")
+    @TableField("column_all")
+    @ApiModelProperty(value = "本题属于哪些分类ID")
+    private String columnAll;
+
+    /** 题目类型 1判断题 2选择题 3多选题 */
+    @Excel(name = "题目类型 1判断题 2选择题 3多选题")
+    @TableField("question_type")
+    @ApiModelProperty(value = "题目类型 1判断题 2选择题 3多选题")
+    private Long questionType;
+
+
+    /** 科目 */
+    @Excel(name = "科目")
+    @TableField("subject")
+    @ApiModelProperty(value = "科目")
+    private Long subject;
+
+
+
+}