feat: 修改角色和资源

Author: kuangshp

nestjs-mysql-api.sql

@@ -135,10 +135,11 @@ CREATE TABLE `role_resources`  (
   `id` int(11) NOT NULL AUTO_INCREMENT PRIMARY key COMMENT '主键id',
   `resources_id` int(11) NOT NULL COMMENT '关联到resources表主键id',
   `role_id` int(11) NOT NULL COMMENT '关联到role表主键id',
+  `type` tinyint(4) not null DEFAULT 0 comment '类型,0表示菜单1表示按钮',
   `created_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) COMMENT '创建时间',
   `updated_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6) COMMENT '更新时间',
   `deleted_at` timestamp(6) NULL DEFAULT NULL COMMENT '软删除时间',
-  UNIQUE INDEX `UK_resources_role`(`resources_id`, `role_id`) 
+  UNIQUE INDEX `UK_resources_role_type`(`resources_id`, `role_id`,`type`) 
 ) ENGINE = InnoDB  DEFAULT CHARSET=utf8mb4 COMMENT = '角色和资源中间表';
 
 

src/api/resources/resources.controller.ts

@@ -14,7 +14,7 @@ import { AuthGuard } from '@src/guard/auth.guard';
 import { ResourcesDto } from './dto/resources.dto';
 import { QueryResourcesDto } from './dto/resources.query.dto';
 import { ResourcesService } from './resources.service';
-import { ResourcesListVo, ResourcesVo, SimplenessResourceVo } from './vo/resources.vo';
+import { ResourcesListVo, SimplenessResourceVo } from './vo/resources.vo';
 
 @UseGuards(AuthGuard)
 @Controller('resources')
@@ -53,9 +53,9 @@ export class ResourcesController {
     return await this.resourcesService.getResourceCatalogApi(catalogType);
   }
 
