错题与收藏数接口， 直接获取错题与收藏接口

sdjk-admin/src/main/java/com/miaxis/app/controller/question/QuestionCollectionController.java

@@ -10,11 +10,9 @@ import com.miaxis.common.enums.BusinessTypeEnum;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.question.domain.QuestionCollection;
+import com.miaxis.question.domain.QuestionInfo;
 import com.miaxis.question.domain.QuestionWrong;
-import com.miaxis.question.dto.QuestionCollectionDTO;
-import com.miaxis.question.dto.QuestionCollectionDelDTO;
-import com.miaxis.question.dto.QuestionCollectionListDTO;
-import com.miaxis.question.dto.QuestionWrongDelDTO;
+import com.miaxis.question.dto.*;
 import com.miaxis.question.service.IQuestionCollectionService;
 import io.swagger.annotations.*;
 import org.springframework.beans.BeanUtils;
@@ -188,5 +186,20 @@ public class QuestionCollectionController extends BaseController {
     }
 
 
+    @GetMapping("/collectionByUser")
+    @ApiOperation("根据用户获取收藏列表")
+    public Response<List<QuestionInfo>> collectionByUser(@ModelAttribute QuestionCollectionListDTO dto){
+        dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        List<QuestionInfo> list = questionCollectionService.selectCollectionByUserId(dto);
+        return Response.success(list);
+    }
+
+    @GetMapping("/collectionCountByUser")
+    @ApiOperation("根据用户获取收藏题数")
+    public Response<Integer> collectionCountByUser(@ModelAttribute QuestionCollectionListDTO dto){
+        dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        Integer count = questionCollectionService.selectCollectionCountByUserId(dto);
+        return Response.success(count);
+    }
 
 }

sdjk-admin/src/main/java/com/miaxis/app/controller/question/QuestionInfoController.java

@@ -4,10 +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.common.utils.SecurityUtils;
 import com.miaxis.question.domain.QuestionInfo;
+import com.miaxis.question.domain.QuestionWrong;
 import com.miaxis.question.dto.QuestionInfoDTO;
 import com.miaxis.question.dto.QuestionInfoFlDTO;
 import com.miaxis.question.dto.QuestionInfoTestDTO;
+import com.miaxis.question.dto.QuestionWrongListDTO;
 import com.miaxis.question.service.IQuestionInfoService;
 import com.miaxis.question.vo.QuestionInfoDfVO;
 import com.miaxis.question.vo.QuestionInfoFlVO;
@@ -26,7 +29,7 @@ import java.util.List;
  * @date 2021-10-20
  */
 @RestController
-@RequestMapping(Constants.STUDENT_PREFIX+"/question/info")
+@RequestMapping(Constants.OPEN_PREFIX+"/question/info")
 @Api(tags={"【H5-题库】"})
 public class QuestionInfoController extends BaseController {
     @Autowired
@@ -192,5 +195,9 @@ public class QuestionInfoController extends BaseController {
         List<QuestionInfo> list = questionInfoService.selectFreeQuestionInfo();
         return toResponsePageInfo(list);
     }
+
+
+
+
 }
 

sdjk-admin/src/main/java/com/miaxis/app/controller/question/QuestionWrongController.java

@@ -11,6 +11,7 @@ import java.util.stream.Collectors;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.question.domain.QuestionCollection;
+import com.miaxis.question.domain.QuestionInfo;
 import com.miaxis.question.dto.*;
 import com.miaxis.score.domain.ScoreInfo;
 import io.swagger.annotations.*;
@@ -176,4 +177,22 @@ public class QuestionWrongController extends BaseController{
         return Response.success();
     }
 
+
+    @GetMapping("/wrongByUser")
+    @ApiOperation("根据用户获取错题列表")
+    public Response<List<QuestionInfo>> wrongByUser(@ModelAttribute QuestionWrongListDTO dto){
+        dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        List<QuestionInfo> list = questionWrongService.selectWrongByUserId(dto);
+        return Response.success(list);
+    }
+
+    @GetMapping("/wrongCountByUser")
+    @ApiOperation("根据用户获取错题数")
+    public Response<Integer> wrongCountByUser(@ModelAttribute QuestionWrongListDTO dto){
+        dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        Integer count = questionWrongService.selectWrongCountByUserId(dto);
+        return Response.success(count);
+    }
+
+
 }

