feat: 菜单授权根据当前返回

kuangshp · kuangshp · commit e543b3811d7a · 2023-10-19T22:41:44.000+08:00
diff --git a/src/api/menus/menus.module.ts b/src/api/menus/menus.module.ts
@@ -6,6 +6,7 @@ import { AccountRoleEntity } from '../accountRole/entities/account.role.entity';
 import { ResourcesEntity } from '../resources/entities/resources.entity';
 import { RoleResourcesEntity } from '../roleResources/entities/role.resources.entity';
 import { MenusController } from './menus.controller';
+import { MenusRepository } from './menus.repository';
 import { MenusService } from './menus.service';
 
 @Module({
@@ -19,7 +20,7 @@ import { MenusService } from './menus.service';
     TypeOrmModule.forFeature([ResourcesEntity, AccountRoleEntity, RoleResourcesEntity]),
   ],
   controllers: [MenusController],
-  providers: [MenusService],
-  exports: [MenusService],
+  providers: [MenusService, MenusRepository],
+  exports: [MenusRepository],
 })
 export class MenusModule {}
diff --git a/src/api/menus/menus.repository.ts b/src/api/menus/menus.repository.ts
@@ -0,0 +1,61 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { ICurrentUserType } from '@src/decorators';
+import { AccountTypeEnum } from '@src/enums/account.type.enum';
+import { mapToObj } from '@src/utils';
+import { Repository, FindOperator, In } 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';
+
+@Injectable()
+export class MenusRepository {
+  constructor(
+    @InjectRepository(AccountRoleEntity)
+    private readonly accountRoleRepository: Repository<AccountRoleEntity>,
+    @InjectRepository(RoleResourcesEntity)
+    private readonly roleResourcesRepository: Repository<RoleResourcesEntity>,
+    @InjectRepository(ResourcesEntity)
+    private readonly resourcesRepository: Repository<ResourcesEntity>
+  ) {}
+
+  /**
+   * @Author:
+   * @Date: 2023-05-20 17:08:22
+   * @LastEditors:
+   * @Description: 内部使用,根据当前用户获取授权的资源id
+   * @param {ICurrentUserType} userInfo
+   * @return {*}
+   */
+  async getResourcesIdList(userInfo: ICurrentUserType): Promise<number[]> {
+    const { accountType } = userInfo;
+    if (accountType == AccountTypeEnum.SUPER_ACCOUNT) {
+      const resourcesEntity: Pick<ResourcesEntity, 'id'>[] = await this.resourcesRepository.find({
+        select: ['id'],
+      });
+      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);
+    }
+  }
+}
diff --git a/src/api/menus/menus.service.ts b/src/api/menus/menus.service.ts
@@ -5,20 +5,16 @@ import { StatusEnum } from '@src/enums';
 import { AccountTypeEnum } from '@src/enums/account.type.enum';
 import { mapToObj } from '@src/utils';
 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 { MenusRepository } from './menus.repository';
 import { ApiVo, MenusVo } from './vo/menus.vo';
 
 @Injectable()
 export class MenusService {
   constructor(
-    @InjectRepository(AccountRoleEntity)
-    private readonly accountRoleRepository: Repository<AccountRoleEntity>,
-    @InjectRepository(RoleResourcesEntity)
-    private readonly roleResourcesRepository: Repository<RoleResourcesEntity>,
     @InjectRepository(ResourcesEntity)
-    private readonly resourcesRepository: Repository<ResourcesEntity>
+    private readonly resourcesRepository: Repository<ResourcesEntity>,
+    private readonly menusRepository: MenusRepository
   ) {}
 
   /**
@@ -36,7 +32,7 @@ export class MenusService {
     query.set('resourcesType', In([0, 1]));
     // 如果是不是超级管理员就返回角色下的资源
     if (accountType !== AccountTypeEnum.SUPER_ACCOUNT) {
-      const resourcesIdList = await this.getResourcesIdList(userInfo);
+      const resourcesIdList = await this.menusRepository.getResourcesIdList(userInfo);
       console.log(resourcesIdList, '资源');
       query.set('id', In(resourcesIdList));
     }
@@ -68,7 +64,7 @@ export class MenusService {
       return [];
     }
     // 获取授权的资源id
-    const resourcesId = await this.getResourcesIdList(userInfo);
+    const resourcesId = await this.menusRepository.getResourcesIdList(userInfo);
     console.log(resourcesId, '全部资源');
     return await this.resourcesRepository.find({
       where: {
@@ -91,48 +87,9 @@ export class MenusService {
    * @return {*}
    */
   async getResourcesList(userInfo: ICurrentUserType): Promise<ResourcesEntity[]> {
-    const resourcesId = await this.getResourcesIdList(userInfo);
+    const resourcesId = await this.menusRepository.getResourcesIdList(userInfo);
     return await this.resourcesRepository.find({
       where: { id: In(resourcesId) },
     });
   }
-  /**
-   * @Author:
-   * @Date: 2023-05-20 17:08:22
-   * @LastEditors:
-   * @Description: 内部使用,根据当前用户获取授权的资源id
-   * @param {ICurrentUserType} userInfo
-   * @return {*}
-   */
-  private async getResourcesIdList(userInfo: ICurrentUserType): Promise<number[]> {
-    const { accountType } = userInfo;
-    if (accountType == AccountTypeEnum.SUPER_ACCOUNT) {
-      const resourcesEntity: Pick<ResourcesEntity, 'id'>[] = await this.resourcesRepository.find({
-        select: ['id'],
-      });
-      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);
-    }
-  }
 }
