错题接口修改

twzd-admin/src/main/java/com/miaxis/app/controller/h5/QuestionCollectionController.java

@@ -9,10 +9,10 @@ import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.common.enums.BusinessTypeEnum;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.SecurityUtils;
-import com.miaxis.qustion.domain.QuestionCollection;
-import com.miaxis.qustion.dto.QuestionCollectionDTO;
-import com.miaxis.qustion.dto.QuestionCollectionListDTO;
-import com.miaxis.qustion.service.IQuestionCollectionService;
+import com.miaxis.question.domain.QuestionCollection;
+import com.miaxis.question.dto.QuestionCollectionDTO;
+import com.miaxis.question.dto.QuestionCollectionListDTO;
+import com.miaxis.question.service.IQuestionCollectionService;
 import io.swagger.annotations.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

twzd-admin/src/main/java/com/miaxis/app/controller/h5/QuestionInfoController.java

@@ -4,13 +4,13 @@ import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.page.ResponsePageInfo;
-import com.miaxis.qustion.domain.QuestionInfo;
-import com.miaxis.qustion.dto.QuestionInfoDTO;
-import com.miaxis.qustion.dto.QuestionInfoFlDTO;
-import com.miaxis.qustion.service.IQuestionInfoService;
-import com.miaxis.qustion.vo.QuestionInfoDfVO;
-import com.miaxis.qustion.vo.QuestionInfoFlVO;
-import com.miaxis.qustion.vo.QuestionInfoJxVO;
+import com.miaxis.question.domain.QuestionInfo;
+import com.miaxis.question.dto.QuestionInfoDTO;
+import com.miaxis.question.dto.QuestionInfoFlDTO;
+import com.miaxis.question.service.IQuestionInfoService;
+import com.miaxis.question.vo.QuestionInfoDfVO;
+import com.miaxis.question.vo.QuestionInfoFlVO;
+import com.miaxis.question.vo.QuestionInfoJxVO;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

twzd-admin/src/main/java/com/miaxis/app/controller/h5/QuestionWrongController.java

@@ -9,10 +9,10 @@ import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.common.enums.BusinessTypeEnum;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.SecurityUtils;
-import com.miaxis.qustion.domain.QuestionWrong;
-import com.miaxis.qustion.dto.QuestionWrongDTO;
-import com.miaxis.qustion.dto.QuestionWrongListDTO;
-import com.miaxis.qustion.service.IQuestionWrongService;
+import com.miaxis.question.domain.QuestionWrong;
+import com.miaxis.question.dto.QuestionWrongDTO;
+import com.miaxis.question.dto.QuestionWrongListDTO;
+import com.miaxis.question.service.IQuestionWrongService;
 import io.swagger.annotations.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

twzd-service/src/main/java/com/miaxis/qustion/domain/QuestionCollection.java → twzd-service/src/main/java/com/miaxis/question/domain/QuestionCollection.java

@@ -1,4 +1,4 @@
-package com.miaxis.qustion.domain;
+package com.miaxis.question.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

twzd-service/src/main/java/com/miaxis/qustion/domain/QuestionInfo.java → twzd-service/src/main/java/com/miaxis/question/domain/QuestionInfo.java

@@ -1,4 +1,4 @@
-package com.miaxis.qustion.domain;
+package com.miaxis.question.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

twzd-service/src/main/java/com/miaxis/qustion/domain/QuestionWrong.java → twzd-service/src/main/java/com/miaxis/question/domain/QuestionWrong.java

@@ -1,4 +1,4 @@
-package com.miaxis.qustion.domain;
+package com.miaxis.question.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

twzd-service/src/main/java/com/miaxis/qustion/dto/QuestionCollectionDTO.java → twzd-service/src/main/java/com/miaxis/question/dto/QuestionCollectionDTO.java

@@ -1,4 +1,4 @@
-package com.miaxis.qustion.dto;
+package com.miaxis.question.dto;
 
 
 import io.swagger.annotations.ApiModelProperty;

twzd-service/src/main/java/com/miaxis/qustion/dto/QuestionCollectionListDTO.java → twzd-service/src/main/java/com/miaxis/question/dto/QuestionCollectionListDTO.java

@@ -1,4 +1,4 @@
-package com.miaxis.qustion.dto;
+package com.miaxis.question.dto;
 
 
 import com.miaxis.common.core.domain.BaseBusinessEntity;

twzd-service/src/main/java/com/miaxis/qustion/dto/QuestionInfoDTO.java → twzd-service/src/main/java/com/miaxis/question/dto/QuestionInfoDTO.java