sdjk-service/src/main/java/com/miaxis/question/mapper/QuestionCollectionMapper.java

@@ -3,6 +3,7 @@ package com.miaxis.question.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.question.domain.QuestionCollection;
+import com.miaxis.question.domain.QuestionInfo;
 import com.miaxis.question.dto.QuestionCollectionListDTO;
 
 /**
@@ -20,4 +21,9 @@ public interface QuestionCollectionMapper extends BaseMapper<QuestionCollection>
      */
     public List<QuestionCollection> selectQuestionCollectionList(QuestionCollectionListDTO questionCollection);
 
+    List<QuestionInfo> selectCollectionByUserId(QuestionCollectionListDTO dto);
+
+
+    Integer selectCollectionCountByUserId(QuestionCollectionListDTO dto);
+
 }

sdjk-service/src/main/java/com/miaxis/question/mapper/QuestionInfoMapper.java

@@ -59,4 +59,5 @@ public interface QuestionInfoMapper extends BaseMapper<QuestionInfo> {
 
     List<QuestionInfo> selectQuestionInfoListByYdtIds(Long[] ids);
 
+    List<QuestionInfo> selectQuestionWrongList(QuestionWrongListDTO dto);
 }

sdjk-service/src/main/java/com/miaxis/question/mapper/QuestionWrongMapper.java

@@ -2,6 +2,7 @@ package com.miaxis.question.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.question.domain.QuestionInfo;
 import com.miaxis.question.domain.QuestionWrong;
 import com.miaxis.question.dto.QuestionWrongListDTO;
 
@@ -20,4 +21,7 @@ public interface QuestionWrongMapper extends BaseMapper<QuestionWrong> {
      */
     public List<QuestionWrong> selectQuestionWrongList(QuestionWrongListDTO questionWrong);
 
+    List<QuestionInfo> selectWrongByUserId(QuestionWrongListDTO dto);
+
+    Integer selectWrongCountByUserId(QuestionWrongListDTO dto);
 }

sdjk-service/src/main/java/com/miaxis/question/service/IQuestionCollectionService.java

@@ -2,7 +2,9 @@ package com.miaxis.question.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.question.domain.QuestionCollection;
+import com.miaxis.question.domain.QuestionInfo;
 import com.miaxis.question.dto.QuestionCollectionListDTO;
+import com.miaxis.question.dto.QuestionWrongListDTO;
 
 import java.util.List;
 
@@ -19,6 +21,9 @@ public interface IQuestionCollectionService extends IService<QuestionCollection>
      * @param questionCollection collection
      * @return collection集合
      */
-    public List<QuestionCollection> selectQuestionCollectionList(QuestionCollectionListDTO questionCollection);
+    List<QuestionCollection> selectQuestionCollectionList(QuestionCollectionListDTO questionCollection);
 
+    List<QuestionInfo> selectCollectionByUserId(QuestionCollectionListDTO dto);
+
+    Integer selectCollectionCountByUserId(QuestionCollectionListDTO dto);
 }

sdjk-service/src/main/java/com/miaxis/question/service/IQuestionInfoService.java

@@ -2,6 +2,7 @@ package com.miaxis.question.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.question.domain.QuestionInfo;
+import com.miaxis.question.domain.QuestionWrong;
 import com.miaxis.question.dto.*;
 import com.miaxis.question.vo.*;
 
@@ -34,17 +35,13 @@ public interface IQuestionInfoService extends IService<QuestionInfo>{
 
     List<QuestionInfoSxVO> selectSxQuestionInfo(QuestionInfoFlDTO questionInfoFlDTO);
 
-    List<QuestionInfoExcelVo> selectQuestionInfoSortList(QuestionInfoSortDTO questionInfoSortDTO);
 
-    void updateSortById(QuestionInfoSortUpateDTO dto);
 
-    List<QuestionInfoExcelTypeVo> getIssueTypes(int issueTypeValue, Integer typeValue);
 
     List<QuestionInfo> selectTestQuestionInfo(QuestionInfoTestDTO questionInfoTestDTO);
 
     List<QuestionInfo> selectFreeQuestionInfo();
 
-    List<QuestionInfo> selectQuestionInfoListByYdtIds(Long[] ids);
 
 }
 

