收藏错题接口修改 添加APP专用

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

@@ -5,22 +5,23 @@ 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.question.domain.QuestionCollection;
 import com.miaxis.question.domain.QuestionInfo;
-import com.miaxis.question.domain.QuestionWrong;
-import com.miaxis.question.dto.*;
+import com.miaxis.question.dto.QuestionCollectionDTO;
+import com.miaxis.question.dto.QuestionCollectionDelDTO;
+import com.miaxis.question.dto.QuestionCollectionListDTO;
+import com.miaxis.question.dto.QuestionCollectionYunDTO;
 import com.miaxis.question.service.IQuestionCollectionService;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 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;
 
@@ -52,7 +53,8 @@ public class QuestionCollectionController extends BaseController {
         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("该题目已收藏过");
+            Response response = new Response(200,"该题目已收藏过");
+            return response;
         }
         QuestionCollection questionCollection = new QuestionCollection();
         BeanUtils.copyProperties(questionCollectionDTO, questionCollection);
@@ -81,7 +83,8 @@ public class QuestionCollectionController extends BaseController {
             qlist.add(questionCollection);
         }
         if (qlist.isEmpty()) {
-            throw new CustomException("选中的题目已收藏！");
+            Response response = new Response(200,"选中的题目已收藏！");
+            return response;
         }
         return toResponse(questionCollectionService.saveBatch(qlist) ? 1 : 0);
     }
@@ -107,7 +110,8 @@ public class QuestionCollectionController extends BaseController {
             qlist.add(questionCollection);
         }
         if (qlist.isEmpty()) {
-            throw new CustomException("请先收藏题目。");
+            Response response = new Response(200,"请先收藏题目。");
+            return response;
         }
         return toResponse(questionCollectionService.saveBatch(qlist) ? 1 : 0);
     }
