feat: 父节点

Author: kuangshp

src/api/resources/dto/resources.dto.ts

@@ -1,4 +1,3 @@
-import { StatusEnum } from '@src/enums';
 import { MethodEnum } from '@src/enums/method.enum';
 import { IsIncludes } from '@src/validators';
 import { Type } from 'class-transformer';
@@ -36,16 +35,11 @@ export class ResourcesDto {
   @Min(0, { message: '0目录,1菜单,2接口' })
   @IsInt({ message: '类型必须是数字' })
   @Type(() => Number)
+  @IsNotEmpty({ message: '类型不能为空' })
   resourcesType!: number;
 
   @IsInt({ message: '上一级id' })
   @Type(() => Number)
+  @IsOptional({ message: '父级' })
   parentId!: number;
-
-  @Max(1, { message: '状态最大值为1' })
-  @Min(0, { message: '状态最小值为0' })
-  @IsInt({ message: '状态必须是数字' })
-  @Type(() => Number)
-  @IsNotEmpty({ message: '状态不能为空' })
-  status!: StatusEnum;
 }

src/api/resources/dto/resources.query.dto.ts

@@ -2,7 +2,7 @@ import { QueryOptionsDto } from '@src/shared/dto/query.options.dto';
 
 export class QueryResourcesDto extends QueryOptionsDto {
   readonly title!: string; // 接口标题,或菜单标题
-  readonly type!: number; // 0目录,1菜单,2接口
+  readonly resourcesType!: number; // 0目录,1菜单,2接口
   readonly parentId!: number; // 上一级id
   readonly status!: number; // 状态:0是正常,1是禁止
   readonly isBtn!: number; // 是否为按钮:0表示不是,1表示是

src/api/resources/resources.service.ts

@@ -77,7 +77,7 @@ export class ResourcesService {
       pageNumber = PageEnum.PAGE_NUMBER,
       pageSize = PageEnum.PAGE_SIZE,
       title,
-      type,
+      resourcesType,
       parentId,
       status,
     } = queryResourcesDto;
@@ -88,12 +88,14 @@ export class ResourcesService {
     if ([(StatusEnum.NORMAL, StatusEnum.FORBIDDEN)].includes(status)) {
       queryMap.set('status', Equal(status + ''));
     }
-    if ([0, 1, 2].includes(type)) {
-      queryMap.set('type', Equal(type + ''));
+    if ([0, 1, 2].includes(resourcesType)) {
+      queryMap.set('resourcesType', Equal(resourcesType + ''));
     }
 
     if (parentId) {
       queryMap.set('parentId', Equal(parentId + ''));
+    } else {
+      queryMap.set('parentId', Equal('-1'));
     }
     const [data, total] = await this.resourcesRepository
       .createQueryBuilder()
@@ -103,8 +105,27 @@ export class ResourcesService {
       .printSql()
       .where(mapToObj(queryMap))
       .getManyAndCount();
+    // 抽取全部的id
+    const resourcesIdList = data.map((item) => item.id);
+    const resourcesEntityList: Pick<ResourcesEntity, 'parentId'>[] =
+      await this.resourcesRepository.find({
+        where: { parentId: In(resourcesIdList) },
+        select: ['parentId'],
+      });
+    // 组成map[parentId] = true
+    const resourcesMap = new Map<number, boolean>();
+    for (const item of resourcesEntityList) {
+      resourcesMap.set(item.parentId, true);
+    }
+    const result: ResourcesVo[] = [];
+    for (const item of data) {
+      result.push({
+        ...item,
+        hasChildren: resourcesMap.get(item.id),
+      });
+    }
     return {
-      data,
+      data: result,
       total,
       pageNumber: +pageNumber,
       pageSize: +pageSize,
@@ -115,7 +136,7 @@ export class ResourcesService {
    * @Author: 水痕
    * @Date: 2023-10-08 08:07:30
    * @LastEditors: 水痕
-   * @Description: 根据资源目录
+   * @Description: 根据资源模块
    * @return {*}
    */
   async getResourceCatalogApi(): Promise<SimplenessResourceVo[]> {

src/api/resources/vo/resources.vo.ts

@@ -9,6 +9,7 @@ export class ResourcesVo extends QueryVo {
   readonly resourcesType!: number; // 0目录,1菜单,2接口
   readonly parentId!: number; // 上一级id
   readonly status!: number; // 状态:0是正常,1是禁止
+  readonly hasChildren?: boolean; // 是否有子节点
 }
 
 export class ResourcesListVo extends QueryListVo {