feat: 按钮权限

Author: kuangshp

src/api/menus/menus.controller.ts

@@ -1,9 +1,8 @@
-import { Controller, Get, Param, ParseIntPipe, Query, UseGuards } from '@nestjs/common';
+import { Controller, Get, Query, UseGuards } from '@nestjs/common';
 import { CurrentUser, ICurrentUserType } from '@src/decorators';
 import { AuthGuard } from '@src/guard/auth.guard';
-import { ResourcesEntity } from '../resources/entities/resources.entity';
 import { MenusService } from './menus.service';
-import { MenusVo } from './vo/menus.vo';
+import { ApiVo, MenusVo } from './vo/menus.vo';
 
 @UseGuards(AuthGuard)
 @Controller('menus')
@@ -15,16 +14,11 @@ export class MenusController {
     return await this.menusService.getAllMenusApi(userInfo);
   }
 
-  @Get('menusId')
-  async getMenusIdByNameApi(@Query('urlName') urlName: string): Promise<number | undefined> {
-    return await this.menusService.getMenusIdByNameApi(urlName);
-  }
-
-  @Get('/btnList/:id')
-  async getBtnByMenusIdApi(
+  @Get('btnList')
+  async getBtnByMenusUrlApi(
     @CurrentUser('userInfo') userInfo: ICurrentUserType,
-    @Param('id', new ParseIntPipe()) id: number
-  ): Promise<ResourcesEntity[]> {
-    return await this.menusService.getBtnByMenusIdApi(id, userInfo);
+    @Query('urlName') urlName: string
+  ): Promise<ApiVo[]> {
+    return await this.menusService.getBtnByMenusUrlApi(urlName, userInfo);
   }
 }

src/api/menus/menus.service.ts

@@ -8,7 +8,7 @@ import { FindOperator, In, Repository } from 'typeorm';
 import { AccountRoleEntity } from '../accountRole/entities/account.role.entity';
 import { ResourcesEntity } from '../resources/entities/resources.entity';
 import { RoleResourcesEntity } from '../roleResources/entities/role.resources.entity';
-import { MenusVo } from './vo/menus.vo';
+import { ApiVo, MenusVo } from './vo/menus.vo';
 
 @Injectable()
 export class MenusService {
@@ -48,44 +48,37 @@ export class MenusService {
       .getMany();
   }
 
-  /**
-   * @Author:
-   * @Date: 2023-05-20 17:19:02
-   * @LastEditors:
-   * @Description: 根据菜单url获取菜单id
-   * @param {string} urlName
-   * @return {*}
-   */
-  async getMenusIdByNameApi(urlName: string): Promise<number | undefined> {
-    const resourcesEntity = await this.resourcesRepository.findOne({
-      where: { url: urlName },
-      select: ['id'],
-    });
-    return resourcesEntity?.id ?? 0;
-  }
-
   /**
    * @Author:
    * @Date: 2023-05-20 17:02:48
    * @LastEditors:
    * @Description: 根据菜单id获取授权的按钮
-   * @param {number} id
+   * @param {string} urlName
+   * @param {ICurrentUserType} userInfo
    * @return {*}
    */
-  async getBtnByMenusIdApi(id: number, userInfo: ICurrentUserType): Promise<ResourcesEntity[]> {
-    // if (Object.is(userInfo.isSuper, SuperAdminEnum.IS_SUPER)) {
-    //   return await this.resourcesRepository.find({
-    //     where: { parentId: id, resourcesType: 1 },
-    //     order: { sort: 'DESC', id: 'DESC' },
-    //   });
-    // } else {
-
-    // }
+  async getBtnByMenusUrlApi(urlName: string, userInfo: ICurrentUserType): Promise<ApiVo[]> {
+    const resourcesEntity: Pick<ResourcesEntity, 'id'> | null =
+      await this.resourcesRepository.findOne({
+        where: { url: urlName },
+        select: ['id'],
+      });
+    console.log(resourcesEntity, '????');
+    if (!resourcesEntity?.id) {
+      return [];
+    }
     // 获取授权的资源id
     const resourcesId = await this.getResourcesIdList(userInfo);
+    console.log(resourcesId, '全部资源');
     return await this.resourcesRepository.find({
-      where: { id: In(resourcesId), resourcesType: 1, parentId: id },
-      order: { sort: 'DESC', id: 'DESC' },
+      where: {
+        id: In(resourcesId),
+        resourcesType: 2,
+        parentId: resourcesEntity?.id,
+        status: StatusEnum.NORMAL,
+      },
+      order: { sort: 'ASC', id: 'DESC' },
+      select: ['id', 'title'],
     });
   }
 
@@ -112,24 +105,34 @@ export class MenusService {
    * @return {*}
    */
   private async getResourcesIdList(userInfo: ICurrentUserType): Promise<number[]> {
-    // 1.查询当前用户授权的角色
-    const accountRoleEntity: Pick<AccountRoleEntity, 'roleId'>[] =
-      await this.accountRoleRepository.find({
-        where: { accountId: userInfo.id },
-        select: ['roleId'],
-      });
-    if (!accountRoleEntity.length) {
-      return [];
-    }
-    // 2.根据角色查询授权的资源
-    const roleResourcesEntity: Pick<RoleResourcesEntity, 'resourcesId'>[] =
-      await this.roleResourcesRepository.find({
-        where: { roleId: In(accountRoleEntity.map((item) => item.roleId)) },
-        select: ['resourcesId'],
+    const { accountType } = userInfo;
+    if (accountType == AccountTypeEnum.SUPER_ACCOUNT) {
+      const resourcesEntity: Pick<ResourcesEntity, 'id'>[] = await this.resourcesRepository.find({
+        select: ['id'],
       });
-    if (!roleResourcesEntity.length) {
-      return [];
+      return resourcesEntity.map((item: Pick<ResourcesEntity, 'id'>) => item.id);
+    } else {
+      const query = new Map<string, FindOperator<string>>();
+      // 1.查询当前用户授权的角色
+      const accountRoleEntity: Pick<AccountRoleEntity, 'roleId'>[] =
+        await this.accountRoleRepository.find({
+          where: { accountId: userInfo.id },
+          select: ['roleId'],
+        });
+      if (!accountRoleEntity.length) {
+        return [];
+      }
+      query.set('roleId', In(accountRoleEntity.map((item) => item.roleId)));
+      // 2.根据角色查询授权的资源
+      const roleResourcesEntity: Pick<RoleResourcesEntity, 'resourcesId'>[] =
+        await this.roleResourcesRepository.find({
+          where: mapToObj(query),
+          select: ['resourcesId'],
+        });
+      if (!roleResourcesEntity.length) {
+        return [];
+      }
+      return roleResourcesEntity.map((item) => item.resourcesId);
     }
-    return roleResourcesEntity.map((item) => item.resourcesId);
   }
 }

src/api/menus/vo/menus.vo.ts

@@ -11,3 +11,8 @@ export class MenusVo {
   parentId!: number; // 上一级id
   status!: number; // 状态:0是正常,1是禁止
 }
+
+export class ApiVo {
+  id!: number;
+  title!: string; // 接口标题,或菜单标题
+}