@@ -141,13 +145,21 @@ public class QuestionCollectionController extends BaseController {
 
 
     @GetMapping("/collectionByUser")
-    @ApiOperation("恢复云端收藏到本机（根据用户获取收藏题）")
+    @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("/appCollectionByUser")
+    @ApiOperation("app恢复云端收藏到本机（根据用户获取收藏题）")
+    public Response<List<Long>> appCollectionByUser(@ModelAttribute QuestionCollectionListDTO dto){
+        dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        List<Long> list = questionCollectionService.selectCollectionIdByUserId(dto);
+        return Response.success(list);
+    }
+
     @GetMapping("/collectionCountByUser")
     @ApiOperation("根据用户获取收藏题数")
     public Response<Integer> collectionCountByUser(@ModelAttribute QuestionCollectionListDTO dto){

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

@@ -85,42 +85,6 @@ public class QuestionInfoController extends BaseController {
     }
 
 
-    /**
-     * 新增题库
-     */
-//    @PreAuthorize("@ss.hasPermi('qustion:info:add')")
-//    @Log(title = "题库", businessType = BusinessTypeEnum.INSERT)
-//    @PostMapping
-//    @ApiOperation("新增题库")
-//    public Response<Integer> add(@RequestBody QuestionInfo questionInfo){
-//        return toResponse(questionInfoService.save(questionInfo) ? 1 : 0);
-//    }
-
-    /**
-     * 修改题库
-     */
-//    @PreAuthorize("@ss.hasPermi('qustion:info:edit')")
-//    @Log(title = "题库", businessType = BusinessTypeEnum.UPDATE)
-//    @PutMapping
-//    @ApiOperation("修改题库")
-//    public Response<Integer> edit(@RequestBody QuestionInfo questionInfo){
-//        return toResponse(questionInfoService.updateById(questionInfo) ? 1 : 0);
-//    }
-
-    /**
-     * 删除题库
-     */
-//    @PreAuthorize("@ss.hasPermi('qustion:info: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(questionInfoService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
-//    }
-
 
     /**
      * 获取精选分类

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

@@ -145,13 +145,22 @@ public class QuestionWrongController extends BaseController{
 
 
     @GetMapping("/wrongByUser")
-    @ApiOperation("恢复云端错题到本机（根据用户获取错题）")
+    @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("/appWrongByUser")
+    @ApiOperation("app恢复云端错题到本机（根据用户获取错题）")
+    public Response<List<Long>> appWrongByUser(@ModelAttribute QuestionWrongListDTO dto){
+        dto.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        List<Long> list = questionWrongService.selectWrongIdByUserId(dto);
+        return Response.success(list);
+    }
+
+
     @GetMapping("/wrongCountByUser")
     @ApiOperation("根据用户获取错题数")
     public Response<Integer> wrongCountByUser(@ModelAttribute QuestionWrongListDTO dto){

nbjk-common/src/main/java/com/miaxis/common/core/domain/Response.java

@@ -65,6 +65,8 @@ public class Response<T> {
     public static <T> Response<T> success(T data){
         return new Response<T>(data);
     }
+
+
     /**
      * 失败时调用
      * @param

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

@@ -19,11 +19,13 @@ public interface QuestionCollectionMapper extends BaseMapper<QuestionCollection>
      * @param questionCollection collection
      * @return collection集合
      */
-    public List<QuestionCollection> selectQuestionCollectionList(QuestionCollectionListDTO questionCollection);
+    List<QuestionCollection> selectQuestionCollectionList(QuestionCollectionListDTO questionCollection);
 
     List<QuestionInfo> selectCollectionByUserId(QuestionCollectionListDTO dto);
 
+    List<Long> selectCollectionIdByUserId(QuestionCollectionListDTO dto);
 
     Integer selectCollectionCountByUserId(QuestionCollectionListDTO dto);
 
+
 }

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

@@ -24,4 +24,6 @@ public interface QuestionWrongMapper extends BaseMapper<QuestionWrong> {
     List<QuestionInfo> selectWrongByUserId(QuestionWrongListDTO dto);
 
     Integer selectWrongCountByUserId(QuestionWrongListDTO dto);
+
+    List<Long> selectWrongIdByUserId(QuestionWrongListDTO dto);
 }

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

@@ -25,5 +25,9 @@ public interface IQuestionCollectionService extends IService<QuestionCollection>
 
     List<QuestionInfo> selectCollectionByUserId(QuestionCollectionListDTO dto);
 
+    List<Long> selectCollectionIdByUserId(QuestionCollectionListDTO dto);
+
     Integer selectCollectionCountByUserId(QuestionCollectionListDTO dto);
+
+
 }

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

@@ -26,6 +26,8 @@ public interface IQuestionWrongService extends IService<QuestionWrong>{
 
     List<QuestionInfo> selectWrongByUserId(QuestionWrongListDTO dto);
 
+    List<Long> selectWrongIdByUserId(QuestionWrongListDTO dto);
+
     Integer selectWrongCountByUserId(QuestionWrongListDTO dto);
 
 }

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

@@ -44,4 +44,9 @@ public class QuestionCollectionServiceImpl extends ServiceImpl<QuestionCollectio
         return questionCollectionMapper.selectCollectionByUserId(dto);
     }
 
+    @Override
+    public List<Long> selectCollectionIdByUserId(QuestionCollectionListDTO dto) {
+        return questionCollectionMapper.selectCollectionIdByUserId(dto);
+    }
+
 }

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

@@ -37,6 +37,11 @@ public class QuestionWrongServiceImpl extends ServiceImpl<QuestionWrongMapper, Q
         return questionWrongMapper.selectWrongByUserId(dto);
     }
 
+    @Override
+    public List<Long> selectWrongIdByUserId(QuestionWrongListDTO dto) {
+        return questionWrongMapper.selectWrongIdByUserId(dto);
+    }
+
     @Override
     public Integer selectWrongCountByUserId(QuestionWrongListDTO dto) {
         return questionWrongMapper.selectWrongCountByUserId(dto);

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

@@ -40,6 +40,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
+    <select id="selectCollectionIdByUserId" resultType="java.lang.Long">
+
+        select q1.id 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>
+        </where>
+        order by q2.create_time asc
+
+    </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

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

@@ -38,6 +38,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by q2.create_time
     </select>
 
+    <select id="selectWrongIdByUserId" resultType="java.lang.Long">
+
+        select q1.id 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>
+        </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