diff --git a/src/api/resources/resources.controller.ts b/src/api/resources/resources.controller.ts
@@ -10,6 +10,7 @@ import {
   Query,
   UseGuards,
 } from '@nestjs/common';
+import { CurrentUser, ICurrentUserType } from '@src/decorators';
 import { AuthGuard } from '@src/guard/auth.guard';
 import { ResourcesDto } from './dto/resources.dto';
 import { QueryResourcesDto } from './dto/resources.query.dto';
@@ -54,8 +55,11 @@ export class ResourcesController {
   }
 
   @Get('list')
-  async getResourcesListApi(@Query('type') type: number): Promise<SimplenessResourceVo[]> {
-    return await this.resourcesService.getResourcesListApi(type);
+  async getResourcesListApi(
+    @Query('type') type: number,
+    @CurrentUser('userInfo') currentInfo: ICurrentUserType
+  ): Promise<SimplenessResourceVo[]> {
+    return await this.resourcesService.getResourcesListApi(type, currentInfo);
   }
 
   @Get('menus/:id')
diff --git a/src/api/resources/resources.module.ts b/src/api/resources/resources.module.ts
@@ -2,6 +2,10 @@ import { Module } from '@nestjs/common';
 import { RouterModule } from '@nestjs/core';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { ADMIN_PREFIX } from '@src/constants';
+import { AccountEntity } from '../account/entities/account.entity';
+import { AccountRoleEntity } from '../accountRole/entities/account.role.entity';
+import { MenusRepository } from '../menus/menus.repository';
+import { RoleResourcesEntity } from '../roleResources/entities/role.resources.entity';
 import { ResourcesEntity } from './entities/resources.entity';
 import { ResourcesController } from './resources.controller';
 import { ResourcesService } from './resources.service';
@@ -14,9 +18,14 @@ import { ResourcesService } from './resources.service';
         module: ResourcesModule,
       },
     ]),
-    TypeOrmModule.forFeature([ResourcesEntity]),
+    TypeOrmModule.forFeature([
+      ResourcesEntity,
+      AccountEntity,
+      RoleResourcesEntity,
+      AccountRoleEntity,
+    ]),
   ],
   controllers: [ResourcesController],
-  providers: [ResourcesService],
+  providers: [ResourcesService, MenusRepository],
 })
 export class ResourcesModule {}
diff --git a/src/api/resources/resources.service.ts b/src/api/resources/resources.service.ts
@@ -1,8 +1,10 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
+import { ICurrentUserType } from '@src/decorators';
 import { PageEnum, StatusEnum } from '@src/enums';
 import { mapToObj } from '@src/utils';
 import { Equal, FindOperator, ILike, In, Repository } from 'typeorm';
+import { MenusRepository } from '../menus/menus.repository';
 import { ResourcesDto } from './dto/resources.dto';
 import { QueryResourcesDto } from './dto/resources.query.dto';
 import { ResourcesEntity } from './entities/resources.entity';
@@ -12,7 +14,8 @@ import { ResourcesListVo, ResourcesVo, SimplenessResourceVo } from './vo/resourc
 export class ResourcesService {
   constructor(
     @InjectRepository(ResourcesEntity)
-    private readonly resourcesRepository: Repository<ResourcesEntity>
+    private readonly resourcesRepository: Repository<ResourcesEntity>,
+    private readonly menusRepository: MenusRepository
   ) {}
 
   /**
@@ -161,15 +164,24 @@ export class ResourcesService {
    * @Description: type=0表示菜单,1表示按钮
    * @return {*}
    */
-  async getResourcesListApi(type: number): Promise<SimplenessResourceVo[]> {
+  async getResourcesListApi(
+    type: number,
+    currentInfo: ICurrentUserType
+  ): Promise<SimplenessResourceVo[]> {
+    console.log(currentInfo, '当前用户');
     let resourcesType: any = [];
     if (type == 0) {
       resourcesType = [0, 1];
     } else if (type == 1) {
       resourcesType = [0, 1, 2];
     }
+    const resourcesIdList = await this.menusRepository.getResourcesIdList(currentInfo);
     return await this.resourcesRepository.find({
-      where: { resourcesType: In(resourcesType), status: StatusEnum.NORMAL },
+      where: {
+        id: In(resourcesIdList),
+        resourcesType: In(resourcesType),
+        status: StatusEnum.NORMAL,
+      },
       select: ['id', 'title', 'parentId', 'resourcesType'],
     });
   }