@@ -1,4 +1,4 @@
-package com.miaxis.qustion.dto;
+package com.miaxis.question.dto;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.miaxis.common.core.domain.BaseBusinessEntity;

twzd-service/src/main/java/com/miaxis/qustion/dto/QuestionInfoFlDTO.java → twzd-service/src/main/java/com/miaxis/question/dto/QuestionInfoFlDTO.java

@@ -1,4 +1,4 @@
-package com.miaxis.qustion.dto;
+package com.miaxis.question.dto;
 
 import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;

twzd-service/src/main/java/com/miaxis/qustion/dto/QuestionWrongDTO.java → twzd-service/src/main/java/com/miaxis/question/dto/QuestionWrongDTO.java

@@ -1,4 +1,4 @@
-package com.miaxis.qustion.dto;
+package com.miaxis.question.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

twzd-service/src/main/java/com/miaxis/qustion/dto/QuestionWrongListDTO.java → twzd-service/src/main/java/com/miaxis/question/dto/QuestionWrongListDTO.java

@@ -1,4 +1,4 @@
-package com.miaxis.qustion.dto;
+package com.miaxis.question.dto;
 
 import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModelProperty;

twzd-service/src/main/java/com/miaxis/qustion/mapper/QuestionCollectionMapper.java → twzd-service/src/main/java/com/miaxis/question/mapper/QuestionCollectionMapper.java

@@ -1,9 +1,9 @@
-package com.miaxis.qustion.mapper;
+package com.miaxis.question.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.qustion.domain.QuestionCollection;
-import com.miaxis.qustion.dto.QuestionCollectionListDTO;
+import com.miaxis.question.domain.QuestionCollection;
+import com.miaxis.question.dto.QuestionCollectionListDTO;
 
 import java.util.List;
 

twzd-service/src/main/java/com/miaxis/qustion/mapper/QuestionInfoMapper.java → twzd-service/src/main/java/com/miaxis/question/mapper/QuestionInfoMapper.java

