fix 收藏课程

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

@@ -51,7 +51,7 @@ public class CollectCourseController extends BaseController {
     /**
      * 获取收藏课程详细信息
      */
-    @ApiOperation("获取是否收藏课程")
+    @ApiOperation("判断是否收藏课程")
     @GetMapping("/{courseId}")
     public AjaxResult<CollectCourse> getInfo(@PathVariable("courseId" ) Long courseId) {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());

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

@@ -0,0 +1,83 @@
+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.CollectNoteAddBo;
+import com.zhongzheng.modules.collect.bo.CollectNoteQueryBo;
+import com.zhongzheng.modules.collect.domain.CollectNote;
+import com.zhongzheng.modules.collect.service.ICollectNoteService;
+import com.zhongzheng.modules.collect.vo.CollectNoteVo;
+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 hjl
+ * @date 2021-06-22
+ */
+@Api(value = "收藏考试重点控制器", tags = {"收藏考试重点管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/note")
+public class CollectNoteController extends BaseController {
+
+    private final ICollectNoteService iCollectNoteService;
+
+    private final WxTokenService wxTokenService;
+
+
+    /**
+     * 获取收藏考试重点详细信息
+     */
+    @ApiOperation("判断是否收藏重点")
+    @GetMapping("/{noteId}")
+    public AjaxResult<CollectNote> getInfo(@PathVariable("noteId" ) Long noteId) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        return AjaxResult.success(iCollectNoteService.queryByNoteId(loginUser.getUser().getUserId(),noteId));
+    }
+
+    /**
+     * 新增收藏考试重点
+     */
+    @ApiOperation("新增收藏考试重点")
+    @Log(title = "收藏考试重点", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody CollectNoteAddBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        return toAjax(iCollectNoteService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+
+    /**
+     * 删除收藏考试重点
+     */
+    @ApiOperation("删除收藏考试重点")
+    @Log(title = "收藏考试重点" , businessType = BusinessType.DELETE)
+    @PostMapping("/delete/{collectNoteIds}")
+    public AjaxResult<Void> remove(@PathVariable Long[] collectNoteIds) {
+        return toAjax(iCollectNoteService.deleteWithValidByIds(Arrays.asList(collectNoteIds), true) ? 1 : 0);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/bo/CollectNoteAddBo.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_note
+ *
+ * @author ruoyi
+ * @date 2021-06-22
+ */
+@Data
+@ApiModel("收藏考试重点添加对象")
+public class CollectNoteAddBo {
+
+    /** 重点ID */
+    @ApiModelProperty("重点ID")
+    private Long fileId;
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/bo/CollectNoteEditBo.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_note
+ *
+ * @author ruoyi
+ * @date 2021-06-22
+ */
+@Data
+@ApiModel("收藏考试重点编辑对象")
+public class CollectNoteEditBo {
+
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long collectNoteId;
+
+    /** 重点ID */
+    @ApiModelProperty("重点ID")
+    private Long fileId;
+
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/bo/CollectNoteQueryBo.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_note
+ *
+ * @author ruoyi
+ * @date 2021-06-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("收藏考试重点分页查询对象")
+public class CollectNoteQueryBo 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 fileId;
+	/** 用户ID */
+	@ApiModelProperty("用户ID")
+	private Long userId;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/domain/CollectNote.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_note
+ *
+ * @author ruoyi
+ * @date 2021-06-22
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("collect_note")
+public class CollectNote implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+
+    /** $column.columnComment */
+    @TableId(value = "collect_note_id")
+    private Long collectNoteId;
+
+    /** 重点ID */
+    private Long fileId;
+
+    /** 用户ID */
+    private Long userId;
+
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+
+}

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

@@ -0,0 +1,15 @@
+package com.zhongzheng.modules.collect.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.collect.domain.CollectNote;
+
+/**
+ * 收藏考试重点Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-06-22
+ */
+public interface CollectNoteMapper extends BaseMapper<CollectNote> {
+
+}

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

@@ -0,0 +1,58 @@
+package com.zhongzheng.modules.collect.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+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.CollectNoteVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 收藏考试重点Service接口
+ *
+ * @author ruoyi
+ * @date 2021-06-22
+ */
+public interface ICollectNoteService extends IService<CollectNote> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	CollectNoteVo queryById(Long collectNoteId);
+
+	CollectNote queryByNoteId(Long userID, Long courseId);
+
+	/**
+	 * 查询列表
+	 */
+	List<CollectNoteVo> queryList(CollectNoteQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入收藏考试重点
+	 * @param bo 收藏考试重点新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(CollectNoteAddBo bo);
+
+
+
+	/**
+	 * 根据编辑业务对象修改收藏考试重点
+	 * @param bo 收藏考试重点编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(CollectNoteEditBo 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/CollectNoteServiceImpl.java

@@ -0,0 +1,117 @@
+package com.zhongzheng.modules.collect.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.utils.DateUtils;
+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.mapper.CollectNoteMapper;
+import com.zhongzheng.modules.collect.service.ICollectNoteService;
+import com.zhongzheng.modules.collect.vo.CollectNoteVo;
+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-22
+ */
+@Service
+public class CollectNoteServiceImpl extends ServiceImpl<CollectNoteMapper, CollectNote> implements ICollectNoteService {
+
+    @Override
+    public CollectNoteVo queryById(Long collectNoteId){
+        CollectNote db = this.baseMapper.selectById(collectNoteId);
+        return BeanUtil.toBean(db, CollectNoteVo.class);
+    }
+
+    @Override
+    public CollectNote queryByNoteId(Long userID, Long courseId) {
+        CollectNote info = getOne(new LambdaQueryWrapper<CollectNote>()
+                .eq(CollectNote::getFileId,courseId)
+                .eq(CollectNote::getUserId,userID)
+                .last("limit 1"));
+        return info;
+    }
+
+    @Override
+    public List<CollectNoteVo> queryList(CollectNoteQueryBo bo) {
+        LambdaQueryWrapper<CollectNote> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getFileId() != null, CollectNote::getFileId, bo.getFileId());
+        lqw.eq(bo.getUserId() != null, CollectNote::getUserId, bo.getUserId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<CollectNoteVo> entity2Vo(Collection<CollectNote> collection) {
+        List<CollectNoteVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, CollectNoteVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<CollectNote> page = (Page<CollectNote>)collection;
+            Page<CollectNoteVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(CollectNoteAddBo bo) {
+        CollectNote add = BeanUtil.toBean(bo, CollectNote.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(CollectNoteEditBo bo) {
+        CollectNote update = BeanUtil.toBean(bo, CollectNote.class);
+        validEntityBeforeSave(update);
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(CollectNote entity){
+        //TODO 做一些数据校验,如唯一约束
+        CollectNote info = getOne(new LambdaQueryWrapper<CollectNote>()
+                .eq(CollectNote::getFileId,entity.getFileId())
+                .eq(CollectNote::getUserId,entity.getUserId())
+                .last("limit 1"));
+        if (Validator.isNotNull(info)) {
+            throw new CustomException("你已收藏了");
+        }
+    }
+
+    @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/CollectNoteVo.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-22
+ */
+@Data
+@ApiModel("收藏考试重点视图对象")
+public class CollectNoteVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long collectNoteId;
+
+	/** 重点ID */
+	@Excel(name = "重点ID")
+	@ApiModelProperty("重点ID")
+	private Long fileId;
+	/** 用户ID */
+	@Excel(name = "用户ID")
+	@ApiModelProperty("用户ID")
+	private Long userId;
+
+}

zhongzheng-system/src/main/resources/mapper/modules/collect/CollectNoteMapper.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.CollectNoteMapper">
+
+    <resultMap type="com.zhongzheng.modules.collect.domain.CollectNote" id="CollectNoteResult">
+        <result property="collectNoteId" column="collect_note_id"/>
+        <result property="fileId" column="file_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="createTime" column="create_time"/>
+    </resultMap>
+
+
+</mapper>