权限修改

This commit is contained in:
2025-10-08 16:15:35 +08:00
parent 4bc587ecf5
commit 2ad39d403e
9 changed files with 580 additions and 70 deletions

View File

@@ -3,16 +3,18 @@ package org.xyzh.system.controller;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
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.RestController;
import org.xyzh.api.system.permission.PermissionService;
import org.xyzh.common.core.domain.ResultDomain;
import org.xyzh.common.dto.permission.TbSysPermission;
import java.util.List;
import org.xyzh.common.vo.PermissionVO;
@RestController
@RequestMapping("/permissions")
@@ -29,10 +31,21 @@ public class PermissionController {
* @ since 2025-10-06
*/
@PostMapping("/permission")
public ResultDomain<TbSysPermission> createPermission(TbSysPermission permission) {
public ResultDomain<TbSysPermission> createPermission(@RequestBody TbSysPermission permission) {
return permissionService.createPermission(permission);
}
/**
* @description 获取权限
* @param permission
* @author yslg
* @ since 2025-10-06
*/
@GetMapping("/permission")
public ResultDomain<PermissionVO> getPermission(@RequestParam PermissionVO permission) {
return permissionService.getPermissionVO(permission);
}
/**
* @description 更新权限
* @param permission
@@ -40,7 +53,7 @@ public class PermissionController {
* @ since 2025-10-06
*/
@PutMapping("/permission")
public ResultDomain<TbSysPermission> updatePermission(TbSysPermission permission) {
public ResultDomain<TbSysPermission> updatePermission(@RequestBody TbSysPermission permission) {
return permissionService.updatePermission(permission);
}
@@ -51,8 +64,29 @@ public class PermissionController {
* @ since 2025-10-06
*/
@DeleteMapping("/permission")
public ResultDomain<TbSysPermission> deletePermission(String permissionID) {
public ResultDomain<TbSysPermission> deletePermission(@RequestBody String permissionID) {
return permissionService.deletePermission(permissionID);
}
/**
* @description 查询权限列表
* @param permission
* @author yslg
* @ since 2025-10-06
*/
@PostMapping("/list")
public ResultDomain<PermissionVO> listPermission(@RequestBody PermissionVO permission) {
return permissionService.listPermission(permission);
}
/**
* @description 查询权限绑定列表
* @param permission
* @author yslg
* @ since 2025-10-06
*/
@PostMapping("/list/binding")
public ResultDomain<PermissionVO> listPermissionBinding(@RequestBody PermissionVO permission) {
return permissionService.listPermissionBinding(permission);
}
}

View File

@@ -3,7 +3,10 @@ package org.xyzh.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.xyzh.common.dto.menu.TbSysMenu;
import org.xyzh.common.dto.permission.TbSysPermission;
import org.xyzh.common.dto.role.TbSysRole;
import org.xyzh.common.vo.PermissionVO;
import java.util.List;
@@ -17,6 +20,33 @@ import java.util.List;
@Mapper
public interface PermissionMapper extends BaseMapper<TbSysPermission> {
/**
* @description 插入权限
* @param permission 权限对象
* @return int 影响行数
* @author yslg
* @since 2025-10-08
*/
int insertPermission(@Param("permission") TbSysPermission permission);
/**
* @description 根据ID更新权限
* @param permission 权限对象
* @return int 影响行数
* @author yslg
* @since 2025-10-08
*/
int updatePermission(@Param("permission") TbSysPermission permission);
/**
* @description 根据ID删除权限逻辑删除
* @param permission 权限对象
* @return int 影响行数
* @author yslg
* @since 2025-10-08
*/
int deletePermission(@Param("permission") TbSysPermission permission);
/**
* @description 根据用户ID查询权限列表
* @param userId 用户ID
@@ -72,7 +102,7 @@ public interface PermissionMapper extends BaseMapper<TbSysPermission> {
* @author yslg
* @since 2025-09-28
*/
int batchDeleteByIds(@Param("permissionIds") List<String> permissionIds, @Param("updater") String updater);
int batchDeletePermissions(@Param("permissionIds") List<String> permissionIds, @Param("updater") String updater);
/**
* @description 检查权限是否存在
@@ -82,4 +112,49 @@ public interface PermissionMapper extends BaseMapper<TbSysPermission> {
* @since 2025-10-07
*/
List<TbSysPermission> checkPermissionExists(@Param("permissionIds") List<String> permissionIds);
/**
* @description 查询权限
* @param permission 权限对象
* @return TbSysPermission 权限对象
* @author yslg
* @since 2025-10-08
*/
TbSysPermission selectPermission(@Param("permission") TbSysPermission permission);
/**
* @description 查询权限列表
* @param permission 权限对象
* @return List<PermissionVO> 权限列表
* @author yslg
* @since 2025-10-08
*/
List<PermissionVO> selectPermissionList(@Param("permission") PermissionVO permission);
/**
* @description 查询权限
* @param permission 权限对象
* @return PermissionVO 权限对象
* @author yslg
* @since 2025-10-08
*/
PermissionVO selectPermissionVO(@Param("permission") PermissionVO permission);
/**
* @description 查询权限绑定菜单
* @param permission 权限对象
* @return List<TbSysMenu> 权限绑定菜单列表
* @author yslg
* @since 2025-10-08
*/
List<TbSysMenu> selectPermissionBindMenu(PermissionVO permission);
/**
* @description 查询权限绑定角色
* @param permission 权限对象
* @return List<TbSysRole> 权限绑定角色列表
* @author yslg
* @since 2025-10-08
*/
List<TbSysRole> selectPermissionBindRole(PermissionVO permission);
}

View File

@@ -1,6 +1,9 @@
package org.xyzh.system.permission.service;
import org.xyzh.api.system.permission.PermissionService;
import org.xyzh.common.core.domain.ResultDomain;
import org.xyzh.common.dto.permission.TbSysPermission;
import org.xyzh.common.vo.PermissionVO;
/**
* @description SysPermissionService.java文件描述 系统权限服务接口

View File

@@ -18,6 +18,7 @@ import org.xyzh.common.dto.role.TbSysRolePermission;
import org.xyzh.common.dto.menu.TbSysMenu;
import org.xyzh.common.dto.menu.TbSysMenuPermission;
import org.xyzh.common.utils.IDUtils;
import org.xyzh.common.vo.PermissionVO;
import org.xyzh.system.mapper.MenuPermissionMapper;
import org.xyzh.system.mapper.MenuMapper;
import org.xyzh.system.mapper.PermissionMapper;
@@ -109,7 +110,7 @@ public class SysPermissionServiceImpl implements SysPermissionService {
permission.setCreateTime(new Date());
// 插入数据库
int result = permissionMapper.insert(permission);
int result = permissionMapper.insertPermission(permission);
if (result > 0) {
logger.info("创建权限成功:{}", permission.getName());
@@ -128,6 +129,19 @@ public class SysPermissionServiceImpl implements SysPermissionService {
}
}
@Override
public ResultDomain<PermissionVO> getPermissionVO(PermissionVO filter) {
ResultDomain<PermissionVO> resultDomain = new ResultDomain<>();
PermissionVO permission = permissionMapper.selectPermissionVO(filter);
if (permission == null) {
resultDomain.fail("权限不存在");
return resultDomain;
}
resultDomain.success("查询成功", permission);
return resultDomain;
}
@Transactional
@Override
public ResultDomain<TbSysPermission> updatePermission(TbSysPermission permission) {
@@ -182,7 +196,7 @@ public class SysPermissionServiceImpl implements SysPermissionService {
permission.setUpdateTime(new Date());
// 更新数据库
int result = permissionMapper.updateById(permission);
int result = permissionMapper.updatePermission(permission);
if (result > 0) {
logger.info("更新权限成功:{}", permission.getPermissionID());
@@ -205,6 +219,11 @@ public class SysPermissionServiceImpl implements SysPermissionService {
@Override
public ResultDomain<TbSysPermission> deletePermission(String permissionId) {
ResultDomain<TbSysPermission> resultDomain = new ResultDomain<>();
TbSysUser user = LoginUtil.getCurrentUser();
if (user == null) {
resultDomain.fail("当前用户不存在");
return resultDomain;
}
try {
logger.info("开始删除权限:{}", permissionId);
@@ -224,10 +243,13 @@ public class SysPermissionServiceImpl implements SysPermissionService {
// 逻辑删除
TbSysPermission permission = existResult.getData();
Date now = new Date();
permission.setDeleted(true);
permission.setDeleteTime(new Date());
permission.setDeleteTime(now);
permission.setUpdater(user.getID());
permission.setUpdateTime(now);
int result = permissionMapper.updateById(permission);
int result = permissionMapper.deletePermission(permission);
if (result > 0) {
logger.info("删除权限成功:{}", permissionId);
@@ -247,6 +269,34 @@ public class SysPermissionServiceImpl implements SysPermissionService {
}
/**
* @description 查询权限绑定列表
* @param permission
* @author yslg
* @ since 2025-10-08
*/
@Override
public ResultDomain<PermissionVO> listPermissionBinding(PermissionVO permission) {
ResultDomain<PermissionVO> resultDomain = new ResultDomain<>();
if (!permission.getBindType().equals("menu") && !permission.getBindType().equals("role")) {
resultDomain.fail("绑定类型不存在");
return resultDomain;
}
PermissionVO permissionVO = permissionMapper.selectPermissionVO(permission);
if (permission.getBindType().equals("menu")) {
List<TbSysMenu> bindMenus = permissionMapper.selectPermissionBindMenu(permission);
permissionVO.setMenus(bindMenus);
resultDomain.success("查询权限绑定列表成功", permissionVO);
return resultDomain;
} else {
List<TbSysRole> bindRoles = permissionMapper.selectPermissionBindRole(permission);
permissionVO.setRoles(bindRoles);
resultDomain.success("查询权限绑定角色列表成功", permissionVO);
return resultDomain;
}
}
// ----------------------角色权限管理--------------------------
/**
* @description 角色权限绑定
@@ -751,11 +801,10 @@ public class SysPermissionServiceImpl implements SysPermissionService {
return resultDomain;
}
LambdaQueryWrapper<TbSysPermission> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(TbSysPermission::getPermissionID, permissionId)
.eq(TbSysPermission::getDeleted, false);
TbSysPermission permissionQY = new TbSysPermission();
permissionQY.setPermissionID(permissionId);
TbSysPermission permission = permissionMapper.selectOne(queryWrapper);
TbSysPermission permission = permissionMapper.selectPermission(permissionQY);
if (permission == null) {
logger.warn("未找到权限:{}", permissionId);
@@ -852,4 +901,23 @@ public class SysPermissionServiceImpl implements SysPermissionService {
}
}
/**
* @description 查询权限列表
* @param permission 权限对象
* @return ResultDomain<PermissionVO> 权限列表
* @author yslg
* @ since 2025-10-08
*/
@Override
public ResultDomain<PermissionVO> listPermission(PermissionVO permission) {
ResultDomain<PermissionVO> resultDomain = new ResultDomain<>();
List<PermissionVO> permissions = permissionMapper.selectPermissionList(permission);
if (permissions.isEmpty()) {
resultDomain.fail("权限不存在");
return resultDomain;
}
resultDomain.success("查询成功", permissions);
return resultDomain;
}
}

View File

@@ -17,6 +17,36 @@
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
</resultMap>
<resultMap id="PermissionVO" type="org.xyzh.common.vo.PermissionVO">
<id column="id" property="id" jdbcType="VARCHAR"/>
<result column="permission_id" property="permissionID" jdbcType="VARCHAR"/>
<result column="name" property="name" jdbcType="VARCHAR"/>
<result column="code" property="code" jdbcType="VARCHAR"/>
<result column="description" property="description" jdbcType="VARCHAR"/>
<result column="creator" property="creator" jdbcType="VARCHAR"/>
<result column="updater" property="updater" jdbcType="VARCHAR"/>
<result column="creator_name" property="creatorName" jdbcType="VARCHAR"/>
<result column="updater_name" property="updaterName" jdbcType="VARCHAR"/>
<result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
<result column="delete_time" property="deleteTime" jdbcType="TIMESTAMP"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
</resultMap>
<resultMap id="PermissionBindMenu" type="org.xyzh.common.dto.menu.TbSysMenu">
<id column="id" property="id" jdbcType="VARCHAR"/>
<result column="menu_id" property="menuID" jdbcType="VARCHAR"/>
<result column="name" property="name" jdbcType="VARCHAR"/>
<result column="description" property="description" jdbcType="VARCHAR"/>
</resultMap>
<resultMap id="PermissionBindRole" type="org.xyzh.common.dto.role.TbSysRole">
<id column="id" property="id" jdbcType="VARCHAR"/>
<result column="role_id" property="roleID" jdbcType="VARCHAR"/>
<result column="name" property="name" jdbcType="VARCHAR"/>
<result column="description" property="description" jdbcType="VARCHAR"/>
</resultMap>
<!-- 基础字段 -->
<sql id="Base_Column_List">
id, permission_id, name, code, description, creator, updater,
@@ -112,55 +142,57 @@
</update>
<!-- 插入权限 -->
<insert id="insert" parameterType="org.xyzh.common.dto.permission.TbSysPermission">
<insert id="insertPermission" >
INSERT INTO tb_sys_permission
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="permissionID != null">permission_id,</if>
<if test="name != null">name,</if>
<if test="code != null">code,</if>
<if test="description != null">description,</if>
<if test="creator != null">creator,</if>
<if test="createTime != null">create_time,</if>
<if test="permission.id != null">id,</if>
<if test="permission.permissionID != null">permission_id,</if>
<if test="permission.name != null">name,</if>
<if test="permission.code != null">code,</if>
<if test="permission.description != null">description,</if>
<if test="permission.creator != null">creator,</if>
<if test="permission.createTime != null">create_time,</if>
deleted
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="permissionID != null">#{permissionID},</if>
<if test="name != null">#{name},</if>
<if test="code != null">#{code},</if>
<if test="description != null">#{description},</if>
<if test="creator != null">#{creator},</if>
<if test="createTime != null">#{createTime},</if>
<if test="permission.id != null">#{permission.id},</if>
<if test="permission.permissionID != null">#{permission.permissionID},</if>
<if test="permission.name != null">#{permission.name},</if>
<if test="permission.code != null">#{permission.code},</if>
<if test="permission.description != null">#{permission.description},</if>
<if test="permission.creator != null">#{permission.creator},</if>
<if test="permission.createTime != null">#{permission.createTime},</if>
0
</trim>
</insert>
<!-- 更新权限 -->
<update id="updateById" parameterType="org.xyzh.common.dto.permission.TbSysPermission">
<update id="updatePermission" >
UPDATE tb_sys_permission
<set>
<if test="permissionID != null">permission_id = #{permissionID},</if>
<if test="name != null">name = #{name},</if>
<if test="code != null">code = #{code},</if>
<if test="description != null">description = #{description},</if>
<if test="updater != null">updater = #{updater},</if>
<if test="permission.permissionID != null">permission_id = #{permission.permissionID},</if>
<if test="permission.name != null">name = #{permission.name},</if>
<if test="permission.code != null">code = #{permission.code},</if>
<if test="permission.description != null">description = #{permission.description},</if>
<if test="permission.updater != null">updater = #{permission.updater},</if>
update_time = NOW()
</set>
WHERE id = #{id} AND deleted = 0
WHERE id = #{permission.id} AND deleted = 0
</update>
<!-- 根据ID删除逻辑删除 -->
<update id="deleteById">
<update id="deletePermission" >
UPDATE tb_sys_permission
SET deleted = 1,
delete_time = NOW()
WHERE id = #{id} AND deleted = 0
delete_time = #{permission.deleteTime},
updater = #{permission.updater},
update_time = #{permission.updateTime}
WHERE id = #{permission.id} AND deleted = 0
</update>
<!-- checkPermissionExists -->
<select id="checkPermissionExists">
<select id="checkPermissionExists" >
SELECT
<include refid="Base_Column_List"/>
FROM tb_sys_permission
@@ -170,4 +202,90 @@
#{permissionId}
</foreach>
</select>
<!-- 查询权限列表 -->
<select id="selectPermission" resultMap="BaseResultMap" >
SELECT
<include refid="Base_Column_List"/>
FROM tb_sys_permission
WHERE deleted = 0
<if test="permission.name != null and permission.name != ''">
AND name LIKE CONCAT('%', #{permission.name}, '%')
</if>
<if test="permission.code != null and permission.code != ''">
AND code = #{permission.code}
</if>
<if test="permission.id != null and permission.id != ''">
AND id = #{permission.id}
</if>
LIMIT 1
</select>
<select id="selectPermissionList" resultMap="PermissionVO" >
SELECT
tsp.id, tsp.permission_id, tsp.name, tsp.code, tsp.description,
tsp.creator, tsp.updater,
tsu.username as creator_name, tuu.username as updater_name,
tsp.create_time, tsp.update_time, tsp.delete_time, tsp.deleted
FROM tb_sys_permission tsp
INNER JOIN tb_sys_user tsu ON tsp.creator = tsu.id
LEFT JOIN tb_sys_user tuu ON tsp.updater = tuu.id
WHERE tsp.deleted = 0
<if test="permission.name != null and permission.name != ''">
AND tsp.name LIKE CONCAT('%', #{permission.name}, '%')
</if>
<if test="permission.code != null and permission.code != ''">
AND tsp.code = #{permission.code}
</if>
ORDER BY tsp.code, tsp.create_time ASC
</select>
<!-- selectPermission -->
<select id="selectPermissionVO" resultMap="PermissionVO" >
SELECT
tsp.id, tsp.permission_id, tsp.name, tsp.code, tsp.description,
tsp.creator, tsp.updater,
tsu.username as creator_name, tuu.username as updater_name,
tsp.create_time, tsp.update_time, tsp.delete_time, tsp.deleted
FROM tb_sys_permission tsp
INNER JOIN tb_sys_user tsu ON tsp.creator = tsu.id
LEFT JOIN tb_sys_user tuu ON tsp.updater = tuu.id
WHERE tsp.deleted = 0
<if test="permission.name != null and permission.name != ''">
AND tsp.name LIKE CONCAT('%', #{permission.name}, '%')
</if>
<if test="permission.code != null and permission.code != ''">
AND tsp.code = #{permission.code}
</if>
<if test="permission.id != null and permission.id != ''">
AND tsp.id = #{permission.id}
</if>
LIMIT 1
</select>
<!-- selectPermissionBindMenu -->
<select id="selectPermissionBindMenu" resultMap="PermissionBindMenu">
SELECT
tsm.id, tsm.menu_id, tsm.name, tsm.description
FROM tb_sys_menu tsm
INNER JOIN tb_sys_menu_permission tsmp ON tsmp.menu_id = tsm.id
WHERE tsm.deleted = 0
AND tsmp.deleted = 0
AND tsmp.permission_id = #{permission.id}
ORDER BY tsm.menu_id, tsm.create_time ASC
</select>
<!-- selectPermissionBindRole -->
<select id="selectPermissionBindRole" resultMap="PermissionBindRole">
SELECT
tsr.id, tsr.role_id, tsr.name, tsr.description
FROM tb_sys_role tsr
INNER JOIN tb_sys_role_permission tsrp ON tsrp.role_id = tsr.id
WHERE tsr.deleted = 0
AND tsrp.deleted = 0
AND tsrp.permission_id = #{permission.id}
ORDER BY tsr.role_id, tsr.create_time ASC
</select>
</mapper>