@@ -1,13 +1,13 @@
-package com.miaxis.qustion.mapper;
+package com.miaxis.question.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.qustion.domain.QuestionInfo;
-import com.miaxis.qustion.dto.QuestionInfoDTO;
-import com.miaxis.qustion.dto.QuestionInfoFlDTO;
-import com.miaxis.qustion.vo.QuestionInfoDfVO;
-import com.miaxis.qustion.vo.QuestionInfoFlVO;
-import com.miaxis.qustion.vo.QuestionInfoJxVO;
+import com.miaxis.question.domain.QuestionInfo;
+import com.miaxis.question.dto.QuestionInfoDTO;
+import com.miaxis.question.dto.QuestionInfoFlDTO;
+import com.miaxis.question.vo.QuestionInfoDfVO;
+import com.miaxis.question.vo.QuestionInfoFlVO;
+import com.miaxis.question.vo.QuestionInfoJxVO;
 
 /**
  * 题库Mapper接口

twzd-service/src/main/java/com/miaxis/qustion/service/IQuestionCollectionService.java → twzd-service/src/main/java/com/miaxis/question/service/IQuestionCollectionService.java

@@ -1,9 +1,9 @@
-package com.miaxis.qustion.service;
+package com.miaxis.question.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.qustion.domain.QuestionCollection;
-import com.miaxis.qustion.dto.QuestionCollectionListDTO;
+import com.miaxis.question.domain.QuestionCollection;
+import com.miaxis.question.dto.QuestionCollectionListDTO;
 
 import java.util.List;
 

twzd-service/src/main/java/com/miaxis/qustion/service/IQuestionInfoService.java → twzd-service/src/main/java/com/miaxis/question/service/IQuestionInfoService.java

@@ -1,13 +1,13 @@
-package com.miaxis.qustion.service;
+package com.miaxis.question.service;
 
 import java.util.List;
-import com.miaxis.qustion.domain.QuestionInfo;
+import com.miaxis.question.domain.QuestionInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.qustion.dto.QuestionInfoDTO;
-import com.miaxis.qustion.dto.QuestionInfoFlDTO;
-import com.miaxis.qustion.vo.QuestionInfoDfVO;
-import com.miaxis.qustion.vo.QuestionInfoFlVO;
-import com.miaxis.qustion.vo.QuestionInfoJxVO;
+import com.miaxis.question.dto.QuestionInfoDTO;
+import com.miaxis.question.dto.QuestionInfoFlDTO;
+import com.miaxis.question.vo.QuestionInfoDfVO;
+import com.miaxis.question.vo.QuestionInfoFlVO;
+import com.miaxis.question.vo.QuestionInfoJxVO;
 
 /**
  * 题库Service接口

twzd-service/src/main/java/com/miaxis/qustion/service/IQuestionWrongService.java → twzd-service/src/main/java/com/miaxis/question/service/IQuestionWrongService.java

@@ -1,9 +1,9 @@
-package com.miaxis.qustion.service;
+package com.miaxis.question.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.qustion.domain.QuestionWrong;
-import com.miaxis.qustion.dto.QuestionWrongListDTO;
+import com.miaxis.question.domain.QuestionWrong;
+import com.miaxis.question.dto.QuestionWrongListDTO;
 
 import java.util.List;
 

twzd-service/src/main/java/com/miaxis/qustion/service/impl/QuestionCollectionServiceImpl.java → twzd-service/src/main/java/com/miaxis/question/service/impl/QuestionCollectionServiceImpl.java

@@ -1,11 +1,11 @@
-package com.miaxis.qustion.service.impl;
+package com.miaxis.question.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.qustion.domain.QuestionCollection;
-import com.miaxis.qustion.dto.QuestionCollectionListDTO;
-import com.miaxis.qustion.mapper.QuestionCollectionMapper;
-import com.miaxis.qustion.service.IQuestionCollectionService;
+import com.miaxis.question.domain.QuestionCollection;
+import com.miaxis.question.dto.QuestionCollectionListDTO;
+import com.miaxis.question.mapper.QuestionCollectionMapper;
+import com.miaxis.question.service.IQuestionCollectionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

twzd-service/src/main/java/com/miaxis/qustion/service/impl/QuestionInfoServiceImpl.java → twzd-service/src/main/java/com/miaxis/question/service/impl/QuestionInfoServiceImpl.java

@@ -1,17 +1,17 @@
-package com.miaxis.qustion.service.impl;
+package com.miaxis.question.service.impl;
 
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.qustion.dto.QuestionInfoDTO;
-import com.miaxis.qustion.dto.QuestionInfoFlDTO;
-import com.miaxis.qustion.vo.QuestionInfoDfVO;
-import com.miaxis.qustion.vo.QuestionInfoFlVO;
-import com.miaxis.qustion.vo.QuestionInfoJxVO;
+import com.miaxis.question.dto.QuestionInfoDTO;
+import com.miaxis.question.dto.QuestionInfoFlDTO;
+import com.miaxis.question.vo.QuestionInfoDfVO;
+import com.miaxis.question.vo.QuestionInfoFlVO;
+import com.miaxis.question.vo.QuestionInfoJxVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.miaxis.qustion.mapper.QuestionInfoMapper;
-import com.miaxis.qustion.domain.QuestionInfo;
-import com.miaxis.qustion.service.IQuestionInfoService;
+import com.miaxis.question.mapper.QuestionInfoMapper;
+import com.miaxis.question.domain.QuestionInfo;
+import com.miaxis.question.service.IQuestionInfoService;
 
 /**
  * 题库Service业务层处理

twzd-service/src/main/java/com/miaxis/qustion/service/impl/QuestionWrongServiceImpl.java → twzd-service/src/main/java/com/miaxis/question/service/impl/QuestionWrongServiceImpl.java

@@ -1,10 +1,10 @@
-package com.miaxis.qustion.service.impl;
+package com.miaxis.question.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.qustion.domain.QuestionWrong;
-import com.miaxis.qustion.dto.QuestionWrongListDTO;
-import com.miaxis.qustion.mapper.QuestionWrongMapper;
-import com.miaxis.qustion.service.IQuestionWrongService;
+import com.miaxis.question.domain.QuestionWrong;
+import com.miaxis.question.dto.QuestionWrongListDTO;
+import com.miaxis.question.mapper.QuestionWrongMapper;
+import com.miaxis.question.service.IQuestionWrongService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

twzd-service/src/main/java/com/miaxis/qustion/vo/QuestionInfoDfVO.java → twzd-service/src/main/java/com/miaxis/question/vo/QuestionInfoDfVO.java

@@ -1,7 +1,5 @@
-package com.miaxis.qustion.vo;
+package com.miaxis.question.vo;
 
-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;

twzd-service/src/main/java/com/miaxis/qustion/vo/QuestionInfoFlVO.java → twzd-service/src/main/java/com/miaxis/question/vo/QuestionInfoFlVO.java

@@ -1,4 +1,4 @@
-package com.miaxis.qustion.vo;
+package com.miaxis.question.vo;
 
 import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;

twzd-service/src/main/java/com/miaxis/qustion/vo/QuestionInfoJxVO.java → twzd-service/src/main/java/com/miaxis/question/vo/QuestionInfoJxVO.java

@@ -1,7 +1,5 @@
-package com.miaxis.qustion.vo;
+package com.miaxis.question.vo;
 
-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;

twzd-service/src/main/java/com/miaxis/qustion/mapper/QuestionWrongMapper.java

@@ -1,25 +0,0 @@
-package com.miaxis.qustion.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.qustion.domain.QuestionWrong;
-import com.miaxis.qustion.dto.QuestionWrongListDTO;
-
-import java.util.List;
-
-/**
- * wrongMapper接口
- *
- * @author miaxis
- * @date 2021-08-19
- */
-public interface QuestionWrongMapper extends BaseMapper<QuestionWrong> {
-    /**
-     * 查询wrong列表
-     *
-     * @param questionWrong wrong
-     * @return wrong集合
-     */
-    public List<QuestionWrong> selectQuestionWrongList(QuestionWrongListDTO questionWrong);
-
-}

