修改代码

c855079a · 邹磊浩 · 4df77f4d · c855079a · c855079a · c855079a
Commit c855079a authored Jul 27, 2023 by 邹磊浩
7 changed files
--- a/school-paper/src/main/java/com/ruoyi/school/paper/controller/DbCollectListController.java
+++ b/school-paper/src/main/java/com/ruoyi/school/paper/controller/DbCollectListController.java
@@ -5,6 +5,7 @@ import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 import cn.dev33.satoken.annotation.SaIgnore;
+import com.ruoyi.school.paper.domain.request.CollectListRequest;
 import com.ruoyi.school.paper.domain.vo.MyCollectListVo;
 import lombok.RequiredArgsConstructor;
@@ -48,8 +49,9 @@ public class DbCollectListController extends BaseController {
     * 查询我的收藏列表
     */
    @GetMapping("/list")
-    public TableDataInfo<MyCollectListVo> list(@RequestParam("categoryId") Integer categoryId, @RequestParam("species") Integer species, PageQuery pageQuery) {
+    public TableDataInfo<MyCollectListVo> list(CollectListRequest request, PageQuery pageQuery) {
-        return iDbCollectListService.queryPageList(categoryId, species, getUserId(), pageQuery);
+        request.setUserId(getUserId());
+        return iDbCollectListService.queryPageList(request, pageQuery);
    }
    /**

--- a/school-paper/src/main/java/com/ruoyi/school/paper/domain/request/CollectListRequest.java
+++ b/school-paper/src/main/java/com/ruoyi/school/paper/domain/request/CollectListRequest.java
+package com.ruoyi.school.paper.domain.request;
+import lombok.Data;
+import java.io.Serializable;
+/**
+ * 我的收藏
+ */
+@Data
+public class CollectListRequest implements Serializable {
+    /**
+     * 类别ID
+     */
+    private Integer categoryId;
+    /**
+     * 习题种类：1填空，2选择，3解答
+     */
+    private Integer species;
+    /**
+     * 用户编号
+     */
+    private Long userId;
+}
--- a/school-paper/src/main/java/com/ruoyi/school/paper/domain/vo/MyCollectListVo.java
+++ b/school-paper/src/main/java/com/ruoyi/school/paper/domain/vo/MyCollectListVo.java
@@ -24,12 +24,14 @@ public class MyCollectListVo implements Serializable {
    /**
     * 正确答案
     */
-    private String rightAnswers;
+    private String answer;
    /**
     * 正确答案图片
     */
-    private String rightAnswersPic;
+    private String answerPic;
+    private Boolean collectFlag = Boolean.TRUE;
    /**
     * 习题种类：1填空，2选择，3解答
@@ -43,5 +45,5 @@ public class MyCollectListVo implements Serializable {
    /**
     * 选项
     */
-    private List<DbQuestionBankAnswerTestPaper> list;
+    private List<DbQuestionBankAnswerTestPaper> options;
 }
--- a/school-paper/src/main/java/com/ruoyi/school/paper/mapper/DbCollectListMapper.java
+++ b/school-paper/src/main/java/com/ruoyi/school/paper/mapper/DbCollectListMapper.java
@@ -3,6 +3,7 @@ package com.ruoyi.school.paper.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.school.paper.domain.DbCollectList;
+import com.ruoyi.school.paper.domain.request.CollectListRequest;
 import com.ruoyi.school.paper.domain.vo.DbCollectListVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
 import com.ruoyi.school.paper.domain.vo.MyCollectListVo;
@@ -15,7 +16,7 @@ import org.apache.ibatis.annotations.Param;
 * @date 2023-07-20
 */
 public interface DbCollectListMapper extends BaseMapperPlus<DbCollectListMapper, DbCollectList, DbCollectListVo> {
-    Page<MyCollectListVo> findMyECollectListVoPage(IPage<MyCollectListVo> iPage,@Param("userId") Long userId, @Param("categoryId") Integer categoryId,@Param("species")Integer species);
+    Page<MyCollectListVo> findMyECollectListVoPage(IPage<MyCollectListVo> iPage,@Param("request") CollectListRequest request);
    long getListByRecord(@Param("recordId") Long recordId, @Param("questionBankId") Long questionBankId);
 }
--- a/school-paper/src/main/java/com/ruoyi/school/paper/service/IDbCollectListService.java
+++ b/school-paper/src/main/java/com/ruoyi/school/paper/service/IDbCollectListService.java
 package com.ruoyi.school.paper.service;
 import com.ruoyi.school.paper.domain.DbCollectList;
+import com.ruoyi.school.paper.domain.request.CollectListRequest;
 import com.ruoyi.school.paper.domain.vo.DbCollectListVo;
 import com.ruoyi.school.paper.domain.bo.DbCollectListBo;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -26,7 +27,7 @@ public interface IDbCollectListService {
    /**
     * 查询收藏列表
     */
-    TableDataInfo<MyCollectListVo> queryPageList(Integer categoryId,Integer species,Long userId, PageQuery pageQuery);
+    TableDataInfo<MyCollectListVo> queryPageList(CollectListRequest request, PageQuery pageQuery);
    /**
     * 查询收藏列表

--- a/school-paper/src/main/java/com/ruoyi/school/paper/service/impl/DbCollectListServiceImpl.java
+++ b/school-paper/src/main/java/com/ruoyi/school/paper/service/impl/DbCollectListServiceImpl.java
@@ -8,6 +8,7 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.school.paper.domain.DbQuestionBankAnswerTestPaper;
+import com.ruoyi.school.paper.domain.request.CollectListRequest;
 import com.ruoyi.school.paper.domain.vo.MyCollectListVo;
 import com.ruoyi.school.paper.mapper.DbQuestionBankAnswerTestPaperMapper;
 import lombok.RequiredArgsConstructor;
@@ -49,16 +50,16 @@ public class DbCollectListServiceImpl implements IDbCollectListService {
     * 查询收藏列表
     */
    @Override
-    public TableDataInfo<MyCollectListVo> queryPageList(Integer categoryId, Integer species, Long userId, PageQuery pageQuery) {
+    public TableDataInfo<MyCollectListVo> queryPageList(CollectListRequest request, PageQuery pageQuery) {
-        Page<MyCollectListVo> result = baseMapper.findMyECollectListVoPage(pageQuery.build(), userId, categoryId, species);
+        Page<MyCollectListVo> result = baseMapper.findMyECollectListVoPage(pageQuery.build(), request);
        List<MyCollectListVo> records = result.getRecords();
        if (CollectionUtils.isNotEmpty(records)) {
            records.forEach(res -> {
-                if (res.getSpecies().equals("2")) {
+                if (res.getSpecies() == 2L) {
                    //选择题查询选项集
                    Optional.ofNullable(dbQuestionBankAnswerTestPaperMapper.selectList(Wrappers.<DbQuestionBankAnswerTestPaper>lambdaQuery()
                            .eq(DbQuestionBankAnswerTestPaper::getQuestionBankId, res.getQuestionBankId())))
-                        .ifPresent(res::setList);
+                        .ifPresent(res::setOptions);
                }
            });
        }

--- a/school-paper/src/main/resources/mapper/school-paper/DbCollectListMapper.xml
+++ b/school-paper/src/main/resources/mapper/school-paper/DbCollectListMapper.xml
@@ -9,7 +9,7 @@
        <result property="userId" column="user_id"/>
        <result property="questionBankId" column="question_bank_id"/>
        <result property="remark" column="remark"/>
-        <result property="status" column="status"/>
+        <result property="delFlag" column="del_flag"/>
        <result property="createTime" column="create_time"/>
        <result property="createBy" column="create_by"/>
        <result property="updateTime" column="update_time"/>
@@ -19,22 +19,23 @@
        SELECT
        dcl.question_bank_id questionBankId,
        dqb.topic AS topic,
-        dqb.right_answers AS rightAnswers,
+        dqb.right_answers AS answer,
-        dqb.right_answers_pic AS rightAnswersPic,
+        dqb.right_answers_pic AS answerPic,
        dqb.species AS species,
        dcl.user_id AS userId
        FROM
        db_collect_list AS dcl
-        LEFT JOIN db_question_bank AS dqb ON dcl.question_bank_id = dqb.id
+        LEFT JOIN db_question_bank_test_paper AS dqb ON dqb.id = dcl.question_bank_id
-        LEFT JOIN db_question_bank_answer AS dqba ON dqba.question_bank_id = dqb.id
+        LEFT JOIN db_question_bank_answer_test_paper AS dqbat ON dqbat.question_bank_id = dqb.question_bank_id
-        <where>
-            dcl.user_id = #{userId}
-            <if test="categoryId != null">
+        <where>
-                and dqb.category_id = #{categoryId}
+            dcl.user_id = #{request.userId}
+            and dcl.del_flag = 0
+            <if test="request.categoryId != null">
+                and dqb.category_id = #{request.categoryId}
            </if>
-            <if test="species != null">
+            <if test="request.species != null">
-                and dqb.species = #{species}
+                and dqb.species = #{request.species}
            </if>
        </where>
    </select>