sdjk-service/src/main/java/com/miaxis/question/service/IQuestionWrongService.java

@@ -1,6 +1,8 @@
 package com.miaxis.question.service;
 
 import java.util.List;
+
+import com.miaxis.question.domain.QuestionInfo;
 import com.miaxis.question.domain.QuestionWrong;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.question.dto.QuestionWrongListDTO;
@@ -19,4 +21,8 @@ public interface IQuestionWrongService extends IService<QuestionWrong>{
      * @return wrong集合
      */
     public List<QuestionWrong> selectQuestionWrongList(QuestionWrongListDTO questionWrong);
+
+    List<QuestionInfo> selectWrongByUserId(QuestionWrongListDTO dto);
+
+    Integer selectWrongCountByUserId(QuestionWrongListDTO dto);
 }

sdjk-service/src/main/java/com/miaxis/question/service/impl/QuestionCollectionServiceImpl.java

@@ -2,6 +2,7 @@ package com.miaxis.question.service.impl;
 
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.question.domain.QuestionInfo;
 import com.miaxis.question.dto.QuestionCollectionListDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -31,4 +32,16 @@ public class QuestionCollectionServiceImpl extends ServiceImpl<QuestionCollectio
         return questionCollectionMapper.selectQuestionCollectionList(questionCollection);
     }
 
+
+    @Override
+    public Integer selectCollectionCountByUserId(QuestionCollectionListDTO dto) {
+        return questionCollectionMapper.selectCollectionCountByUserId(dto);
+    }
+
+
+    @Override
+    public List<QuestionInfo> selectCollectionByUserId(QuestionCollectionListDTO dto) {
+        return questionCollectionMapper.selectCollectionByUserId(dto);
+    }
+
 }

sdjk-service/src/main/java/com/miaxis/question/service/impl/QuestionInfoServiceImpl.java

@@ -59,10 +59,6 @@ public class QuestionInfoServiceImpl extends ServiceImpl<QuestionInfoMapper, Que
         return questionInfoMapper.selectQuestionInfoListIds(ids);
     }
 
-    @Override
-    public List<QuestionInfo> selectQuestionInfoListByYdtIds(Long[] ids) {
-        return questionInfoMapper.selectQuestionInfoListByYdtIds(ids);
-    }
 
     @Override
     public List<QuestionInfoJxVO> selectJxQuestionInfo(QuestionInfoFlDTO questionInfoFlDTO) {
@@ -89,35 +85,7 @@ public class QuestionInfoServiceImpl extends ServiceImpl<QuestionInfoMapper, Que
         return questionInfoMapper.selectSxQuestionInfo(questionInfoFlDTO);
     }
 
-    @Override
-    public List<QuestionInfoExcelVo> selectQuestionInfoSortList(QuestionInfoSortDTO questionInfoSortDTO) {
-        return questionInfoMapper.selectQuestionInfoSortList(questionInfoSortDTO);
-    }
-
-    @Override
-    public void updateSortById(QuestionInfoSortUpateDTO dto) {
-        questionInfoMapper.updateSortById(dto);
-    }
-
-    @Override
-    public List<QuestionInfoExcelTypeVo> getIssueTypes(int issueTypeValue, Integer subject) {
-        if (issueTypeValue == 1){
-            return questionInfoMapper.selectIssueType1(subject);
-        }
-        if (issueTypeValue == 2){
-            return questionInfoMapper.selectIssueType2(subject);
-        }
-        if (issueTypeValue == 3){
-            return questionInfoMapper.selectIssueType3(subject);
-        }
-        if (issueTypeValue == 4){
-            return questionInfoMapper.selectIssueType4(subject);
-        }
-        return null;
-
-
 
-    }
 
     @Override
     public List<QuestionInfo> selectTestQuestionInfo(QuestionInfoTestDTO questionInfoTestDTO) {
@@ -220,4 +188,5 @@ public class QuestionInfoServiceImpl extends ServiceImpl<QuestionInfoMapper, Que
         list1.addAll(list3);
         return list1;
     }
+
 }

sdjk-service/src/main/java/com/miaxis/question/service/impl/QuestionWrongServiceImpl.java