twzd-service/src/main/resources/mapper/qustion/QuestionCollectionMapper.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.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 * from question_collection
+    </sql>
+
+    <select id="selectQuestionCollectionList"  parameterType="QuestionCollectionListDTO" resultMap="QuestionCollectionResult">
+        <include refid="selectQuestionCollectionVo"/>
+        <where>
+            <if test="userId != null and userId !='' "> and user_id = #{userId}</if>
+            <if test="questionId != null and questionId !=''  "> and question_id = #{questionId}</if>
+            <if test="km != null and km !='' "> and km = #{km}</if>
+            <if test="carType != null and carType !='' "> and car_type = #{carType}</if>
+        </where>
+    </select>
+
+</mapper>

twzd-service/src/main/resources/mapper/qustion/QuestionInfoMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.miaxis.qustion.mapper.QuestionInfoMapper">
+<mapper namespace="com.miaxis.question.mapper.QuestionInfoMapper">
 
     <resultMap type="QuestionInfo" id="QuestionInfoResult">
         <result property="id"    column="id"    />
@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
         </where>
 
         <if test="isRand!=null and isRand!=''"> order by rand() </if>
@@ -129,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
         </where>
         limit 0,5
     </select>
@@ -147,7 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectJxQuestionInfo"  resultType="com.miaxis.qustion.vo.QuestionInfoJxVO">
+    <select id="selectJxQuestionInfo"  resultType="com.miaxis.question.vo.QuestionInfoJxVO">
         SELECT
             DISTINCT case WHEN excell_issue_name is null then '地方专题' else excell_issue_name end as "excell_issue_name",
             excell_issue
@@ -167,7 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="selectDfQuestionInfo"  resultType="com.miaxis.qustion.vo.QuestionInfoDfVO">
+    <select id="selectDfQuestionInfo"  resultType="com.miaxis.question.vo.QuestionInfoDfVO">
         SELECT
             DISTINCT
             case WHEN place_issue_name is null then '地方专题' else place_issue_name end as "place_issue_name",
@@ -188,7 +189,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="selectFlQuestionInfo"  resultType="com.miaxis.qustion.vo.QuestionInfoFlVO">
+    <select id="selectFlQuestionInfo"  resultType="com.miaxis.question.vo.QuestionInfoFlVO">
         SELECT
         DISTINCT
         case WHEN class_issue_name is null then '地方专题' else class_issue_name end as "class_issue_name",

twzd-service/src/main/resources/mapper/qustion/QuestionWrongMapper.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.QuestionWrongMapper">
+
+    <resultMap type="QuestionWrong" id="QuestionWrongResult">
+        <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="selectQuestionWrongVo">
+        select * from question_wrong
+    </sql>
+
+    <select id="selectQuestionWrongList" parameterType="QuestionWrong" resultMap="QuestionWrongResult">
+        <include refid="selectQuestionWrongVo"/>
+        <where>
+            <if test="userId != null and userId !='' "> and user_id = #{userId}</if>
+            <if test="questionId != null and questionId != '' "> and question_id = #{questionId}</if>
+            <if test="km != null and km!='' "> and km = #{km}</if>
+            <if test="carType != null and carType !='' "> and car_type = #{carType}</if>
+        </where>
+    </select>
+
+</mapper>