新增公司
This commit is contained in:
parent
c8f8231ec8
commit
0a1498e973
|
|
@ -0,0 +1,28 @@
|
|||
package com.bonus.system.api.domain;
|
||||
|
||||
import com.bonus.common.core.annotation.Excel;
|
||||
import com.bonus.common.core.web.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 权限模板对象 sys_template
|
||||
*
|
||||
* @author bonus
|
||||
* @date 2020-07-09
|
||||
*/
|
||||
@Data
|
||||
public class SysTemplate extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** $column.columnComment */
|
||||
private String id;
|
||||
|
||||
/** 模板名称 */
|
||||
@Excel(name = "模板名称")
|
||||
private String name;
|
||||
|
||||
private List<Integer> menuIds;
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
package com.bonus.system.api.domain;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 系统模板菜单表(SysTempMenu)实体类
|
||||
*
|
||||
* @author bonus
|
||||
* @since 2020-07-09 13:38:36
|
||||
*/
|
||||
public class SysTemplateMenu implements Serializable {
|
||||
private static final long serialVersionUID = 904598953972609708L;
|
||||
/**
|
||||
* 模板ID
|
||||
*/
|
||||
private Long tempId;
|
||||
/**
|
||||
* 菜单ID
|
||||
*/
|
||||
private Long menuId;
|
||||
|
||||
|
||||
public Long getTempId() {
|
||||
return tempId;
|
||||
}
|
||||
|
||||
public void setTempId(Long tempId) {
|
||||
this.tempId = tempId;
|
||||
}
|
||||
|
||||
public Long getMenuId() {
|
||||
return menuId;
|
||||
}
|
||||
|
||||
public void setMenuId(Long menuId) {
|
||||
this.menuId = menuId;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,61 @@
|
|||
package com.bonus.system.mapper;
|
||||
|
||||
import com.bonus.system.api.domain.SysTemplate;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 权限模板Mapper接口
|
||||
*
|
||||
* @author bonus
|
||||
* @date 2025-01-05
|
||||
*/
|
||||
public interface SysTemplateMapper
|
||||
{
|
||||
/**
|
||||
* 查询权限模板
|
||||
*
|
||||
* @param id 权限模板ID
|
||||
* @return 权限模板
|
||||
*/
|
||||
public SysTemplate selectSysTemplateById(String id);
|
||||
|
||||
/**
|
||||
* 查询权限模板列表
|
||||
*
|
||||
* @param sysTemplate 权限模板
|
||||
* @return 权限模板集合
|
||||
*/
|
||||
public List<SysTemplate> selectSysTemplateList(SysTemplate sysTemplate);
|
||||
|
||||
/**
|
||||
* 新增权限模板
|
||||
*
|
||||
* @param sysTemplate 权限模板
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertSysTemplate(SysTemplate sysTemplate);
|
||||
|
||||
/**
|
||||
* 修改权限模板
|
||||
*
|
||||
* @param sysTemplate 权限模板
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateSysTemplate(SysTemplate sysTemplate);
|
||||
|
||||
/**
|
||||
* 删除权限模板
|
||||
*
|
||||
* @param id 权限模板ID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteSysTemplateById(String id);
|
||||
|
||||
/**
|
||||
* 批量删除权限模板
|
||||
*
|
||||
* @param ids 需要删除的数据ID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteSysTemplateByIds(String[] ids);
|
||||
}
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
package com.bonus.system.mapper;
|
||||
|
||||
|
||||
import com.bonus.system.api.domain.SysTemplateMenu;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 系统模板菜单表(SysTempMenu)表数据库访问层
|
||||
*
|
||||
* @author bonus
|
||||
* @since 2025-01-05
|
||||
*/
|
||||
public interface SysTemplateMenuMapper {
|
||||
|
||||
|
||||
/**
|
||||
* 查询指定行数据
|
||||
*
|
||||
* @param offset 查询起始位置
|
||||
* @param limit 查询条数
|
||||
* @return 对象列表
|
||||
*/
|
||||
List<SysTemplateMenu> queryAllByLimit(@Param("offset") int offset, @Param("limit") int limit);
|
||||
|
||||
|
||||
/**
|
||||
* 通过实体作为筛选条件查询
|
||||
*
|
||||
* @param sysTempMenu 实例对象
|
||||
* @return 对象列表
|
||||
*/
|
||||
List<SysTemplateMenu> queryAll(SysTemplateMenu sysTempMenu);
|
||||
|
||||
/**
|
||||
* 新增数据
|
||||
*
|
||||
* @param sysTempMenu 实例对象
|
||||
* @return 影响行数
|
||||
*/
|
||||
int insert(SysTemplateMenu sysTempMenu);
|
||||
|
||||
/**
|
||||
* 修改数据
|
||||
*
|
||||
* @param sysTempMenu 实例对象
|
||||
* @return 影响行数
|
||||
*/
|
||||
int update(SysTemplateMenu sysTempMenu);
|
||||
|
||||
/**
|
||||
* 根据模板删除菜单信息
|
||||
*
|
||||
* @param tempId
|
||||
* @return
|
||||
*/
|
||||
int deleteByTempId(@Param("tempId") String tempId);
|
||||
}
|
||||
|
|
@ -4,7 +4,7 @@ import java.util.*;
|
|||
import java.util.stream.Collectors;
|
||||
import com.bonus.common.core.web.domain.BaseEntity;
|
||||
import com.bonus.config.SystemConfig;
|
||||
import com.bonus.system.api.domain.SysUserRole;
|
||||
import com.bonus.system.api.domain.*;
|
||||
import com.bonus.system.domain.SysRoleDept;
|
||||
import com.bonus.system.domain.SysRoleMenu;
|
||||
import com.bonus.system.mapper.*;
|
||||
|
|
@ -22,9 +22,6 @@ import com.bonus.common.core.utils.SpringUtils;
|
|||
import com.bonus.common.core.utils.StringUtils;
|
||||
import com.bonus.common.datascope.annotation.DataScope;
|
||||
import com.bonus.common.security.utils.SecurityUtils;
|
||||
import com.bonus.system.api.domain.SysDept;
|
||||
import com.bonus.system.api.domain.SysRole;
|
||||
import com.bonus.system.api.domain.SysUser;
|
||||
import com.bonus.system.domain.vo.TreeSelect;
|
||||
import com.bonus.system.service.ISysDeptService;
|
||||
|
||||
|
|
@ -54,6 +51,9 @@ public class SysDeptServiceImpl implements ISysDeptService
|
|||
@Resource
|
||||
private SysRoleMenuMapper roleMenuMapper;
|
||||
|
||||
@Resource
|
||||
SysTemplateMenuMapper sysTemplateMenuMapper;
|
||||
|
||||
@Resource
|
||||
private SysRoleDeptMapper roleDeptMapper;
|
||||
|
||||
|
|
@ -290,6 +290,8 @@ public class SysDeptServiceImpl implements ISysDeptService
|
|||
if (dept.getParentId() == null){
|
||||
dept.setParentId(0L);
|
||||
dept.setAncestors("0");
|
||||
dept.setStatus("0");//默认启用
|
||||
dept.setTemplateId(1L);//TODO 将来用前端传的模版ID
|
||||
if (StringUtils.isNotNull(dept.getSysUser()) && !userService.checkUserNameUnique(dept.getSysUser())) {
|
||||
throw new ServiceException("新增公司管理员用户'" + dept.getSysUser().getUserName() + "'失败,登录账号已存在");
|
||||
}
|
||||
|
|
@ -475,46 +477,17 @@ public class SysDeptServiceImpl implements ISysDeptService
|
|||
|
||||
//对初始化管理员赋值菜单权限
|
||||
List<SysRoleMenu> sysRoleMenulist = new ArrayList<>();
|
||||
SysRoleMenu rm = new SysRoleMenu();
|
||||
rm.setRoleId(Long.valueOf(role.getRoleId()));
|
||||
rm.setMenuId(1L);
|
||||
sysRoleMenulist.add(rm);
|
||||
SysRoleMenu rm1 = new SysRoleMenu();
|
||||
rm1.setRoleId(Long.valueOf(role.getRoleId()));
|
||||
rm1.setMenuId(100L);
|
||||
sysRoleMenulist.add(rm1);
|
||||
SysRoleMenu rm2 = new SysRoleMenu();
|
||||
rm2.setRoleId(Long.valueOf(role.getRoleId()));
|
||||
rm2.setMenuId(101L);
|
||||
sysRoleMenulist.add(rm2);
|
||||
SysRoleMenu rm3 = new SysRoleMenu();
|
||||
rm3.setRoleId(Long.valueOf(role.getRoleId()));
|
||||
rm3.setMenuId(103L);
|
||||
sysRoleMenulist.add(rm3);
|
||||
/* SysRoleMenu rm4 = new SysRoleMenu();
|
||||
rm4.setRoleId(Long.valueOf(role.getRoleId()));
|
||||
rm4.setMenuId(104L);
|
||||
list.add(rm4);*/
|
||||
SysRoleMenu rm4 = new SysRoleMenu();
|
||||
rm4.setRoleId(Long.valueOf(role.getRoleId()));
|
||||
rm4.setMenuId(1007L);
|
||||
sysRoleMenulist.add(rm4);
|
||||
SysRoleMenu rm5 = new SysRoleMenu();
|
||||
rm5.setRoleId(Long.valueOf(role.getRoleId()));
|
||||
rm5.setMenuId(1008L);
|
||||
sysRoleMenulist.add(rm5);
|
||||
SysRoleMenu rm6 = new SysRoleMenu();
|
||||
rm6.setRoleId(Long.valueOf(role.getRoleId()));
|
||||
rm6.setMenuId(1009L);
|
||||
sysRoleMenulist.add(rm6);
|
||||
SysRoleMenu rm7 = new SysRoleMenu();
|
||||
rm7.setRoleId(Long.valueOf(role.getRoleId()));
|
||||
rm7.setMenuId(1010L);
|
||||
sysRoleMenulist.add(rm7);
|
||||
SysRoleMenu rm8 = new SysRoleMenu();
|
||||
rm8.setRoleId(Long.valueOf(role.getRoleId()));
|
||||
rm8.setMenuId(1011L);
|
||||
sysRoleMenulist.add(rm8);
|
||||
//TODO 用模板里的菜单ID赋值给公司管理员
|
||||
SysTemplateMenu sysTemplateMenu = new SysTemplateMenu();
|
||||
sysTemplateMenu.setTempId(sysDept.getTemplateId());
|
||||
List<SysTemplateMenu> sysTemplateMenus = sysTemplateMenuMapper.queryAll(sysTemplateMenu);
|
||||
SysRoleMenu sysRoleMenu = null;
|
||||
for (SysTemplateMenu stm : sysTemplateMenus) {
|
||||
sysRoleMenu = new SysRoleMenu();
|
||||
sysRoleMenu.setRoleId(role.getRoleId());
|
||||
sysRoleMenu.setMenuId(stm.getMenuId());
|
||||
sysRoleMenulist.add(sysRoleMenu);
|
||||
}
|
||||
roleMenuMapper.batchRoleMenu(sysRoleMenulist);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,63 @@
|
|||
<?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.bonus.system.mapper.SysTemplateMapper">
|
||||
|
||||
<resultMap type="com.bonus.system.api.domain.SysTemplate" id="SysTemplateResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="name" column="name" />
|
||||
<result property="remark" column="remark" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectSysTemplateVo">
|
||||
select id, name, remark from sys_template
|
||||
</sql>
|
||||
|
||||
<select id="selectSysTemplateList" parameterType="com.bonus.system.api.domain.SysTemplate" resultMap="SysTemplateResult">
|
||||
<include refid="selectSysTemplateVo"/>
|
||||
<where>
|
||||
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectSysTemplateById" parameterType="java.lang.String" resultMap="SysTemplateResult">
|
||||
<include refid="selectSysTemplateVo"/>
|
||||
where id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertSysTemplate" parameterType="com.bonus.system.api.domain.SysTemplate">
|
||||
insert into sys_template
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">id,</if>
|
||||
<if test="name != null and name != ''">name,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">#{id},</if>
|
||||
<if test="name != null and name != ''">#{name},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateSysTemplate" parameterType="com.bonus.system.api.domain.SysTemplate">
|
||||
update sys_template
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="name != null and name != ''">name = #{name},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteSysTemplateById" parameterType="java.lang.String">
|
||||
delete from sys_template where id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteSysTemplateByIds" parameterType="java.lang.String">
|
||||
delete from sys_template where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
</mapper>
|
||||
|
|
@ -0,0 +1,57 @@
|
|||
<?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.bonus.system.mapper.SysTemplateMenuMapper">
|
||||
|
||||
<resultMap type="com.bonus.system.api.domain.SysTemplateMenu" id="SysTemplateMenuMap">
|
||||
<result property="tempId" column="temp_id" />
|
||||
<result property="menuId" column="menu_id" />
|
||||
</resultMap>
|
||||
|
||||
|
||||
<!--查询指定行数据-->
|
||||
<select id="queryAllByLimit" resultMap="SysTemplateMenuMap">
|
||||
select
|
||||
temp_id, menu_id
|
||||
from sys_temp_menu
|
||||
limit #{offset}, #{limit}
|
||||
</select>
|
||||
|
||||
<!--通过实体作为筛选条件查询-->
|
||||
<select id="queryAll" resultMap="SysTemplateMenuMap">
|
||||
select
|
||||
temp_id, menu_id
|
||||
from sys_temp_menu
|
||||
<where>
|
||||
<if test="tempId != null">
|
||||
and temp_id = #{tempId}
|
||||
</if>
|
||||
<if test="menuId != null">
|
||||
and menu_id = #{menuId}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<!--新增所有列-->
|
||||
<insert id="insert" keyProperty="" useGeneratedKeys="true">
|
||||
insert into sys_temp_menu(temp_id, menu_id)
|
||||
values (#{tempId}, #{menuId})
|
||||
</insert>
|
||||
|
||||
<!--通过主键修改数据-->
|
||||
<update id="update">
|
||||
update sys_temp_menu
|
||||
<set>
|
||||
<if test="tempId != null">
|
||||
temp_id = #{tempId},
|
||||
</if>
|
||||
<if test="menuId != null">
|
||||
menu_id = #{menuId},
|
||||
</if>
|
||||
</set>
|
||||
where = #{}
|
||||
</update>
|
||||
|
||||
<delete id="deleteByTempId" parameterType="Long">
|
||||
delete from sys_temp_menu where temp_id = #{tempId}
|
||||
</delete>
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue