数据权限

2022-12-27 09:20:21 +08:00
parent fff8ac4be7
commit 34cc6ece77
19 changed files with 1010 additions and 137 deletions
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/sso/rest/DataPermissionController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/sso/rest/DataPermissionController.java
@@ -23,7 +23,7 @@ import lombok.extern.slf4j.Slf4j;
@RestController
@RequiredArgsConstructor
@Api(tags = "数据管理")
-@RequestMapping("/api/dataPermission")
+@RequestMapping("/api/dataPermission2")
@Slf4j
 public class DataPermissionController {

--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java
@@ -0,0 +1,89 @@
+package org.nl.system.controller.permission;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.common.TableDataInfo;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.modules.logging.annotation.Log;
+import org.nl.sso.service.dto.DataPermissionDto;
+import org.nl.system.service.permission.ISysDataPermissionService;
+import org.nl.system.service.permission.dao.SysDataPermission;
+import org.nl.system.service.permission.dto.SysDataPermissionQuery;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Set;
+
+/**
+ * <p>
+ * 数据数据权限表 前端控制器
+ * </p>
+ *
+ * @author generator
+ * @since 2022-12-20
+ */
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "数据管理")
+@RequestMapping("/api/dataPermission")
+public class SysDataPermissionController {
+
+    private final ISysDataPermissionService dataPermissionService;
+
+    @GetMapping
+    @Log("查询数据权限")
+    @ApiOperation("查询数据权限")
+    //@SaCheckPermission("@el.check('dataPermission:list')")
+    public ResponseEntity<Object> query(SysDataPermissionQuery dataPermissionQuery, PageQuery page) {
+        return new ResponseEntity<>(TableDataInfo.build(dataPermissionService.queryAll(dataPermissionQuery, page)), HttpStatus.OK);
+    }
+
+    @PostMapping
+    @Log("新增数据权限")
+    @ApiOperation("新增数据权限")
+    //@SaCheckPermission("@el.check('dataPermission:add')")
+    public ResponseEntity<Object> create(@Validated @RequestBody SysDataPermission permission) {
+        dataPermissionService.create(permission);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
+    @PutMapping
+    @Log("修改数据权限")
+    @ApiOperation("修改数据权限")
+    //@SaCheckPermission("@el.check('dataPermission:edit')")
+    public ResponseEntity<Object> update(@Validated @RequestBody SysDataPermission permission) {
+        dataPermissionService.update(permission);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
+
+    @Log("删除数据权限")
+    @ApiOperation("删除数据权限")
+    //@SaCheckPermission("@el.check('dataPermission:del')")
+    @DeleteMapping
+    public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
+        dataPermissionService.deleteAll(ids);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @GetMapping("/scopeType")
+    @Log("获取数据权限范围")
+    @ApiOperation("获取数据权限范围")
+    public ResponseEntity<Object> getDataScopeType(){
+        return new ResponseEntity<>(dataPermissionService.getDataScopeType(),HttpStatus.OK);
+    }
+
+    @GetMapping("/dataPermissionOption")
+    @Log("获取数据权限下拉框")
+    @ApiOperation("获取数据权限下拉框")
+    public ResponseEntity<Object> getDataPermissionOption(){
+        return new ResponseEntity<>(dataPermissionService.getDataPermissionOption(),HttpStatus.OK);
+    }
+
+}
+
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/ISysDataPermissionService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/ISysDataPermissionService.java
@@ -0,0 +1,60 @@
+package org.nl.system.service.permission;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.system.service.dict.dao.Dict;
+import org.nl.system.service.permission.dao.SysDataPermission;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.system.service.permission.dto.SysDataPermissionQuery;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * <p>
+ * 数据数据权限表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2022-12-20
+ */
+public interface ISysDataPermissionService extends IService<SysDataPermission> {
+
+    /**
+     * 分页查询
+     * @param dataPermissionQuery
+     * @param page
+     * @return
+     */
+    IPage<SysDataPermission> queryAll(SysDataPermissionQuery dataPermissionQuery, PageQuery page);
+
+    /**
+     * 新增数据权限
+     * @param dto
+     */
+    void create(SysDataPermission permission);
+
+    /**
+     * 修改
+     * @param permission
+     */
+    void update(SysDataPermission permission);
+
+    /**
+     * 批量删除
+     * @param ids
+     */
+    void deleteAll(Set<String> ids);
+
+    /**
+     *
+     * @return
+     */
+    List<Dict> getDataScopeType();
+
+    /**
+     * 获取数据权限下拉框
+     * @return
+     */
+    Object getDataPermissionOption();
+}
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/SysDataPermission.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/SysDataPermission.java
@@ -0,0 +1,98 @@
+package org.nl.system.service.permission.dao;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 数据数据权限表
+ * </p>
+ *
+ * @author generator
+ * @since 2022-12-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("sys_data_permission")
+public class SysDataPermission implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * permission_id
+     */
+    @TableId(value = "permission_id")
+    private String permissionId;
+
+    /**
+     * 编码
+     */
+    @NotNull
+    private String code;
+
+    /**
+     * 名称
+     */
+    @NotNull
+    private String name;
+
+    /**
+     * 排序
+     */
+    private BigDecimal orderSort;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否启用
+     */
+    private String isUsed;
+
+    /**
+     * 是否删除
+     */
+    private String isDelete;
+
+    /**
+     * 创建人标识
+     */
+    private String createId;
+
+    /**
+     * 创建人
+     */
+    private String createName;
+
+    /**
+     * 创建时间
+     */
+    private String createTime;
+
+    /**
+     * 修改人标识
+     */
+    private String updateId;
+
+    /**
+     * 修改人
+     */
+    private String updateName;
+
+    /**
+     * 修改时间
+     */
+    private String updateTime;
+
+
+}
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.java
@@ -0,0 +1,16 @@
+package org.nl.system.service.permission.dao.mapper;
+
+import org.nl.system.service.permission.dao.SysDataPermission;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 数据数据权限表 Mapper 接口
+ * </p>
+ *
+ * @author generator
+ * @since 2022-12-20
+ */
+public interface SysDataPermissionMapper extends BaseMapper<SysDataPermission> {
+
+}
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.xml
@@ -0,0 +1,5 @@
+<?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="org.nl.system.service.permission.dao.mapper.SysDataPermissionMapper">
+
+</mapper>
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dto/SysDataPermissionQuery.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dto/SysDataPermissionQuery.java
@@ -0,0 +1,14 @@
+package org.nl.system.service.permission.dto;
+
+import lombok.Data;
+import org.nl.common.domain.query.BaseQuery;
+import org.nl.system.service.permission.dao.SysDataPermission;
+
+/**
+ * @Author: lyd
+ * @Description:
+ * @Date: 2022/12/20
+ */
+@Data
+public class SysDataPermissionQuery extends BaseQuery<SysDataPermission> {
+}
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java
@@ -0,0 +1,98 @@
+package org.nl.system.service.permission.impl;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.RequiredArgsConstructor;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.modules.common.exception.BadRequestException;
+import org.nl.modules.common.utils.SecurityUtils;
+import org.nl.system.service.dict.dao.Dict;
+import org.nl.system.service.dict.dao.mapper.SysDictMapper;
+import org.nl.system.service.permission.dao.SysDataPermission;
+import org.nl.system.service.permission.dao.mapper.SysDataPermissionMapper;
+import org.nl.system.service.permission.ISysDataPermissionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.system.service.permission.dto.SysDataPermissionQuery;
+import org.nl.system.service.user.ISysUserService;
+import org.nl.system.service.user.dto.UserDataPermissionDto;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Set;
+import java.util.function.Consumer;
+
+/**
+ * <p>
+ * 数据数据权限表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2022-12-20
+ */
+@Service
+@RequiredArgsConstructor
+public class SysDataPermissionServiceImpl extends ServiceImpl<SysDataPermissionMapper, SysDataPermission> implements ISysDataPermissionService {
+
+    private final SysDataPermissionMapper dataPermissionMapper;
+    private final ISysUserService userService;
+    private final SysDictMapper dictMapper;
+
+    @Override
+    public IPage<SysDataPermission> queryAll(SysDataPermissionQuery dataPermissionQuery, PageQuery page) {
+        return this.page(page.build(SysDataPermission.class), dataPermissionQuery.build());
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void create(SysDataPermission permission) {
+        SysDataPermission sysDataPermission = dataPermissionMapper.selectOne(new LambdaQueryWrapper<SysDataPermission>().eq(SysDataPermission::getCode, permission.getCode()));
+        if (ObjectUtil.isNotEmpty(sysDataPermission)) throw new BadRequestException("编码为[" + permission.getCode() + "]的数据权限已存在");
+        String currentUserId = SecurityUtils.getCurrentUserId();
+        String nickName = SecurityUtils.getCurrentNickName();
+        String now = DateUtil.now();
+
+        permission.setPermissionId(IdUtil.getSnowflake(1, 1).nextIdStr());
+        permission.setCreateId(currentUserId);
+        permission.setCreateName(nickName);
+        permission.setUpdateId(currentUserId);
+        permission.setUpdateName(nickName);
+        permission.setUpdateTime(now);
+        permission.setCreateTime(now);
+        dataPermissionMapper.insert(permission);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(SysDataPermission permission) {
+        SysDataPermission dataPermission = dataPermissionMapper.selectById(permission.getPermissionId());
+        if (ObjectUtil.isEmpty(dataPermission)) throw new BadRequestException("被删除或无权限，操作失败!");
+        permission.setUpdateTime(DateUtil.now());
+        permission.setUpdateId(SecurityUtils.getCurrentUserId());
+        permission.setUpdateName(SecurityUtils.getCurrentNickName());
+        dataPermissionMapper.updateById(permission);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteAll(Set<String> ids) {
+        ids.forEach(id -> {
+            List<UserDataPermissionDto> permissions = userService.getUserDataPermissionByPermissionId(id);
+            if (ObjectUtil.isNotEmpty(permissions)) throw new BadRequestException("存在相关联的数据权限，请解除关联后删除");
+            dataPermissionMapper.deleteById(id);
+        });
+    }
+
+    @Override
+    public List<Dict> getDataScopeType() {
+        return dictMapper.selectList(new LambdaQueryWrapper<Dict>().eq(Dict::getCode, "permission_scope_type"));
+    }
+
+    @Override
+    public Object getDataPermissionOption() {
+        return null;
+    }
+}
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/ISysUserService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/ISysUserService.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.system.service.user.dao.SysUser;
 import org.nl.system.service.user.dto.SysUserDetail;
+import org.nl.system.service.user.dto.UserDataPermissionDto;
 import org.nl.system.service.user.dto.UserQuery;
 import org.springframework.web.multipart.MultipartFile;

@@ -29,4 +30,5 @@ public interface ISysUserService extends IService<SysUser> {

    void update(Map userDetail);

+    List<UserDataPermissionDto> getUserDataPermissionByPermissionId(String permissionId);
 }
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java
@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Select;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.system.service.user.dao.SysUser;
 import org.nl.system.service.user.dto.SysUserDetail;
+import org.nl.system.service.user.dto.UserDataPermissionDto;
 import org.nl.system.service.user.dto.UserQuery;

 import java.util.List;
@@ -25,4 +26,5 @@ public interface SysUserMapper extends BaseMapper<SysUser> {

    List<Map<String,Object>> getDetailForMap(@Param("query") UserQuery query, @Param("page")PageQuery page);

+    List<UserDataPermissionDto> getUserDataPermissionByPermissionId(String permissionId);
 }
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml
@@ -114,4 +114,8 @@
        </where>
        GROUP BY sys_user.user_id
    </select>
+    <select id="getUserDataPermissionByPermissionId"
+            resultType="org.nl.system.service.user.dto.UserDataPermissionDto">
+        SELECT * FROM sys_user_data_permission WHERE permission_id = #{permissionId}
+    </select>
 </mapper>
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/UserDataPermissionDto.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/UserDataPermissionDto.java
@@ -0,0 +1,17 @@
+package org.nl.system.service.user.dto;
+
+import lombok.Data;
+
+/**
+ * @Author: lyd
+ * @Description: 用户-权限表
+ * @Date: 2022/12/20
+ */
+@Data
+public class UserDataPermissionDto {
+    private String userId;
+
+    private String permissionScopeType;
+
+    private String permissionId;
+}
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java
@@ -26,6 +26,7 @@ import org.nl.system.service.user.ISysUserService;
 import org.nl.system.service.user.dao.SysUser;
 import org.nl.system.service.user.dao.mapper.SysUserMapper;
 import org.nl.system.service.user.dto.SysUserDetail;
+import org.nl.system.service.user.dto.UserDataPermissionDto;
 import org.nl.system.service.user.dto.UserQuery;
 import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -140,4 +141,9 @@ public class ISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> imp
           roleService.saveUserRoleRelation(sysUser.getUserId(),(List) userDetail.get("roleIds"));
        }
    }
+
+    @Override
+    public List<UserDataPermissionDto> getUserDataPermissionByPermissionId(String permissionId) {
+        return sysUserMapper.getUserDataPermissionByPermissionId(permissionId);
+    }
 }