fix 批量新增

zhongzheng-admin/src/main/java/com/zhongzheng/controller/system/SysRoleBusinessController.java

@@ -0,0 +1,112 @@
+package com.zhongzheng.controller.system;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.system.bo.SysRoleBusinessAddBo;
+import com.zhongzheng.modules.system.bo.SysRoleBusinessEditBo;
+import com.zhongzheng.modules.system.bo.SysRoleBusinessQueryBo;
+import com.zhongzheng.modules.system.service.ISysRoleBusinessService;
+import com.zhongzheng.modules.system.vo.SysRoleBusinessVo;
+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 2022-01-18
+ */
+@Api(value = "角色和业务层次关联控制器", tags = {"角色和业务层次关联管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/role/business")
+public class SysRoleBusinessController extends BaseController {
+
+    private final ISysRoleBusinessService iSysRoleBusinessService;
+
+    /**
+     * 查询角色和业务层次关联列表
+     */
+    @ApiOperation("查询角色和业务层次关联列表")
+    @PreAuthorize("@ss.hasPermi('system:business:list')")
+    @GetMapping("/list")
+    public TableDataInfo<SysRoleBusinessVo> list(SysRoleBusinessQueryBo bo) {
+        startPage();
+        List<SysRoleBusinessVo> list = iSysRoleBusinessService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出角色和业务层次关联列表
+     */
+  /*  @ApiOperation("导出角色和业务层次关联列表")
+    @PreAuthorize("@ss.hasPermi('system:business:export')")
+    @Log(title = "角色和业务层次关联", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<SysRoleBusinessVo> export(SysRoleBusinessQueryBo bo) {
+        List<SysRoleBusinessVo> list = iSysRoleBusinessService.queryList(bo);
+        ExcelUtil<SysRoleBusinessVo> util = new ExcelUtil<SysRoleBusinessVo>(SysRoleBusinessVo.class);
+        return util.exportExcel(list, "角色和业务层次关联");
+    }*/
+
+    /**
+     * 获取角色和业务层次关联详细信息
+     */
+    @ApiOperation("获取角色和业务层次关联详细信息")
+    @PreAuthorize("@ss.hasPermi('system:business:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<SysRoleBusinessVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iSysRoleBusinessService.queryById(id));
+    }
+
+    /**
+     * 新增角色和业务层次关联
+     */
+    @ApiOperation("新增角色和业务层次关联")
+    @PreAuthorize("@ss.hasPermi('system:business:add')")
+    @Log(title = "角色和业务层次关联", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody SysRoleBusinessAddBo bo) {
+        return toAjax(iSysRoleBusinessService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改角色和业务层次关联
+     */
+    @ApiOperation("修改角色和业务层次关联")
+    @PreAuthorize("@ss.hasPermi('system:business:edit')")
+    @Log(title = "角色和业务层次关联", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody SysRoleBusinessEditBo bo) {
+        return toAjax(iSysRoleBusinessService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除角色和业务层次关联
+     */
+    @ApiOperation("删除角色和业务层次关联")
+    @PreAuthorize("@ss.hasPermi('system:business:remove')")
+    @Log(title = "角色和业务层次关联" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(iSysRoleBusinessService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderGoodsAddBo.java

@@ -71,4 +71,7 @@ public class OrderGoodsAddBo {
     /** 备注 */
     @ApiModelProperty("备注")
     private String remark;
+    /** 0 非复购 1复购 针对业务层次配了【下单前需要  选择班级 */
+    @ApiModelProperty("0 非复购 1复购 针对业务层次配了【下单前需要  选择班级")
+    private Integer rebuy;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderGoodsEditBo.java

@@ -91,4 +91,7 @@ public class OrderGoodsEditBo {
     @ApiModelProperty("班级id")
     private Long gradeId;
 
+    /** 0 非复购 1复购 针对业务层次配了【下单前需要  选择班级 */
+    @ApiModelProperty("0 非复购 1复购 针对业务层次配了【下单前需要  选择班级")
+    private Integer rebuy;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderGoods.java

@@ -73,5 +73,6 @@ private static final long serialVersionUID=1L;
     private String remark;
     /** 班级id */
     private Long gradeId;
-
+    /** 0 非复购 1复购 针对业务层次配了【下单前需要  选择班级 */
+    private Integer rebuy;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderGoodsVo.java

@@ -124,4 +124,8 @@ public class OrderGoodsVo {
 	@Excel(name = "封面地址")
 	@ApiModelProperty("封面地址")
 	private String coverUrl;
+	/** 0 非复购 1复购 针对业务层次配了【下单前需要  选择班级 */
+	@Excel(name = "0 非复购 1复购 针对业务层次配了【下单前需要  选择班级")
+	@ApiModelProperty("0 非复购 1复购 针对业务层次配了【下单前需要  选择班级")
+	private Integer rebuy;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/bo/SysRoleBusinessAddBo.java

@@ -0,0 +1,30 @@
+package com.zhongzheng.modules.system.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 角色和业务层次关联添加对象 sys_role_business
+ *
+ * @author ruoyi
+ * @date 2022-01-18
+ */
+@Data
+@ApiModel("角色和业务层次关联添加对象")
+public class SysRoleBusinessAddBo {
+
+    /** 角色ID */
+    @ApiModelProperty("角色ID")
+    private Long roleId;
+    /** 业务层次ID */
+    @ApiModelProperty("业务层次ID")
+    private Long businessId;
+    /** 业务层次ID */
+    @ApiModelProperty("业务层次ID数组")
+    private List<Long> businessIds;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/bo/SysRoleBusinessEditBo.java

@@ -0,0 +1,36 @@
+package com.zhongzheng.modules.system.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 角色和业务层次关联编辑对象 sys_role_business
+ *
+ * @author ruoyi
+ * @date 2022-01-18
+ */
+@Data
+@ApiModel("角色和业务层次关联编辑对象")
+public class SysRoleBusinessEditBo {
+
+    /** 角色ID */
+    @ApiModelProperty("角色ID")
+    private Long roleId;
+
+    /** 业务层次ID */
+    @ApiModelProperty("业务层次ID")
+    private Long businessId;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 业务层次ID */
+    @ApiModelProperty("业务层次ID数组")
+    private List<Long> businessIds;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/bo/SysRoleBusinessQueryBo.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.system.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;
+
+/**
+ * 角色和业务层次关联分页查询对象 sys_role_business
+ *
+ * @author ruoyi
+ * @date 2022-01-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("角色和业务层次关联分页查询对象")
+public class SysRoleBusinessQueryBo 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 roleId;
+	/** 业务层次ID */
+	@ApiModelProperty("业务层次ID")
+	private Long businessId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysRoleBusiness.java

@@ -0,0 +1,33 @@
+package com.zhongzheng.modules.system.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;
+
+/**
+ * 角色和业务层次关联对象 sys_role_business
+ *
+ * @author ruoyi
+ * @date 2022-01-18
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("sys_role_business")
+public class SysRoleBusiness implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** 角色ID */
+    private Long roleId;
+    /** 业务层次ID */
+    private Long businessId;
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/mapper/SysRoleBusinessMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.system.domain.SysRoleBusiness;
+
+/**
+ * 角色和业务层次关联Mapper接口
+ *
+ * @author ruoyi
+ * @date 2022-01-18
+ */
+public interface SysRoleBusinessMapper extends BaseMapper<SysRoleBusiness> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/ISysRoleBusinessService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.system.bo.SysRoleBusinessAddBo;
+import com.zhongzheng.modules.system.bo.SysRoleBusinessEditBo;
+import com.zhongzheng.modules.system.bo.SysRoleBusinessQueryBo;
+import com.zhongzheng.modules.system.domain.SysRoleBusiness;
+import com.zhongzheng.modules.system.vo.SysRoleBusinessVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 角色和业务层次关联Service接口
+ *
+ * @author ruoyi
+ * @date 2022-01-18
+ */
+public interface ISysRoleBusinessService extends IService<SysRoleBusiness> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	SysRoleBusinessVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<SysRoleBusinessVo> queryList(SysRoleBusinessQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入角色和业务层次关联
+	 * @param bo 角色和业务层次关联新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(SysRoleBusinessAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改角色和业务层次关联
+	 * @param bo 角色和业务层次关联编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(SysRoleBusinessEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -0,0 +1,111 @@
+package com.zhongzheng.modules.system.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.course.bo.CourseHandoutsBusinessAddBo;
+import com.zhongzheng.modules.course.domain.CourseHandoutsBusiness;
+import com.zhongzheng.modules.system.bo.SysRoleBusinessAddBo;
+import com.zhongzheng.modules.system.bo.SysRoleBusinessEditBo;
+import com.zhongzheng.modules.system.bo.SysRoleBusinessQueryBo;
+import com.zhongzheng.modules.system.domain.SysRoleBusiness;
+import com.zhongzheng.modules.system.mapper.SysRoleBusinessMapper;
+import com.zhongzheng.modules.system.service.ISysRoleBusinessService;
+import com.zhongzheng.modules.system.vo.SysRoleBusinessVo;
+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 2022-01-18
+ */
+@Service
+public class SysRoleBusinessServiceImpl extends ServiceImpl<SysRoleBusinessMapper, SysRoleBusiness> implements ISysRoleBusinessService {
+
+    @Override
+    public SysRoleBusinessVo queryById(Long id){
+        SysRoleBusiness db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, SysRoleBusinessVo.class);
+    }
+
+    @Override
+    public List<SysRoleBusinessVo> queryList(SysRoleBusinessQueryBo bo) {
+        LambdaQueryWrapper<SysRoleBusiness> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getRoleId() != null, SysRoleBusiness::getRoleId, bo.getRoleId());
+        lqw.eq(bo.getBusinessId() != null, SysRoleBusiness::getBusinessId, bo.getBusinessId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<SysRoleBusinessVo> entity2Vo(Collection<SysRoleBusiness> collection) {
+        List<SysRoleBusinessVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, SysRoleBusinessVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<SysRoleBusiness> page = (Page<SysRoleBusiness>)collection;
+            Page<SysRoleBusinessVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(SysRoleBusinessAddBo bo) {
+        if(bo.getBusinessIds()!=null&&bo.getBusinessIds().size()>0){
+            boolean result = false;
+            for (Long businessId : bo.getBusinessIds()) {
+                SysRoleBusiness add = new SysRoleBusiness();
+                add.setBusinessId(businessId);
+                add.setRoleId(bo.getRoleId());
+                result = this.save(add);
+            }
+            return result;
+        }else{
+            SysRoleBusiness add = BeanUtil.toBean(bo, SysRoleBusiness.class);
+            validEntityBeforeSave(add);
+            return this.save(add);
+        }
+
+    }
+
+    @Override
+    public Boolean updateByEditBo(SysRoleBusinessEditBo bo) {
+        SysRoleBusiness update = BeanUtil.toBean(bo, SysRoleBusiness.class);
+        validEntityBeforeSave(update);
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(SysRoleBusiness 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/system/vo/SysRoleBusinessVo.java

@@ -0,0 +1,35 @@
+package com.zhongzheng.modules.system.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 2022-01-18
+ */
+@Data
+@ApiModel("角色和业务层次关联视图对象")
+public class SysRoleBusinessVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 角色ID */
+	@Excel(name = "角色ID")
+	@ApiModelProperty("角色ID")
+	private Long roleId;
+	/** 业务层次ID */
+	@Excel(name = "业务层次ID")
+	@ApiModelProperty("业务层次ID")
+	private Long businessId;
+}

zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="company" column="company"/>
         <result property="remark" column="remark"/>
         <result property="gradeId" column="grade_id"/>
+        <result property="rebuy" column="rebuy"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.order.vo.OrderGoodsVo" id="OrderGoodsResultVo">
@@ -47,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime" column="create_time"/>
         <result property="remark" column="remark"/>
         <result property="userId" column="user_id"/>
+        <result property="rebuy" column="rebuy"/>
 
         <result property="code" column="code"/>
         <result property="goodsName" column="goods_name"/>

zhongzheng-system/src/main/resources/mapper/modules/system/SysRoleBusinessMapper.xml

@@ -0,0 +1,14 @@
+<?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.system.mapper.SysRoleBusinessMapper">
+
+    <resultMap type="com.zhongzheng.modules.system.domain.SysRoleBusiness" id="SysRoleBusinessResult">
+        <result property="roleId" column="role_id"/>
+        <result property="businessId" column="business_id"/>
+        <result property="id" column="id"/>
+    </resultMap>
+
+
+</mapper>