xinyin025/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-12-28 02:55:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

发布 v2.3.0

Browse Source
This commit is contained in:
疯狂的狮子li
2021-06-01 10:33:57 +08:00
parent fcfc5c85c7
commit c90ca8c2a6
74 changed files with 3801 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
View File

@@ -30,4 +30,12 @@ public interface SysDeptMapper extends BaseMapperPlus<SysDept> {
*/
public List<Integer> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
/**
* 修改子元素关系
*
* @param depts 子元素
* @return 结果
*/
public int updateDeptChildren(@Param("depts") List<SysDept> depts);
}

10
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java
View File

@@ -3,6 +3,8 @@ package com.ruoyi.system.mapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.system.domain.SysRoleDept;
import java.util.List;
/**
* 角色与部门关联表 数据层
*
@@ -10,4 +12,12 @@ import com.ruoyi.system.domain.SysRoleDept;
*/
public interface SysRoleDeptMapper extends BaseMapperPlus<SysRoleDept> {
/**
* 批量新增角色部门信息
*
* @param roleDeptList 角色部门列表
* @return 结果
*/
public int batchRoleDept(List<SysRoleDept> roleDeptList);
}

10
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java
View File

@@ -3,6 +3,8 @@ package com.ruoyi.system.mapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.system.domain.SysRoleMenu;
import java.util.List;
/**
* 角色与菜单关联表 数据层
*
@@ -10,4 +12,12 @@ import com.ruoyi.system.domain.SysRoleMenu;
*/
public interface SysRoleMenuMapper extends BaseMapperPlus<SysRoleMenu> {
/**
* 批量新增角色菜单信息
*
* @param roleMenuList 角色菜单列表
* @return 结果
*/
public int batchRoleMenu(List<SysRoleMenu> roleMenuList);
}

10
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java
View File

@@ -3,6 +3,8 @@ package com.ruoyi.system.mapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.system.domain.SysUserPost;
import java.util.List;
/**
* 用户与岗位关联表 数据层
*
@@ -10,4 +12,12 @@ import com.ruoyi.system.domain.SysUserPost;
*/
public interface SysUserPostMapper extends BaseMapperPlus<SysUserPost> {
/**
* 批量新增用户岗位信息
*
* @param userPostList 用户角色列表
* @return 结果
*/
public int batchUserPost(List<SysUserPost> userPostList);
}

10
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java
View File

@@ -3,6 +3,8 @@ package com.ruoyi.system.mapper;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.system.domain.SysUserRole;
import java.util.List;
/**
* 用户与角色关联表 数据层
*
@@ -10,4 +12,12 @@ import com.ruoyi.system.domain.SysUserRole;
*/
public interface SysUserRoleMapper extends BaseMapperPlus<SysUserRole> {
/**
* 批量新增用户角色信息
*
* @param userRoleList 用户角色列表
* @return 结果
*/
public int batchUserRole(List<SysUserRole> userRoleList);
}

6
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
View File

@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -32,9 +33,6 @@ import java.util.Map;
@Service
public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig> implements ISysConfigService {
@Autowired
private SysConfigMapper configMapper;
@Autowired
private RedisCache redisCache;
@@ -160,9 +158,9 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
if (StrUtil.equals(UserConstants.YES, config.getConfigType())) {
throw new CustomException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey()));
}
configMapper.deleteById(configId);
redisCache.deleteObject(getCacheKey(config.getConfigKey()));
}
baseMapper.deleteBatchIds(Arrays.asList(configIds));
}
/**

2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
View File

@@ -244,7 +244,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
child.setAncestors(child.getAncestors().replaceFirst(oldAncestors, newAncestors));
}
if (children.size() > 0) {
updateBatchById(children);
baseMapper.updateDeptChildren(children);
}
}

3
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
View File

@@ -11,6 +11,7 @@ import com.ruoyi.system.mapper.SysDictDataMapper;
import com.ruoyi.system.service.ISysDictDataService;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.List;
/**
@@ -83,10 +84,10 @@ public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDi
public void deleteDictDataByIds(Long[] dictCodes) {
for (Long dictCode : dictCodes) {
SysDictData data = selectDictDataById(dictCode);
baseMapper.deleteById(dictCode);
List<SysDictData> dictDatas = baseMapper.selectDictDataByType(data.getDictType());
DictUtils.setDictCache(data.getDictType(), dictDatas);
}
baseMapper.deleteBatchIds(Arrays.asList(dictCodes));
}
/**

6
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
View File

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.PostConstruct;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -32,9 +33,6 @@ import java.util.Map;
@Service
public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDictType> implements ISysDictTypeService {
@Autowired
private SysDictTypeMapper dictTypeMapper;
@Autowired
private SysDictDataMapper dictDataMapper;
@@ -149,9 +147,9 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
.eq(SysDictData::getDictType, dictType.getDictType())) > 0) {
throw new CustomException(String.format("%1$s已分配,不能删除", dictType.getDictName()));
}
dictTypeMapper.deleteById(dictId);
DictUtils.removeDictCache(dictType.getDictType());
}
baseMapper.deleteBatchIds(Arrays.asList(dictIds));
}
/**

8
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
View File

@@ -240,9 +240,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
list.add(rm);
}
if (list.size() > 0) {
for (SysRoleMenu sysRoleMenu : list) {
rows += roleMenuMapper.insert(sysRoleMenu);
}
rows = roleMenuMapper.batchRoleMenu(list);
}
return rows;
}
@@ -263,9 +261,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
list.add(rd);
}
if (list.size() > 0) {
for (SysRoleDept sysRoleDept : list) {
rows += roleDeptMapper.insert(sysRoleDept);
}
rows = roleDeptMapper.batchRoleDept(list);
}
return rows;
}

16
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
View File

@@ -52,7 +52,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
private ISysConfigService configService;
@Override
@DataScope(deptAlias = "d", userAlias = "u")
@DataScope(deptAlias = "d", userAlias = "u", isUser = true)
public TableDataInfo<SysUser> selectPageUserList(SysUser user) {
return PageUtils.buildDataInfo(baseMapper.selectPageUserList(PageUtils.buildPage(), user));
}
@@ -64,7 +64,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* @return 用户信息集合信息
*/
@Override
@DataScope(deptAlias = "d", userAlias = "u")
@DataScope(deptAlias = "d", userAlias = "u", isUser = true)
public List<SysUser> selectUserList(SysUser user) {
return baseMapper.selectUserList(user);
}
@@ -100,7 +100,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override
public String selectUserRoleGroup(String userName) {
List<SysRole> list = roleMapper.selectRolesByUserName(userName);
StringBuffer idsStr = new StringBuffer();
StringBuilder idsStr = new StringBuilder();
for (SysRole role : list) {
idsStr.append(role.getRoleName()).append(",");
}
@@ -119,7 +119,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override
public String selectUserPostGroup(String userName) {
List<SysPost> list = postMapper.selectPostsByUserName(userName);
StringBuffer idsStr = new StringBuffer();
StringBuilder idsStr = new StringBuilder();
for (SysPost post : list) {
idsStr.append(post.getPostName()).append(",");
}
@@ -311,9 +311,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
list.add(ur);
}
if (list.size() > 0) {
for (SysUserRole sysUserRole : list) {
userRoleMapper.insert(sysUserRole);
}
userRoleMapper.batchUserRole(list);
}
}
}
@@ -335,9 +333,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
list.add(up);
}
if (list.size() > 0) {
for (SysUserPost sysUserPost : list) {
userPostMapper.insert(sysUserPost);
}
userPostMapper.batchUserPost(list);
}
}
}

