题库

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

@@ -0,0 +1,175 @@
+package com.miaxis.system.controller.h5;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.constant.Constants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.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 io.swagger.annotations.*;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 【collection】Controller
+ *
+ * @author miaxis
+ * @date 2021-08-18
+ */
+@RestController
+@RequestMapping("/question/collection")
+@Api(tags={"【H5-题目收藏】"})
+public class QuestionCollectionController extends BaseController {
+    @Autowired
+    private IQuestionCollectionService questionCollectionService;
+
+    /**
+     * 查询collection列表
+     */
+
+    @GetMapping("/list")
+    @ApiOperation("查询collection列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "当前页码", dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize", value = "每页数据量", dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<QuestionCollection> list(@ModelAttribute QuestionCollectionListDTO dto) {
+        dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        startPage();
+        List<QuestionCollection> list = questionCollectionService.selectQuestionCollectionList(dto);
+        return toResponsePageInfo(list);
+    }
+
+    /**
+     * 导出collection列表
+     */
+//    @PreAuthorize("@ss.hasPermi('question:collection:export')")
+//    @Log(title = "collection", businessType = BusinessTypeEnum.EXPORT)
+//    @GetMapping("/export")
+//    @ApiOperation("导出collection列表Excel")
+//    public Response<String> export(@ModelAttribute QuestionCollection questionCollection){
+//        List<QuestionCollection> list = questionCollectionService.selectQuestionCollectionList(questionCollection);
+//        ExcelUtil<QuestionCollection> util = new ExcelUtil<QuestionCollection>(QuestionCollection.class);
+//        return util.exportExcel(list, "collection");
+//    }
+
+    /**
+     * 获取collection详细信息
+     */
+//    @PreAuthorize("@ss.hasPermi('question:collection:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取collection详细信息")
+    public Response<QuestionCollection> getInfo(
+            @ApiParam(name = "id", value = "collection参数", required = true)
+            @PathVariable("id") Long id
+    ) {
+        return Response.success(questionCollectionService.getById(id));
+    }
+
+    /**
+     * 新增collection
+     */
+    @Log(title = "collection", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增collection")
+    public Response<Integer> add(@RequestBody QuestionCollectionDTO questionCollectionDTO) {
+        //查询该用户已收藏的题目列表
+        QuestionCollectionListDTO dto = new QuestionCollectionListDTO();
+        dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        List<QuestionCollection> list = questionCollectionService.selectQuestionCollectionList(dto);
+        long count = list.stream().filter(o -> questionCollectionDTO.getQuestionId().equals(o.getQuestionId()) && questionCollectionDTO.getKm().equals(o.getKm())).count();
+        if (count > 0) {
+            throw new CustomException("该题目已收藏过");
+        }
+        QuestionCollection questionCollection = new QuestionCollection();
+        BeanUtils.copyProperties(questionCollectionDTO, questionCollection);
+        questionCollection.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        return toResponse(questionCollectionService.save(questionCollection) ? 1 : 0);
+    }
+
+    @PostMapping("collections")
+    @ApiOperation("批量新增collection")
+    public Response<Integer> collections(@RequestBody List<QuestionCollectionDTO> list) {
+        //查询该用户已收藏的题目列表
+        QuestionCollectionListDTO dto = new QuestionCollectionListDTO();
+        dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        List<QuestionCollection> dblist = questionCollectionService.selectQuestionCollectionList(dto);
+        List<String> questionIds = dblist.stream().map(o -> (o.getQuestionId()+","+o.getKm())).collect(Collectors.toList());
+
+
+        List<QuestionCollection> qlist = new ArrayList<QuestionCollection>();
+        for (QuestionCollectionDTO questionCollectionDTO : list) {
+            if (questionIds.contains(questionCollectionDTO.getQuestionId()+","+questionCollectionDTO.getKm())) {
+                continue;
+            }
+            QuestionCollection questionCollection = new QuestionCollection();
+            BeanUtils.copyProperties(questionCollectionDTO, questionCollection);
+            questionCollection.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+            qlist.add(questionCollection);
+        }
+        if (qlist.isEmpty()) {
+            throw new CustomException("选中的题目已收藏！");
+        }
+        return toResponse(questionCollectionService.saveBatch(qlist) ? 1 : 0);
+    }
+
+
+    /**
+     * 修改collection
+     */
+//    @PreAuthorize("@ss.hasPermi('question:collection:edit')")
+    @Log(title = "collection", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改collection")
+    public Response<Integer> edit(@RequestBody QuestionCollectionDTO questionCollectionDTO) {
+        QuestionCollection questionCollection = new QuestionCollection();
+        BeanUtils.copyProperties(questionCollectionDTO, questionCollection);
+        questionCollection.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        return toResponse(questionCollectionService.updateById(questionCollection) ? 1 : 0);
+    }
+
+    /**
+     * 删除collection
+     */
+    @Log(title = "collection", businessType = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/{ids}")
+    @ApiOperation("删除collection")
+    public Response<Integer> remove(
+            @ApiParam(name = "ids", value = "collectionids参数", required = true)
+            @PathVariable Long[] ids
+    ) {
+        return toResponse(questionCollectionService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+
+
+    @Log(title = "collectionQuestion", businessType = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/cancel/{questionId}")
+    @ApiOperation("取消收藏")
+    public Response<Integer> remove(
+            @ApiParam(name = "questionId", value = "问题id", required = true)
+            @PathVariable String questionId
+    ) {
+        Long userId = SecurityUtils.getLoginUser().getStudent().getId();
+        QueryWrapper<QuestionCollection> queryWrapper = new QueryWrapper<QuestionCollection>();
+        queryWrapper.eq("user_id", userId);
+        queryWrapper.eq("question_id", questionId);
+        questionCollectionService.remove(queryWrapper);
+        return Response.success();
+
+    }
+
+
+}

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

@@ -4,7 +4,11 @@ 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.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 io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -63,6 +67,22 @@ public class QuestionInfoController extends BaseController{
         return Response.success(questionInfoService.getById(id));
     }
 
+    /**
+     * 获取题库详细信息多个题库
+     */
+    @GetMapping(value = "/getQuestionInfoByIds")
+    @ApiOperation("获取题库详细信息批量取题")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ids",value = "题目ids" ,dataType = "List", required = true),
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<QuestionInfo> getQuestionInfoByIds(Long[] ids){
+        List<QuestionInfo> list = questionInfoService.selectQuestionInfoListByIds(ids);
+        return toResponsePageInfo(list);
+    }
+
+
     /**
      * 新增题库
      */
@@ -98,4 +118,34 @@ public class QuestionInfoController extends BaseController{
 //    ){
 //        return toResponse(questionInfoService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
 //    }
+
+
+    /**
+     * 获取精选分类
+     */
+    @GetMapping(value = "/selectJxQustionInfo")
+    @ApiOperation("获取精选题分类")
+    public List<QuestionInfoJxVO> selectJxQuestionInfo(@ModelAttribute QuestionInfoFlDTO questionInfoFlDTO) {
+        return questionInfoService.selectJxQuestionInfo(questionInfoFlDTO);
+    }
+
+
+    /**
+     * 获取地方分类
+     */
+    @GetMapping(value = "/selectDfQustionInfo")
+    @ApiOperation("获取地方题分类")
+    public List<QuestionInfoDfVO> selectDfQuestionInfo(@ModelAttribute QuestionInfoFlDTO questionInfoFlDTO) {
+        return questionInfoService.selectDfQuestionInfo(questionInfoFlDTO);
+    }
+
+    /**
+     * 获取分类专题分类
+     */
+    @GetMapping(value = "/selectFlQustionInfo")
+    @ApiOperation("获取分类专题分类")
+    public List<QuestionInfoFlVO> selectFlQuestionInfo(@ModelAttribute QuestionInfoFlDTO questionInfoFlDTO) {
+        return questionInfoService.selectFlQuestionInfo(questionInfoFlDTO);
+    }
 }
+

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

@@ -0,0 +1,153 @@
+package com.miaxis.system.controller.h5;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.constant.Constants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.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 io.swagger.annotations.*;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 【wrong】Controller
+ *
+ * @author miaxis
+ * @date 2021-08-19
+ */
+@RestController
+@RequestMapping("/question/wrong")
+@Api(tags={"【H5-错题】"})
+public class QuestionWrongController extends BaseController {
+    @Autowired
+    private IQuestionWrongService questionWrongService;
+
+    /**
+     * 查询wrong列表
+     */
+    @GetMapping("/list")
+    @ApiOperation("查询wrong列表")
+        @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<QuestionWrong> list(@ModelAttribute QuestionWrongListDTO dto){
+        startPage();
+        dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        List<QuestionWrong> list = questionWrongService.selectQuestionWrongList(dto);
+        return toResponsePageInfo(list);
+    }
+
+
+
+    /**
+     * 获取wrong详细信息
+     */
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取wrong详细信息")
+    public Response<QuestionWrong> getInfo(
+            @ApiParam(name = "id", value = "wrong参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(questionWrongService.getById(id));
+    }
+
+    /**
+     * 新增wrong
+     */
+    @Log(title = "wrong", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增wrong")
+    public Response<Integer> add(@RequestBody QuestionWrongDTO questionWrongDTO){
+        //查询该用户已收藏的题目列表
+        QuestionWrongListDTO dto = new QuestionWrongListDTO();
+        dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        List<QuestionWrong> list = questionWrongService.selectQuestionWrongList(dto);
+        long count = list.stream().filter(o -> questionWrongDTO.getQuestionId().equals(o.getQuestionId()) &&  questionWrongDTO.getKm().equals(o.getKm())).count();
+        if (count > 0) {
+            throw new CustomException("该错已加入错题集");
+        }
+        QuestionWrong questionWrong = new QuestionWrong();
+        BeanUtils.copyProperties(questionWrongDTO,questionWrong);
+        questionWrong.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        return toResponse(questionWrongService.save(questionWrong) ? 1 : 0);
+    }
+
+    @PostMapping("wrongs")
+    @ApiOperation("批量新增wrongs")
+    public Response<Integer> wrongs(@RequestBody List<QuestionWrongDTO> list){
+        //查询该用户已收藏的题目列表
+        QuestionWrongListDTO dto = new QuestionWrongListDTO();
+        dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        List<QuestionWrong> dblist = questionWrongService.selectQuestionWrongList(dto);
+        List<String> questionIds = dblist.stream().map(o -> o.getQuestionId()+","+o.getKm()).collect(Collectors.toList());
+        List<QuestionWrong> qlist = new ArrayList<QuestionWrong>();
+        for (QuestionWrongDTO questionWrongDTO : list) {
+            if (questionIds.contains(questionWrongDTO.getQuestionId()+","+questionWrongDTO.getKm())) {
+                continue;
+            }
+            QuestionWrong questionWrong = new QuestionWrong();
+            BeanUtils.copyProperties(questionWrongDTO, questionWrong);
+            questionWrong.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+            qlist.add(questionWrong);
+        }
+        if (qlist.isEmpty()) {
+            throw new CustomException("选中的错题都已收藏！");
+        }
+        return toResponse(questionWrongService.saveBatch(qlist) ? 1 : 0);
+    }
+
+    /**
+     * 修改wrong
+     */
+    @Log(title = "wrong", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改wrong")
+    public Response<Integer> edit(@RequestBody QuestionWrong questionWrong){
+        return toResponse(questionWrongService.updateById(questionWrong) ? 1 : 0);
+    }
+
+    /**
+     * 删除wrong
+     */
+    @Log(title = "wrong", businessType = BusinessTypeEnum.DELETE)
+	@DeleteMapping("/{ids}")
+    @ApiOperation("删除wrong")
+    public Response<Integer> remove(
+            @ApiParam(name = "ids", value = "wrongids参数", required = true)
+            @PathVariable Long[] ids
+    ){
+        return toResponse(questionWrongService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+
+
+    @Log(title = "wrongQuestion", businessType = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/cancel/{questionId}")
+    @ApiOperation("删除错题")
+    public Response<Integer> remove(
+            @ApiParam(name = "questionId", value = "问题id", required = true)
+            @PathVariable String questionId
+    ){
+        Long userId = SecurityUtils.getLoginUser().getStudent().getId();
+        QueryWrapper<QuestionWrong> queryWrapper= new QueryWrapper<QuestionWrong>();
+        queryWrapper.eq("user_id",userId);
+        queryWrapper.eq("question_id",questionId);
+        questionWrongService.remove(queryWrapper);
+        return Response.success();
+
+    }
+}

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

@@ -0,0 +1,52 @@
+package com.miaxis.qustion.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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;
+
+/**
+ * collection对象 question_collection
+ *
+ * @author miaxis
+ * @date 2021-08-18
+ */
+@Data
+@TableName("question_collection")
+@ApiModel(value = "QuestionCollection", description = "collection对象 question_collection")
+public class QuestionCollection extends BaseBusinessEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+//    @TableId(value = "id")
+//    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    /** 用户ID */
+    @Excel(name = "用户ID")
+    @TableField("user_id")
+    @ApiModelProperty(value = "用户ID")
+    private Long userId;
+
+    /** 题目ID */
+    @Excel(name = "题目ID")
+    @TableField("question_id")
+    @ApiModelProperty(value = "题目ID")
+    private Long questionId;
+
+
+    /** 科目 */
+    @Excel(name = "科目")
+    @TableField("km")
+    @ApiModelProperty(value = "考试科目（科目一、科目二、科目三、科目四）")
+    private String km;
+
+    /** 车型 */
+    @Excel(name = "车型")
+    @TableField("car_type")
+    @ApiModelProperty(value = "车型（小车 、客车、货车、摩托车）")
+    private String carType;
+}

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

@@ -0,0 +1,55 @@
+package com.miaxis.qustion.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * wrong对象 question_wrong
+ *
+ * @author miaxis
+ * @date 2021-08-19
+ */
+@Data
+@TableName("question_wrong")
+@ApiModel(value = "QuestionWrong", description = "wrong对象 question_wrong")
+public class QuestionWrong extends BaseBusinessEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    /** 用户ID */
+    @Excel(name = "用户ID")
+    @TableField("user_id")
+    @ApiModelProperty(value = "用户ID")
+    private Long userId;
+
+    /** 题目ID */
+    @Excel(name = "题目ID")
+    @TableField("question_id")
+    @ApiModelProperty(value = "题目ID")
+    private Long questionId;
+
+
+    /** 科目 */
+    @Excel(name = "科目")
+    @TableField("km")
+    @ApiModelProperty(value = "考试科目（科目一、科目二、科目三、科目四）")
+    private String km;
+
+    /** 车型 */
+    @Excel(name = "车型")
+    @TableField("car_type")
+    @ApiModelProperty(value = "车型（小车 、客车、货车、摩托车）")
+    private String carType;
+
+
+}

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

@@ -0,0 +1,32 @@
+package com.miaxis.qustion.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * collection对象 question_collection
+ *
+ * @author miaxis
+ * @date 2021-08-18
+ */
+@Data
+public class QuestionCollectionDTO {
+
+    private static final long serialVersionUID = 1L;
+
+
+
+    /** 题目ID */
+    @ApiModelProperty(value = "题目ID",required=true)
+    private Long questionId;
+
+    /** 科目 */
+    @ApiModelProperty(value = "考试科目（科目一、科目二、科目三、科目四）",required=true)
+    private String km;
+
+    /** 车型 */
+    @ApiModelProperty(value = "车型（小车 、客车、货车、摩托车）",required=true)
+    private String carType;
+
+}

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

@@ -0,0 +1,33 @@
+package com.miaxis.qustion.dto;
+
+
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * collection对象 question_collection
+ *
+ * @author miaxis
+ * @date 2021-08-18
+ */
+@Data
+public class QuestionCollectionListDTO extends BaseBusinessEntity {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "用户ID",hidden = true)
+    private Long userId;
+
+    @ApiModelProperty(value = "题目ID",hidden = true)
+    private Long questionId;
+
+    /** 科目 */
+    @ApiModelProperty(value = "考试科目（科目一、科目二、科目三、科目四）")
+    private String km;
+
+    /** 车型 */
+    @ApiModelProperty(value = "车型（小车 、客车、货车、摩托车）")
+    private String carType;
+}

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

@@ -0,0 +1,54 @@
+package com.miaxis.qustion.dto;
+
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author miaxis
+ * @date 2021-10-20
+ */
+@Data
+@ApiModel(value = "QuestionInfoFlDTO", description = "返回精选分类")
+public class QuestionInfoFlDTO extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+
+    /** 是否是科目一题目 */
+    @ApiModelProperty(value = "是否是科目一题目 1:是 0:否")
+    private String subject1;
+
+    /** 是否是科目二题目 */
+    @ApiModelProperty(value = "是否是科目二题目 1:是 0:否")
+    private String subject2;
+
+    /** 是否是科目三题目 */
+    @ApiModelProperty(value = "是否是科目三题目 1:是 2:否")
+    private String subject3;
+
+    /** 是否是科目四题目 */
+    @ApiModelProperty(value = "是否是科目四题目 1:是 2:否")
+    private String subject4;
+
+    /** 是否是C1,C2,C3驾驶证题目 */
+    @ApiModelProperty(value = "是否是C1,C2,C3驾驶证题目 1:是 2:否")
+    private String liceCar;
+
+    /** 是否是A1\A3\B1驾驶证题目 */
+    @ApiModelProperty(value = "是否是A1,A3,B1驾驶证题目 1:是 2:否")
+    private String liceBus;
+
+    /** 是否是A2\B2驾驶证题目 */
+    @ApiModelProperty(value = "是否是A2,B2驾驶证题目 1:是 2:否")
+    private String liceTruck;
+
+    /** 是否是D\E\F驾驶证题目 */
+    @ApiModelProperty(value = "是否是D,E,F驾驶证题目 1:是 2:否")
+    private String liceMoto;
+
+
+
+
+}

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

@@ -0,0 +1,33 @@
+package com.miaxis.qustion.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * wrong对象 question_wrong
+ *
+ * @author miaxis
+ * @date 2021-08-19
+ */
+@Data
+public class QuestionWrongDTO {
+
+
+
+
+    private static final long serialVersionUID = 1L;
+
+
+    /** 题目ID */
+    @ApiModelProperty(value = "题目ID")
+    private Long questionId;
+
+    /** 科目 */
+    @ApiModelProperty(value = "考试科目（科目一、科目二、科目三、科目四）",required=true)
+    private String km;
+
+    /** 车型 */
+    @ApiModelProperty(value = "车型（小车 、客车、货车、摩托车）",required=true)
+    private String carType;
+
+}

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

@@ -0,0 +1,33 @@
+package com.miaxis.qustion.dto;
+
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * wrong对象 question_wrong
+ *
+ * @author miaxis
+ * @date 2021-08-19
+ */
+@Data
+public class QuestionWrongListDTO extends BaseBusinessEntity {
+
+
+    @ApiModelProperty(value = "用户ID",hidden = true)
+    private Long userId;
+
+    @ApiModelProperty(value = "题目ID",hidden = true)
+    private Long questionId;
+
+    /** 科目 */
+    @ApiModelProperty(value = "考试科目（科目一、科目二、科目三、科目四）")
+    private String km;
+
+    /** 车型 */
+    @ApiModelProperty(value = "车型（小车 、客车、货车、摩托车）")
+    private String carType;
+
+
+
+}

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

@@ -0,0 +1,25 @@
+package com.miaxis.qustion.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.qustion.domain.QuestionCollection;
+import com.miaxis.qustion.dto.QuestionCollectionListDTO;
+
+import java.util.List;
+
+/**
+ * collectionMapper接口
+ *
+ * @author miaxis
+ * @date 2021-08-18
+ */
+public interface QuestionCollectionMapper extends BaseMapper<QuestionCollection> {
+    /**
+     * 查询collection列表
+     *
+     * @param questionCollection collection
+     * @return collection集合
+     */
+    public List<QuestionCollection> selectQuestionCollectionList(QuestionCollectionListDTO questionCollection);
+
+}

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

@@ -3,6 +3,10 @@ package com.miaxis.qustion.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.qustion.domain.QuestionInfo;
+import com.miaxis.qustion.dto.QuestionInfoFlDTO;
+import com.miaxis.qustion.vo.QuestionInfoDfVO;
+import com.miaxis.qustion.vo.QuestionInfoFlVO;
+import com.miaxis.qustion.vo.QuestionInfoJxVO;
 
 /**
  * 题库Mapper接口
@@ -17,6 +21,13 @@ public interface QuestionInfoMapper extends BaseMapper<QuestionInfo> {
      * @param questionInfo 题库
      * @return 题库集合
      */
-    public List<QuestionInfo> selectQuestionInfoList(QuestionInfo questionInfo);
+    List<QuestionInfo> selectQuestionInfoList(QuestionInfo questionInfo);
 
+    List<QuestionInfo> selectQuestionInfoListIds(Long[] ids);
+
+    List<QuestionInfoJxVO> selectJxQuestionInfo(QuestionInfoFlDTO questionInfoFlDTO);
+
+    List<QuestionInfoDfVO> selectDfQuestionInfo(QuestionInfoFlDTO questionInfoFlDTO);
+
+    List<QuestionInfoFlVO> selectFlQuestionInfo(QuestionInfoFlDTO questionInfoFlDTO);
 }

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

@@ -0,0 +1,25 @@
+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/java/com/miaxis/qustion/service/IQuestionCollectionService.java

@@ -0,0 +1,25 @@
+package com.miaxis.qustion.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.qustion.domain.QuestionCollection;
+import com.miaxis.qustion.dto.QuestionCollectionListDTO;
+
+import java.util.List;
+
+/**
+ * collectionService接口
+ *
+ * @author miaxis
+ * @date 2021-08-18
+ */
+public interface IQuestionCollectionService extends IService<QuestionCollection> {
+    /**
+     * 查询collection列表
+     *
+     * @param questionCollection collection
+     * @return collection集合
+     */
+    public List<QuestionCollection> selectQuestionCollectionList(QuestionCollectionListDTO questionCollection);
+
+}

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

@@ -3,6 +3,10 @@ package com.miaxis.qustion.service;
 import java.util.List;
 import com.miaxis.qustion.domain.QuestionInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.qustion.dto.QuestionInfoFlDTO;
+import com.miaxis.qustion.vo.QuestionInfoDfVO;
+import com.miaxis.qustion.vo.QuestionInfoFlVO;
+import com.miaxis.qustion.vo.QuestionInfoJxVO;
 
 /**
  * 题库Service接口
@@ -17,5 +21,13 @@ public interface IQuestionInfoService extends IService<QuestionInfo>{
      * @param questionInfo 题库
      * @return 题库集合
      */
-    public List<QuestionInfo> selectQuestionInfoList(QuestionInfo questionInfo);
+    List<QuestionInfo> selectQuestionInfoList(QuestionInfo questionInfo);
+
+    List<QuestionInfo> selectQuestionInfoListByIds(Long[] ids);
+
+    List<QuestionInfoJxVO> selectJxQuestionInfo(QuestionInfoFlDTO questionInfoFlDTO);
+
+    List<QuestionInfoDfVO> selectDfQuestionInfo(QuestionInfoFlDTO questionInfoFlDTO);
+
+    List<QuestionInfoFlVO> selectFlQuestionInfo(QuestionInfoFlDTO questionInfoFlDTO);
 }

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

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

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

@@ -0,0 +1,38 @@
+package com.miaxis.qustion.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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * collectionService业务层处理
+ *
+ * @author miaxis
+ * @date 2021-08-18
+ */
+@Service
+public class QuestionCollectionServiceImpl extends ServiceImpl<QuestionCollectionMapper, QuestionCollection> implements IQuestionCollectionService {
+
+    @Autowired
+    private QuestionCollectionMapper questionCollectionMapper;
+
+    /**
+     * 查询collection列表
+     *
+     * @param questionCollection collection
+     * @return collection
+     */
+    @Override
+    public List<QuestionCollection> selectQuestionCollectionList(QuestionCollectionListDTO questionCollection){
+        return questionCollectionMapper.selectQuestionCollectionList(questionCollection);
+    }
+
+}

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

@@ -2,12 +2,12 @@ package com.miaxis.qustion.service.impl;
 
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.miaxis.common.utils.DateUtils;
+import com.miaxis.qustion.dto.QuestionInfoFlDTO;
+import com.miaxis.qustion.vo.QuestionInfoDfVO;
+import com.miaxis.qustion.vo.QuestionInfoFlVO;
+import com.miaxis.qustion.vo.QuestionInfoJxVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.apache.commons.lang3.StringUtils;
 import com.miaxis.qustion.mapper.QuestionInfoMapper;
 import com.miaxis.qustion.domain.QuestionInfo;
 import com.miaxis.qustion.service.IQuestionInfoService;
@@ -33,4 +33,25 @@ public class QuestionInfoServiceImpl extends ServiceImpl<QuestionInfoMapper, Que
     public List<QuestionInfo> selectQuestionInfoList(QuestionInfo questionInfo){
         return questionInfoMapper.selectQuestionInfoList(questionInfo);
     }
+
+    @Override
+    public List<QuestionInfo> selectQuestionInfoListByIds(Long[] ids) {
+        return questionInfoMapper.selectQuestionInfoListIds(ids);
+    }
+
+    @Override
+    public List<QuestionInfoJxVO> selectJxQuestionInfo(QuestionInfoFlDTO questionInfoFlDTO) {
+        return questionInfoMapper.selectJxQuestionInfo(questionInfoFlDTO);
+    }
+
+    @Override
+    public List<QuestionInfoDfVO> selectDfQuestionInfo(QuestionInfoFlDTO questionInfoFlDTO) {
+        return questionInfoMapper.selectDfQuestionInfo(questionInfoFlDTO);
+    }
+
+    @Override
+    public List<QuestionInfoFlVO> selectFlQuestionInfo(QuestionInfoFlDTO questionInfoFlDTO) {
+        return questionInfoMapper.selectFlQuestionInfo(questionInfoFlDTO);
+    }
+
 }

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

@@ -0,0 +1,35 @@
+package com.miaxis.qustion.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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * wrongService业务层处理
+ *
+ * @author miaxis
+ * @date 2021-08-19
+ */
+@Service
+public class QuestionWrongServiceImpl extends ServiceImpl<QuestionWrongMapper, QuestionWrong> implements IQuestionWrongService {
+    @Autowired
+    private QuestionWrongMapper questionWrongMapper;
+
+    /**
+     * 查询wrong列表
+     *
+     * @param questionWrong wrong
+     * @return wrong
+     */
+    @Override
+    public List<QuestionWrong> selectQuestionWrongList(QuestionWrongListDTO questionWrong){
+        return questionWrongMapper.selectQuestionWrongList(questionWrong);
+    }
+}

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

@@ -0,0 +1,31 @@
+package com.miaxis.qustion.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;
+import lombok.Data;
+
+/**
+ * 地方题选分类返回对象
+ * @author miaxis
+ * @date 2021-10-20
+ */
+@Data
+@ApiModel(value = "QuestionInfoDfVO", description = "地方题选分类返回对象")
+public class QuestionInfoDfVO extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "地方题（包含科一到科四）")
+    private String placeIssue;
+
+    /** 题目在地方中所属的模块名称 */
+    @ApiModelProperty(value = "题目在地方中所属的模块名称")
+    private String placeIssueName;
+
+
+
+
+}

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

@@ -0,0 +1,29 @@
+package com.miaxis.qustion.vo;
+
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分类专题分类返回对象
+ * @author miaxis
+ * @date 2021-10-20
+ */
+@Data
+@ApiModel(value = "QuestionInfoDfVO", description = "分类专题分类返回对象")
+public class QuestionInfoFlVO extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "分类题（包含科一到科四）")
+    private String classIssue;
+
+    /** 题目在地方中所属的模块名称 */
+    @ApiModelProperty(value = "题目在分类中所属的模块名称")
+    private String classIssueName;
+
+
+
+
+}

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

@@ -0,0 +1,31 @@
+package com.miaxis.qustion.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;
+import lombok.Data;
+
+/**
+ * 精选选分类返回对象
+ *
+ * @author miaxis
+ * @date 2021-10-20
+ */
+@Data
+@ApiModel(value = "QuestionInfoJxVO", description = "题库分类查询对象")
+public class QuestionInfoJxVO extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "精选题（包含科一到科四）")
+    private String excellIssue;
+
+    @ApiModelProperty(value = "题目在精选中所属的模块名称")
+    private String excellIssueName;
+
+
+
+
+}

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

