提交做题

zhongzheng-api/src/main/java/com/zhongzheng/controller/collect/CollectQuestionController.java

@@ -0,0 +1,99 @@
+package com.zhongzheng.controller.collect;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.WxTokenService;
+import com.zhongzheng.modules.collect.bo.CollectQuestionAddBo;
+import com.zhongzheng.modules.collect.bo.CollectQuestionEditBo;
+import com.zhongzheng.modules.collect.bo.CollectQuestionQueryBo;
+import com.zhongzheng.modules.collect.domain.CollectQuestion;
+import com.zhongzheng.modules.collect.service.ICollectQuestionService;
+import com.zhongzheng.modules.collect.vo.CollectQuestionVo;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 收藏题目Controller
+ *
+ * @author ruoyi
+ * @date 2021-06-24
+ */
+@Api(value = "收藏题目控制器", tags = {"收藏题目管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/question")
+public class CollectQuestionController extends BaseController {
+
+    private final ICollectQuestionService iCollectQuestionService;
+
+    private final WxTokenService wxTokenService;
+
+    /**
+     * 查询收藏题目列表
+     */
+    @ApiOperation("查询收藏题目列表")
+    @GetMapping("/list")
+    public TableDataInfo<CollectQuestionVo> list(CollectQuestionQueryBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        startPage();
+        List<CollectQuestionVo> list = iCollectQuestionService.queryList(bo);
+        return getDataTable(list);
+    }
+
+
+
+    /**
+     * 获取收藏题目详细信息
+     */
+    @ApiOperation("获取收藏题目详细信息")
+    @GetMapping("/{collectQuestionId}")
+    public AjaxResult<CollectQuestion> getInfo(@PathVariable("collectQuestionId" ) Long collectQuestionId) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        return AjaxResult.success(iCollectQuestionService.queryQuestionById(loginUser.getUser().getUserId(),collectQuestionId));
+    }
+
+    /**
+     * 新增收藏题目
+     */
+    @ApiOperation("新增收藏题目")
+    @Log(title = "收藏题目", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody CollectQuestionAddBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        return toAjax(iCollectQuestionService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+
+
+    /**
+     * 删除收藏题目
+     */
+    @ApiOperation("删除收藏题目")
+    @Log(title = "收藏题目" , businessType = BusinessType.DELETE)
+    @PostMapping("/delete/{collectQuestionIds}")
+    public AjaxResult<Void> remove(@PathVariable Long[] collectQuestionIds) {
+        return toAjax(iCollectQuestionService.deleteWithValidByIds(Arrays.asList(collectQuestionIds), true) ? 1 : 0);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/bo/CollectQuestionAddBo.java

@@ -0,0 +1,30 @@
+package com.zhongzheng.modules.collect.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 收藏题目添加对象 collect_question
+ *
+ * @author ruoyi
+ * @date 2021-06-24
+ */
+@Data
+@ApiModel("收藏题目添加对象")
+public class CollectQuestionAddBo {
+
+    /** 题目ID */
+    @ApiModelProperty("题目ID")
+    private Long questionId;
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/bo/CollectQuestionEditBo.java

@@ -0,0 +1,32 @@
+package com.zhongzheng.modules.collect.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 收藏题目编辑对象 collect_question
+ *
+ * @author ruoyi
+ * @date 2021-06-24
+ */
+@Data
+@ApiModel("收藏题目编辑对象")
+public class CollectQuestionEditBo {
+
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long collectQuestionId;
+
+    /** 题目ID */
+    @ApiModelProperty("题目ID")
+    private Long questionId;
+
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/bo/CollectQuestionQueryBo.java

@@ -0,0 +1,46 @@
+package com.zhongzheng.modules.collect.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 收藏题目分页查询对象 collect_question
+ *
+ * @author ruoyi
+ * @date 2021-06-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("收藏题目分页查询对象")
+public class CollectQuestionQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 题目ID */
+	@ApiModelProperty("题目ID")
+	private Long questionId;
+	/** 用户ID */
+	@ApiModelProperty("用户ID")
+	private Long userId;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/domain/CollectQuestion.java

@@ -0,0 +1,41 @@
+package com.zhongzheng.modules.collect.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 收藏题目对象 collect_question
+ *
+ * @author ruoyi
+ * @date 2021-06-24
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("collect_question")
+public class CollectQuestion implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+
+    /** $column.columnComment */
+    @TableId(value = "collect_question_id")
+    private Long collectQuestionId;
+
+    /** 题目ID */
+    private Long questionId;
+
+    /** 用户ID */
+    private Long userId;
+
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/mapper/CollectQuestionMapper.java

@@ -0,0 +1,20 @@
+package com.zhongzheng.modules.collect.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.collect.bo.CollectQuestionQueryBo;
+import com.zhongzheng.modules.collect.domain.CollectQuestion;
+import com.zhongzheng.modules.collect.vo.CollectQuestionVo;
+
+import java.util.List;
+
+/**
+ * 收藏题目Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-06-24
+ */
+public interface CollectQuestionMapper extends BaseMapper<CollectQuestion> {
+
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/service/ICollectNoteService.java

@@ -2,11 +2,13 @@ package com.zhongzheng.modules.collect.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.collect.bo.CollectBankQueryBo;
 import com.zhongzheng.modules.collect.bo.CollectNoteAddBo;
 import com.zhongzheng.modules.collect.bo.CollectNoteEditBo;
 import com.zhongzheng.modules.collect.bo.CollectNoteQueryBo;
 import com.zhongzheng.modules.collect.domain.CollectCourse;
 import com.zhongzheng.modules.collect.domain.CollectNote;
+import com.zhongzheng.modules.collect.vo.CollectBankVo;
 import com.zhongzheng.modules.collect.vo.CollectNoteVo;
 
 import java.util.Collection;
@@ -36,6 +38,8 @@ public interface ICollectNoteService extends IService<CollectNote> {
 	 */
 	List<CollectNoteVo> queryList(CollectNoteQueryBo bo);
 
+
+
 	/**
 	 * 根据新增业务对象插入收藏考试重点
 	 * @param bo 收藏考试重点新增业务对象

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/service/ICollectQuestionService.java

@@ -0,0 +1,58 @@
+package com.zhongzheng.modules.collect.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.collect.bo.CollectCourseQueryBo;
+import com.zhongzheng.modules.collect.bo.CollectQuestionAddBo;
+import com.zhongzheng.modules.collect.bo.CollectQuestionEditBo;
+import com.zhongzheng.modules.collect.bo.CollectQuestionQueryBo;
+import com.zhongzheng.modules.collect.domain.CollectQuestion;
+import com.zhongzheng.modules.collect.vo.CollectCourseVo;
+import com.zhongzheng.modules.collect.vo.CollectQuestionVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 收藏题目Service接口
+ *
+ * @author ruoyi
+ * @date 2021-06-24
+ */
+public interface ICollectQuestionService extends IService<CollectQuestion> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	CollectQuestionVo queryById(Long collectQuestionId);
+
+	CollectQuestion queryQuestionById(Long userID, Long collectQuestionId);
+
+	/**
+	 * 查询列表
+	 */
+	List<CollectQuestionVo> queryList(CollectQuestionQueryBo bo);
+
+
+
+	/**
+	 * 根据新增业务对象插入收藏题目
+	 * @param bo 收藏题目新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(CollectQuestionAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改收藏题目
+	 * @param bo 收藏题目编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(CollectQuestionEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/service/impl/CollectQuestionServiceImpl.java

@@ -0,0 +1,111 @@
+package com.zhongzheng.modules.collect.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.collect.bo.CollectQuestionAddBo;
+import com.zhongzheng.modules.collect.bo.CollectQuestionEditBo;
+import com.zhongzheng.modules.collect.bo.CollectQuestionQueryBo;
+import com.zhongzheng.modules.collect.domain.CollectNote;
+import com.zhongzheng.modules.collect.domain.CollectQuestion;
+import com.zhongzheng.modules.collect.mapper.CollectQuestionMapper;
+import com.zhongzheng.modules.collect.service.ICollectQuestionService;
+import com.zhongzheng.modules.collect.vo.CollectQuestionVo;
+import org.springframework.stereotype.Service;
+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.github.pagehelper.Page;
+
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 收藏题目Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-06-24
+ */
+@Service
+public class CollectQuestionServiceImpl extends ServiceImpl<CollectQuestionMapper, CollectQuestion> implements ICollectQuestionService {
+
+    @Override
+    public CollectQuestionVo queryById(Long collectQuestionId){
+        CollectQuestion db = this.baseMapper.selectById(collectQuestionId);
+        return BeanUtil.toBean(db, CollectQuestionVo.class);
+    }
+
+    @Override
+    public CollectQuestion queryQuestionById(Long userID, Long collectQuestionId) {
+        CollectQuestion info = getOne(new LambdaQueryWrapper<CollectQuestion>()
+                .eq(CollectQuestion::getQuestionId,collectQuestionId)
+                .eq(CollectQuestion::getUserId,userID)
+                .last("limit 1"));
+        return info;
+    }
+
+    @Override
+    public List<CollectQuestionVo> queryList(CollectQuestionQueryBo bo) {
+        LambdaQueryWrapper<CollectQuestion> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getQuestionId() != null, CollectQuestion::getQuestionId, bo.getQuestionId());
+        lqw.eq(bo.getUserId() != null, CollectQuestion::getUserId, bo.getUserId());
+        return entity2Vo(this.list(lqw));
+    }
+
+
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<CollectQuestionVo> entity2Vo(Collection<CollectQuestion> collection) {
+        List<CollectQuestionVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, CollectQuestionVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<CollectQuestion> page = (Page<CollectQuestion>)collection;
+            Page<CollectQuestionVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(CollectQuestionAddBo bo) {
+        CollectQuestion add = BeanUtil.toBean(bo, CollectQuestion.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(CollectQuestionEditBo bo) {
+        CollectQuestion update = BeanUtil.toBean(bo, CollectQuestion.class);
+        validEntityBeforeSave(update);
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(CollectQuestion entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/vo/CollectQuestionVo.java

@@ -0,0 +1,36 @@
+package com.zhongzheng.modules.collect.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 收藏题目视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-06-24
+ */
+@Data
+@ApiModel("收藏题目视图对象")
+public class CollectQuestionVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long collectQuestionId;
+
+	/** 题目ID */
+	@Excel(name = "题目ID")
+	@ApiModelProperty("题目ID")
+	private Long questionId;
+	/** 用户ID */
+	@Excel(name = "用户ID")
+	@ApiModelProperty("用户ID")
+	private Long userId;
+
+}

zhongzheng-system/src/main/resources/mapper/modules/collect/CollectBankMapper.xml

@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         collect_bank cb
         LEFT JOIN question_bank qb ON cb.bank_id = qb.bank_id
         WHERE
-        STATUS = 1
+        1 = 1
         <if test="userId != null and userId != ''">
             AND user_id = #{userId}
         </if>

zhongzheng-system/src/main/resources/mapper/modules/collect/CollectCourseMapper.xml

@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         collect_course cc
         LEFT JOIN course c ON cc.course_id = c.course_id
         WHERE
-        STATUS = 1
+        1 = 1
         <if test="userId != null and userId != ''">
             AND user_id = #{userId}
         </if>

zhongzheng-system/src/main/resources/mapper/modules/collect/CollectNoteMapper.xml

@@ -9,7 +9,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fileId" column="file_id"/>
         <result property="userId" column="user_id"/>
         <result property="createTime" column="create_time"/>
+        <result property="name" column="name"/>
+        <result property="coverUrl" column="cover_url"/>
     </resultMap>
 
+    <select id="selectList" parameterType="com.zhongzheng.modules.collect.domain.CollectNote"  resultMap="CollectNoteResult">
+        SELECT
+        cn.*,
+        en.`name`,
+        en.cover_url
+        FROM
+        collect_note cn
+        LEFT JOIN exam_note en ON cn.file_id = en.file_id
+        WHERE
+        1 = 1
+        <if test="userId != null and userId != ''">
+            AND user_id = #{userId}
+        </if>
 
+    </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/collect/CollectQuestionMapper.xml

@@ -0,0 +1,15 @@
+<?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.zhongzheng.modules.collect.mapper.CollectQuestionMapper">
+
+    <resultMap type="com.zhongzheng.modules.collect.domain.CollectQuestion" id="CollectQuestionResult">
+        <result property="collectQuestionId" column="collect_question_id"/>
+        <result property="questionId" column="question_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="createTime" column="create_time"/>
+    </resultMap>
+
+
+</mapper>