@@ -2,6 +2,7 @@ package com.miaxis.question.service.impl;
 
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.question.domain.QuestionInfo;
 import com.miaxis.question.dto.QuestionWrongListDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,4 +31,14 @@ public class QuestionWrongServiceImpl extends ServiceImpl<QuestionWrongMapper, Q
     public List<QuestionWrong> selectQuestionWrongList(QuestionWrongListDTO questionWrong){
         return questionWrongMapper.selectQuestionWrongList(questionWrong);
     }
+
+    @Override
+    public List<QuestionInfo> selectWrongByUserId(QuestionWrongListDTO dto) {
+        return questionWrongMapper.selectWrongByUserId(dto);
+    }
+
+    @Override
+    public Integer selectWrongCountByUserId(QuestionWrongListDTO dto) {
+        return questionWrongMapper.selectWrongCountByUserId(dto);
+    }
 }

sdjk-service/src/main/resources/mapper/question/QuestionCollectionMapper.xml

@@ -26,4 +26,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+
+    <select id="selectCollectionByUserId" resultType="com.miaxis.question.domain.QuestionInfo">
+
+        select q1.* from question_info q1 join question_collection q2 on q1.id = q2.question_id
+        <where>
+            <if test="userId != null and userId !='' "> and q2.user_id = #{userId}</if>
+            <if test="questionId != null and questionId != '' "> and q2.question_id = #{questionId}</if>
+            <if test="km != null and km!='' "> and q2.km = #{km}</if>
+            <if test="carType != null and carType !='' "> and q2.car_type = #{carType}</if>
+        </where>
+        order by q2.create_time
+
+    </select>
+
+
+    <select id="selectCollectionCountByUserId" resultType="java.lang.Integer">
+
+        select count(1) from question_info q1 join question_collection q2 on q1.id = q2.question_id
+        <where>
+            <if test="userId != null and userId !='' "> and q2.user_id = #{userId}</if>
+            <if test="questionId != null and questionId != '' "> and q2.question_id = #{questionId}</if>
+            <if test="km != null and km!='' "> and q2.km = #{km}</if>
+            <if test="carType != null and carType !='' "> and q2.car_type = #{carType}</if>
+        </where>
+
+    </select>
+
+
 </mapper>

sdjk-service/src/main/resources/mapper/question/QuestionInfoMapper.xml

@@ -381,4 +381,19 @@
     </select>
 
 
+
+    <select id="selectQuestionWrongList" resultType="com.miaxis.question.domain.QuestionInfo">
+
+        select q1.* from question_info q1 join question_wrong q2 on q1.id = q2.question_id
+        <where>
+            <if test="userId != null and userId !='' "> and q2.user_id = #{userId}</if>
+            <if test="questionId != null and questionId != '' "> and q2.question_id = #{questionId}</if>
+            <if test="km != null and km!='' "> and q2.km = #{km}</if>
+            <if test="carType != null and carType !='' "> and q2.car_type = #{carType}</if>
+        </where>
+        order by q2.create_time
+
+    </select>
+
+
 </mapper>

sdjk-service/src/main/resources/mapper/question/QuestionWrongMapper.xml

@@ -26,4 +26,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+
+
+
+
+    <select id="selectWrongByUserId" resultType="com.miaxis.question.domain.QuestionInfo">
+
+        select q1.* from question_info q1 join question_wrong q2 on q1.id = q2.question_id
+        <where>
+            <if test="userId != null and userId !='' "> and q2.user_id = #{userId}</if>
+            <if test="questionId != null and questionId != '' "> and q2.question_id = #{questionId}</if>
+            <if test="km != null and km!='' "> and q2.km = #{km}</if>
+            <if test="carType != null and carType !='' "> and q2.car_type = #{carType}</if>
+        </where>
+        order by q2.create_time
+    </select>
+    <select id="selectWrongCountByUserId" resultType="int">
+
+        select count(1) from question_info q1 join question_wrong q2 on q1.id = q2.question_id
+        <where>
+            <if test="userId != null and userId !='' "> and q2.user_id = #{userId}</if>
+            <if test="questionId != null and questionId != '' "> and q2.question_id = #{questionId}</if>
+            <if test="km != null and km!='' "> and q2.km = #{km}</if>
+            <if test="carType != null and carType !='' "> and q2.car_type = #{carType}</if>
+        </where>
+
+    </select>
+
 </mapper>