17
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
View File

@@ -40,7 +40,9 @@
AND status = #{status}
</if>
<!-- 数据范围过滤 -->
${params.dataScope}
<if test="params.dataScope != null and params.dataScope != ''">
AND ( ${params.dataScope} )
</if>
order by d.parent_id, d.order_num
</select>
@@ -55,4 +57,17 @@
order by d.parent_id, d.order_num
</select>
<update id="updateDeptChildren" parameterType="java.util.List">
update sys_dept set ancestors =
<foreach collection="depts" item="item" index="index"
separator=" " open="case dept_id" close="end">
when #{item.deptId} then #{item.ancestors}
</foreach>
where dept_id in
<foreach collection="depts" item="item" index="index"
separator="," open="(" close=")">
#{item.deptId}
</foreach>
</update>
</mapper>

9
ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
View File

@@ -9,4 +9,11 @@
<result property="deptId" column="dept_id"/>
</resultMap>
</mapper>
<insert id="batchRoleDept">
insert into sys_role_dept(role_id, dept_id) values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.roleId},#{item.deptId})
</foreach>
</insert>
</mapper>

8
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
View File

@@ -58,7 +58,9 @@
and date_format(r.create_time,'%y%m%d') &lt;= date_format(#{role.params.endTime},'%y%m%d')
</if>
<!-- 数据范围过滤 -->
${role.params.dataScope}
<if test="role.params.dataScope != null and role.params.dataScope != ''">
AND ( ${role.params.dataScope} )
</if>
order by r.role_sort
</select>
@@ -81,7 +83,9 @@
and date_format(r.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
<!-- 数据范围过滤 -->
${params.dataScope}
<if test="params.dataScope != null and params.dataScope != ''">
AND ( ${params.dataScope} )
</if>
order by r.role_sort
</select>

9
ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
View File

@@ -9,4 +9,11 @@
<result property="menuId" column="menu_id"/>
</resultMap>
</mapper>
<insert id="batchRoleMenu">
insert into sys_role_menu(role_id, menu_id) values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.roleId},#{item.menuId})
</foreach>
</insert>
</mapper>

8
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@@ -106,7 +106,9 @@
ancestors) ))
</if>
<!-- 数据范围过滤 -->
${user.params.dataScope}
<if test="user.params.dataScope != null and user.params.dataScope != ''">
AND ( ${user.params.dataScope} )
</if>
</select>
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
@@ -135,7 +137,9 @@
ancestors) ))
</if>
<!-- 数据范围过滤 -->
${params.dataScope}
<if test="params.dataScope != null and params.dataScope != ''">
AND ( ${params.dataScope} )
</if>
</select>
<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">

9
ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
View File

@@ -9,4 +9,11 @@
<result property="postId" column="post_id"/>
</resultMap>
</mapper>
<insert id="batchUserPost">
insert into sys_user_post(user_id, post_id) values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.userId},#{item.postId})
</foreach>
</insert>
</mapper>

9
ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
View File

@@ -9,4 +9,11 @@
<result property="roleId" column="role_id"/>
</resultMap>
</mapper>
<insert id="batchUserRole">
insert into sys_user_role(user_id, role_id) values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.userId},#{item.roleId})
</foreach>
</insert>
</mapper>