-  @Get('menusList')
-  async getMenusListApi(): Promise<ResourcesVo[]> {
-    return await this.resourcesService.getMenusListApi();
+  @Get('list')
+  async getResourcesListApi(@Query('type') type: number): Promise<SimplenessResourceVo[]> {
+    return await this.resourcesService.getResourcesListApi(type);
   }
 
   @Get('menus/:id')

src/api/resources/resources.service.ts

@@ -158,11 +158,20 @@ export class ResourcesService {
    * @Author: 水痕
    * @Date: 2023-10-08 08:07:50
    * @LastEditors: 水痕
-   * @Description: 获取一级和二级下的菜单
+   * @Description: type=0表示菜单,1表示按钮
    * @return {*}
    */
-  async getMenusListApi(): Promise<ResourcesVo[]> {
-    return await this.resourcesRepository.find({ where: { resourcesType: In([0, 1]) } });
+  async getResourcesListApi(type: number): Promise<SimplenessResourceVo[]> {
+    let resourcesType: any = [];
+    if (type == 0) {
+      resourcesType = [0, 1];
+    } else if (type == 1) {
+      resourcesType = [0, 1, 2];
+    }
+    return await this.resourcesRepository.find({
+      where: { resourcesType: In(resourcesType), status: StatusEnum.NORMAL },
+      select: ['id', 'title', 'parentId'],
+    });
   }
   /**
    * @Author: 水痕

src/api/roleResources/dto/role.resources.dto.ts

@@ -1,4 +1,4 @@
-import { IsInt, IsNotEmpty, IsArray } from 'class-validator';
+import { IsInt, IsNotEmpty, IsArray, IsOptional, Min, Max } from 'class-validator';
 import { Type } from 'class-transformer';
 
 export class RoleResourcesDto {
@@ -10,4 +10,11 @@ export class RoleResourcesDto {
   // @ArrayMinSize(1, { message: '资源至少一个' })
   @IsArray({ message: '资源ID列表必须是一个数组' })
   readonly resourceList!: number[];
+
+  @Max(1, { message: '类型id最大值为1' })
+  @Min(0, { message: '类型id最小值为0' })
+  @IsInt({ message: '类型id必须是整数' })
+  @Type(() => Number)
+  @IsOptional({ message: '类型,0表示菜单1表示按钮' })
+  type!: number;
 }

src/api/roleResources/entities/role.resources.entity.ts

@@ -17,4 +17,12 @@ export class RoleResourcesEntity extends SharedEntity {
     comment: '关联到role表主键id',
   })
   roleId!: number;
+
+  @Column({
+    type: 'tinyint',
+    name: 'type',
+    default: '0',
+    comment: '类型,0表示菜单1表示按钮',
+  })
+  type!: number;
 }

src/api/roleResources/role.resources.controller.ts

@@ -1,4 +1,5 @@
 import { Controller, Get, Post, Body, Param, ParseIntPipe, UseGuards } from '@nestjs/common';
+import { Query } from '@nestjs/common/decorators';
 import { AuthGuard } from '@src/guard/auth.guard';
 import { ResourcesEntity } from '../resources/entities/resources.entity';
 import { RoleResourcesDto } from './dto/role.resources.dto';
@@ -16,8 +17,9 @@ export class RoleResourcesController {
 
   @Get(':roleId')
   async getResourceByRoleIdApi(
-    @Param('roleId', new ParseIntPipe()) roleId: number
+    @Param('roleId', new ParseIntPipe()) roleId: number,
+    @Query('type') type: number
   ): Promise<ResourcesEntity[]> {
-    return await this.roleResourcesService.getResourceByRoleIdApi(roleId);
+    return await this.roleResourcesService.getResourceByRoleIdApi(roleId, type);
   }
 }

src/api/roleResources/role.resources.service.ts

@@ -24,16 +24,16 @@ export class RoleResourcesService {
    * @return {*}
    */
   async dispatchResourcesApi(req: RoleResourcesDto): Promise<string> {
-    const { roleId } = req;
+    const { roleId, type } = req;
     // 处理如果没传递的时候直接清空
     if (!req.resourceList.length) {
-      await this.roleResourcesRepository.delete({ roleId });
+      await this.roleResourcesRepository.delete({ roleId, type });
       return '分配资源成功';
     }
     // 根据当前角色查询之前的资源
     const roleResourcesEntity: Pick<RoleResourcesEntity, 'resourcesId'>[] =
       await this.roleResourcesRepository.find({
-        where: { roleId },
+        where: { roleId, type },
         select: ['resourcesId'],
       });
     if (roleResourcesEntity.length) {
@@ -53,6 +53,7 @@ export class RoleResourcesService {
             where: {
               roleId: req.roleId,
               resourcesId: In(roleResourceDeleteList),
+              type,
             },
             select: ['id'],
           });
@@ -68,6 +69,7 @@ export class RoleResourcesService {
             return {
               resourcesId: item,
               roleId: req.roleId,
+              type,
             };
           });
           // 创建
@@ -92,6 +94,7 @@ export class RoleResourcesService {
         return {
           roleId: req.roleId,
           resourcesId: item,
+          type,
         };
       });
       const data1 = this.roleResourcesRepository.create(data);
@@ -106,12 +109,13 @@ export class RoleResourcesService {
    * @LastEditors: 水痕
    * @Description: 根据角色获取授权的资源
    * @param {number} roleId
+   * @param {number} type
    * @return {*}
    */
-  async getResourceByRoleIdApi(roleId: number): Promise<ResourcesEntity[]> {
+  async getResourceByRoleIdApi(roleId: number, type: number): Promise<ResourcesEntity[]> {
     const roleResourcesEntity: Pick<RoleResourcesEntity, 'resourcesId'>[] =
       await this.roleResourcesRepository.find({
-        where: { roleId },
+        where: { roleId, type },
         select: ['resourcesId'],
       });
     const resourceIdList: number[] = roleResourcesEntity.map((item) => item.resourcesId);