fix 后台注册用户

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserPlanGoodsAddBo.java

@@ -0,0 +1,33 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 学习计划绑定课程添加对象 user_plan_goods
+ *
+ * @author ruoyi
+ * @date 2021-12-15
+ */
+@Data
+@ApiModel("学习计划绑定课程添加对象")
+public class UserPlanGoodsAddBo {
+
+    /** 计划id */
+    @ApiModelProperty("计划id")
+    private Long planId;
+    /** 视频商品ID */
+    @ApiModelProperty("视频商品ID")
+    private Long sourceId;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long createTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserPlanGoodsEditBo.java

@@ -0,0 +1,37 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 学习计划绑定课程编辑对象 user_plan_goods
+ *
+ * @author ruoyi
+ * @date 2021-12-15
+ */
+@Data
+@ApiModel("学习计划绑定课程编辑对象")
+public class UserPlanGoodsEditBo {
+
+    /** 计划id */
+    @ApiModelProperty("计划id")
+    private Long planId;
+
+    /** 视频商品ID */
+    @ApiModelProperty("视频商品ID")
+    private Long sourceId;
+
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserPlanGoodsQueryBo.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.user.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;
+
+/**
+ * 学习计划绑定课程分页查询对象 user_plan_goods
+ *
+ * @author ruoyi
+ * @date 2021-12-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("学习计划绑定课程分页查询对象")
+public class UserPlanGoodsQueryBo 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 planId;
+	/** 视频商品ID */
+	@ApiModelProperty("视频商品ID")
+	private Long sourceId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserPlanGoods.java

@@ -0,0 +1,39 @@
+package com.zhongzheng.modules.user.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;
+
+/**
+ * 学习计划绑定课程对象 user_plan_goods
+ *
+ * @author ruoyi
+ * @date 2021-12-15
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("user_plan_goods")
+public class UserPlanGoods implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** 计划id */
+    private Long planId;
+    /** 视频商品ID */
+    private Long sourceId;
+    /** $column.columnComment */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** $column.columnComment */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserPlanGoodsMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.user.mapper;
+
+import com.zhongzheng.modules.user.domain.UserPlanGoods;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 学习计划绑定课程Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-12-15
+ */
+public interface UserPlanGoodsMapper extends BaseMapper<UserPlanGoods> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserPlanGoodsService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.user.service;
+
+import com.zhongzheng.modules.user.domain.UserPlanGoods;
+import com.zhongzheng.modules.user.vo.UserPlanGoodsVo;
+import com.zhongzheng.modules.user.bo.UserPlanGoodsQueryBo;
+import com.zhongzheng.modules.user.bo.UserPlanGoodsAddBo;
+import com.zhongzheng.modules.user.bo.UserPlanGoodsEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 学习计划绑定课程Service接口
+ *
+ * @author ruoyi
+ * @date 2021-12-15
+ */
+public interface IUserPlanGoodsService extends IService<UserPlanGoods> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	UserPlanGoodsVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<UserPlanGoodsVo> queryList(UserPlanGoodsQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入学习计划绑定课程
+	 * @param bo 学习计划绑定课程新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(UserPlanGoodsAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改学习计划绑定课程
+	 * @param bo 学习计划绑定课程编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(UserPlanGoodsEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserPlanGoodsServiceImpl.java

@@ -0,0 +1,100 @@
+package com.zhongzheng.modules.user.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+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 com.zhongzheng.modules.user.bo.UserPlanGoodsAddBo;
+import com.zhongzheng.modules.user.bo.UserPlanGoodsQueryBo;
+import com.zhongzheng.modules.user.bo.UserPlanGoodsEditBo;
+import com.zhongzheng.modules.user.domain.UserPlanGoods;
+import com.zhongzheng.modules.user.mapper.UserPlanGoodsMapper;
+import com.zhongzheng.modules.user.vo.UserPlanGoodsVo;
+import com.zhongzheng.modules.user.service.IUserPlanGoodsService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 学习计划绑定课程Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-12-15
+ */
+@Service
+public class UserPlanGoodsServiceImpl extends ServiceImpl<UserPlanGoodsMapper, UserPlanGoods> implements IUserPlanGoodsService {
+
+    @Override
+    public UserPlanGoodsVo queryById(Long id){
+        UserPlanGoods db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, UserPlanGoodsVo.class);
+    }
+
+    @Override
+    public List<UserPlanGoodsVo> queryList(UserPlanGoodsQueryBo bo) {
+        LambdaQueryWrapper<UserPlanGoods> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getPlanId() != null, UserPlanGoods::getPlanId, bo.getPlanId());
+        lqw.eq(bo.getSourceId() != null, UserPlanGoods::getSourceId, bo.getSourceId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<UserPlanGoodsVo> entity2Vo(Collection<UserPlanGoods> collection) {
+        List<UserPlanGoodsVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, UserPlanGoodsVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<UserPlanGoods> page = (Page<UserPlanGoods>)collection;
+            Page<UserPlanGoodsVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(UserPlanGoodsAddBo bo) {
+        UserPlanGoods add = BeanUtil.toBean(bo, UserPlanGoods.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(UserPlanGoodsEditBo bo) {
+        UserPlanGoods update = BeanUtil.toBean(bo, UserPlanGoods.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(UserPlanGoods 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/user/service/impl/UserPlanServiceImpl.java

@@ -10,9 +10,14 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.course.vo.CourseVo;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
+import com.zhongzheng.modules.user.bo.UserPlanGoodsAddBo;
+import com.zhongzheng.modules.user.domain.UserPlanGoods;
+import com.zhongzheng.modules.user.service.IUserPlanCourceService;
+import com.zhongzheng.modules.user.service.IUserPlanGoodsService;
 import com.zhongzheng.modules.user.vo.CalendarStudyVo;
 import com.zhongzheng.modules.user.vo.DaySectionVo;
 import com.zhongzheng.modules.user.vo.DayStudyVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -41,6 +46,9 @@ import java.util.stream.Collectors;
 @Service
 public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> implements IUserPlanService {
 
+    @Autowired
+    private IUserPlanGoodsService userPlanGoodsService;
+
     @Override
     public UserPlanVo queryById(Long planId){
         UserPlan userPlan = this.baseMapper.selectById(planId);
@@ -191,6 +199,14 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
         userPlan.setEndTime(bo.getEndTime());
         userPlan.setReminderTime(bo.getReminderTime());
         this.save(userPlan);
+        for (Long goodsId : bo.getGoodsId()) {
+            UserPlanGoodsAddBo userPlanGoodsAddBo = new UserPlanGoodsAddBo();
+            userPlanGoodsAddBo.setPlanId(userPlan.getPlanId());
+            userPlanGoodsAddBo.setSourceId(goodsId);
+            userPlanGoodsAddBo.setCreateTime(DateUtils.getNowTime());
+            userPlanGoodsAddBo.setUpdateTime(DateUtils.getNowTime());
+            userPlanGoodsService.insertByAddBo(userPlanGoodsAddBo);
+        }
         return true;
     }
 
@@ -255,6 +271,17 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
         userPlan.setReminderTime(bo.getReminderTime());
         userPlan.setPlanId(bo.getPlanId());
         this.updateById(userPlan);
+        LambdaQueryWrapper<UserPlanGoods> lqw = Wrappers.lambdaQuery();
+        lqw.eq(UserPlanGoods::getPlanId, userPlan.getPlanId());
+        userPlanGoodsService.remove(lqw);
+        for (Long goodsId : bo.getGoodsId()) {
+            UserPlanGoodsAddBo userPlanGoodsAddBo = new UserPlanGoodsAddBo();
+            userPlanGoodsAddBo.setPlanId(userPlan.getPlanId());
+            userPlanGoodsAddBo.setSourceId(goodsId);
+            userPlanGoodsAddBo.setCreateTime(DateUtils.getNowTime());
+            userPlanGoodsAddBo.setUpdateTime(DateUtils.getNowTime());
+            userPlanGoodsService.insertByAddBo(userPlanGoodsAddBo);
+        }
         return true;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserPlanGoodsVo.java

@@ -0,0 +1,35 @@
+package com.zhongzheng.modules.user.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-12-15
+ */
+@Data
+@ApiModel("学习计划绑定课程视图对象")
+public class UserPlanGoodsVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 计划id */
+	@Excel(name = "计划id")
+	@ApiModelProperty("计划id")
+	private Long planId;
+	/** 视频商品ID */
+	@Excel(name = "视频商品ID")
+	@ApiModelProperty("视频商品ID")
+	private Long sourceId;
+}

zhongzheng-system/src/main/resources/mapper/modules/user/UserPlanGoodsMapper.xml

@@ -0,0 +1,16 @@
+<?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.user.mapper.UserPlanGoodsMapper">
+
+    <resultMap type="com.zhongzheng.modules.user.domain.UserPlanGoods" id="UserPlanGoodsResult">
+        <result property="planId" column="plan_id"/>
+        <result property="sourceId" column="source_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="id" column="id"/>
+    </resultMap>
+
+
+</mapper>