@@ -90,5 +90,76 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
 
+    <select id="selectQuestionInfoListIds" parameterType="Long" resultMap="QuestionInfoResult">
+        <include refid="selectQuestionInfoVo"/>
+        <where>
+            and id in
+             <foreach collection="array" item="id" index="index" open="(" close=")" separator=",">
+                 #{id}
+             </foreach>
+
+        </where>
+    </select>
+
+    <select id="selectJxQuestionInfo"  resultType="com.miaxis.qustion.vo.QuestionInfoJxVO">
+        SELECT
+            DISTINCT case WHEN excell_issue_name is null then '地方专题' else excell_issue_name end as "excell_issue_name",
+            excell_issue
+        FROM question_info
+        <where>
+            <if test="subject1 != null  and subject1 != ''"> and subject_1 = #{subject1}</if>
+            <if test="subject2 != null  and subject2 != ''"> and subject_2 = #{subject2}</if>
+            <if test="subject3 != null  and subject3 != ''"> and subject_3 = #{subject3}</if>
+            <if test="subject4 != null  and subject4 != ''"> and subject_4 = #{subject4}</if>
+            <if test="liceCar != null  and liceCar != ''"> and lice_car = #{liceCar} </if>
+            <if test="liceBus != null  and liceBus != ''"> and lice_bus = #{liceBus}</if>
+            <if test="liceTruck != null  and liceTruck != ''"> and lice_truck = #{liceTruck}</if>
+            <if test="liceMoto != null  and liceMoto != ''"> and lice_moto = #{liceMoto}</if>
+        </where>
+        ORDER BY
+            excell_issue + 0 ASC
+    </select>
+
+
+    <select id="selectDfQuestionInfo"  resultType="com.miaxis.qustion.vo.QuestionInfoDfVO">
+        SELECT
+            DISTINCT
+            case WHEN place_issue_name is null then '地方专题' else place_issue_name end as "place_issue_name",
+            place_issue
+        FROM question_info
+        <where>
+            <if test="subject1 != null  and subject1 != ''"> and subject_1 = #{subject1}</if>
+            <if test="subject2 != null  and subject2 != ''"> and subject_2 = #{subject2}</if>
+            <if test="subject3 != null  and subject3 != ''"> and subject_3 = #{subject3}</if>
+            <if test="subject4 != null  and subject4 != ''"> and subject_4 = #{subject4}</if>
+            <if test="liceCar != null  and liceCar != ''"> and lice_car = #{liceCar} </if>
+            <if test="liceBus != null  and liceBus != ''"> and lice_bus = #{liceBus}</if>
+            <if test="liceTruck != null  and liceTruck != ''"> and lice_truck = #{liceTruck}</if>
+            <if test="liceMoto != null  and liceMoto != ''"> and lice_moto = #{liceMoto}</if>
+        </where>
+        ORDER BY
+            place_issue + 0 ASC
+    </select>
+
+
+    <select id="selectFlQuestionInfo"  resultType="com.miaxis.qustion.vo.QuestionInfoFlVO">
+        SELECT
+        DISTINCT
+        case WHEN class_issue_name is null then '地方专题' else class_issue_name end as "class_issue_name",
+        class_issue
+        FROM question_info
+        <where>
+            <if test="subject1 != null  and subject1 != ''"> and subject_1 = #{subject1}</if>
+            <if test="subject2 != null  and subject2 != ''"> and subject_2 = #{subject2}</if>
+            <if test="subject3 != null  and subject3 != ''"> and subject_3 = #{subject3}</if>
+            <if test="subject4 != null  and subject4 != ''"> and subject_4 = #{subject4}</if>
+            <if test="liceCar != null  and liceCar != ''"> and lice_car = #{liceCar} </if>
+            <if test="liceBus != null  and liceBus != ''"> and lice_bus = #{liceBus}</if>
+            <if test="liceTruck != null  and liceTruck != ''"> and lice_truck = #{liceTruck}</if>
+            <if test="liceMoto != null  and liceMoto != ''"> and lice_moto = #{liceMoto}</if>
+        </where>
+        ORDER BY
+        class_issue + 0 ASC
+    </select>
 
 </mapper>