fix 收藏课程

zhongzheng-api/src/main/java/com/zhongzheng/controller/bank/QuestionBankSectionController.java

@@ -46,7 +46,6 @@ public class QuestionBankSectionController extends BaseController {
     }
 
 
-
     /**
      * 获取题库小节详细信息
      */
@@ -56,5 +55,5 @@ public class QuestionBankSectionController extends BaseController {
         return AjaxResult.success(iQuestionBankSectionService.queryById(bankSectionId));
     }
 
-  
+
 }

zhongzheng-api/src/main/java/com/zhongzheng/controller/collect/CollectBankController.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.CollectBankAddBo;
+import com.zhongzheng.modules.collect.bo.CollectBankEditBo;
+import com.zhongzheng.modules.collect.bo.CollectBankQueryBo;
+import com.zhongzheng.modules.collect.domain.CollectBank;
+import com.zhongzheng.modules.collect.service.ICollectBankService;
+import com.zhongzheng.modules.collect.vo.CollectBankVo;
+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-23
+ */
+@Api(value = "收藏题库控制器", tags = {"收藏题库管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/bank")
+public class CollectBankController extends BaseController {
+
+    private final ICollectBankService iCollectBankService;
+
+    private final WxTokenService wxTokenService;
+
+    /**
+     * 获取收藏题库详细信息
+     */
+    @ApiOperation("判断是否收藏题库")
+    @GetMapping("/{collectBankId}")
+    public AjaxResult<CollectBank> getInfo(@PathVariable("collectBankId" ) Long collectBankId) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        return AjaxResult.success(iCollectBankService.queryByBankId(loginUser.getUser().getUserId(),collectBankId));
+    }
+
+    /**
+     * 新增收藏题库
+     */
+    @ApiOperation("新增收藏题库")
+    @Log(title = "收藏题库", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody CollectBankAddBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        return toAjax(iCollectBankService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+
+    /**
+     * 删除收藏题库
+     */
+    @ApiOperation("删除收藏题库")
+    @Log(title = "收藏题库" , businessType = BusinessType.DELETE)
+    @PostMapping("/delete/{collectBankIds}")
+    public AjaxResult<Void> remove(@PathVariable Long[] collectBankIds) {
+        return toAjax(iCollectBankService.deleteWithValidByIds(Arrays.asList(collectBankIds), true) ? 1 : 0);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/bo/CollectBankAddBo.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_bank
+ *
+ * @author ruoyi
+ * @date 2021-06-23
+ */
+@Data
+@ApiModel("收藏题库添加对象")
+public class CollectBankAddBo {
+
+    /** 题库ID */
+    @ApiModelProperty("题库ID")
+    private Long bankId;
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/bo/CollectBankEditBo.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_bank
+ *
+ * @author ruoyi
+ * @date 2021-06-23
+ */
+@Data
+@ApiModel("收藏题库编辑对象")
+public class CollectBankEditBo {
+
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long collectBankId;
+
+    /** 题库ID */
+    @ApiModelProperty("题库ID")
+    private Long bankId;
+
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/bo/CollectBankQueryBo.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_bank
+ *
+ * @author ruoyi
+ * @date 2021-06-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("收藏题库分页查询对象")
+public class CollectBankQueryBo 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 bankId;
+	/** 用户ID */
+	@ApiModelProperty("用户ID")
+	private Long userId;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/domain/CollectBank.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_bank
+ *
+ * @author ruoyi
+ * @date 2021-06-23
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("collect_bank")
+public class CollectBank implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+
+    /** $column.columnComment */
+    @TableId(value = "collect_bank_id")
+    private Long collectBankId;
+
+    /** 题库ID */
+    private Long bankId;
+
+    /** 用户ID */
+    private Long userId;
+
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.collect.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.collect.domain.CollectBank;
+
+/**
+ * 收藏题库Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-06-23
+ */
+public interface CollectBankMapper extends BaseMapper<CollectBank> {
+
+}

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

@@ -0,0 +1,55 @@
+package com.zhongzheng.modules.collect.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.collect.bo.CollectBankAddBo;
+import com.zhongzheng.modules.collect.bo.CollectBankEditBo;
+import com.zhongzheng.modules.collect.bo.CollectBankQueryBo;
+import com.zhongzheng.modules.collect.domain.CollectBank;
+import com.zhongzheng.modules.collect.domain.CollectCourse;
+import com.zhongzheng.modules.collect.vo.CollectBankVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 收藏题库Service接口
+ *
+ * @author ruoyi
+ * @date 2021-06-23
+ */
+public interface ICollectBankService extends IService<CollectBank> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	CollectBankVo queryById(Long bankId);
+
+	CollectBank queryByBankId(Long userID, Long bankId);
+
+	/**
+	 * 查询列表
+	 */
+	List<CollectBankVo> queryList(CollectBankQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入收藏题库
+	 * @param bo 收藏题库新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(CollectBankAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改收藏题库
+	 * @param bo 收藏题库编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(CollectBankEditBo 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/CollectBankServiceImpl.java

@@ -0,0 +1,118 @@
+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.CollectBankAddBo;
+import com.zhongzheng.modules.collect.bo.CollectBankEditBo;
+import com.zhongzheng.modules.collect.bo.CollectBankQueryBo;
+import com.zhongzheng.modules.collect.domain.CollectBank;
+import com.zhongzheng.modules.collect.domain.CollectCourse;
+import com.zhongzheng.modules.collect.mapper.CollectBankMapper;
+import com.zhongzheng.modules.collect.service.ICollectBankService;
+import com.zhongzheng.modules.collect.vo.CollectBankVo;
+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-23
+ */
+@Service
+public class CollectBankServiceImpl extends ServiceImpl<CollectBankMapper, CollectBank> implements ICollectBankService {
+
+    @Override
+    public CollectBankVo queryById(Long collectBankId){
+        CollectBank db = this.baseMapper.selectById(collectBankId);
+        return BeanUtil.toBean(db, CollectBankVo.class);
+    }
+
+    @Override
+    public CollectBank queryByBankId(Long userID, Long bankId) {
+        CollectBank info = getOne(new LambdaQueryWrapper<CollectBank>()
+                .eq(CollectBank::getBankId,bankId)
+                .eq(CollectBank::getUserId,userID)
+                .last("limit 1"));
+        return info;
+    }
+
+    @Override
+    public List<CollectBankVo> queryList(CollectBankQueryBo bo) {
+        LambdaQueryWrapper<CollectBank> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getBankId() != null, CollectBank::getBankId, bo.getBankId());
+        lqw.eq(bo.getUserId() != null, CollectBank::getUserId, bo.getUserId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<CollectBankVo> entity2Vo(Collection<CollectBank> collection) {
+        List<CollectBankVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, CollectBankVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<CollectBank> page = (Page<CollectBank>)collection;
+            Page<CollectBankVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(CollectBankAddBo bo) {
+        CollectBank add = BeanUtil.toBean(bo, CollectBank.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(CollectBankEditBo bo) {
+        CollectBank update = BeanUtil.toBean(bo, CollectBank.class);
+        validEntityBeforeSave(update);
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(CollectBank entity){
+        //TODO 做一些数据校验,如唯一约束
+        CollectBank info = getOne(new LambdaQueryWrapper<CollectBank>()
+                .eq(CollectBank::getBankId,entity.getBankId())
+                .eq(CollectBank::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/CollectBankVo.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-23
+ */
+@Data
+@ApiModel("收藏题库视图对象")
+public class CollectBankVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long collectBankId;
+
+	/** 题库ID */
+	@Excel(name = "题库ID")
+	@ApiModelProperty("题库ID")
+	private Long bankId;
+	/** 用户ID */
+	@Excel(name = "用户ID")
+	@ApiModelProperty("用户ID")
+	private Long userId;
+
+}

zhongzheng-system/src/main/resources/mapper/modules/collect/CollectBankMapper.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.CollectBankMapper">
+
+    <resultMap type="com.zhongzheng.modules.collect.domain.CollectBank" id="CollectBankResult">
+        <result property="collectBankId" column="collect_bank_id"/>
+        <result property="bankId" column="bank_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="createTime" column="create_time"/>
+    </resultMap>
+
+
+</mapper>