菜单权限模块实现

李曜臣
1 parent 557c9c0e
Showing 6 changed files with 261 additions and 60 deletions
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/RbacMenu/RbacMenuCreateInputVo.cs
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/RbacMenu/RbacMenuGetListOutputDto.cs
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/RbacMenu/RbacMenuTreeDto.cs
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/IServices/IRbacMenuAppService.cs
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/DbModels/MenuDbEntity.cs
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application/Services/RbacMenuAppService.cs
@@ -7,7 +7,10 @@ public class RbacMenuCreateInputVo
 {
     public string MenuName { get; set; } = string.Empty;
-    public Guid ParentId { get; set; }
+    /// <summary>
+    /// 父级ID（menu 表为字符串ID，可能是数字；根节点默认 0）
+    /// </summary>
+    public string ParentId { get; set; } = "0";
     public int MenuType { get; set; }
@@ -5,9 +5,9 @@ namespace FoodLabeling.Application.Contracts.Dtos.RbacMenu;
 /// </summary>
 public class RbacMenuGetListOutputDto
 {
-    public Guid Id { get; set; }
+    public string Id { get; set; } = string.Empty;
-    public Guid ParentId { get; set; }
+    public string ParentId { get; set; } = string.Empty;
     public string MenuName { get; set; } = string.Empty;
+namespace FoodLabeling.Application.Contracts.Dtos.RbacMenu;
+
+/// <summary>
+/// 权限树节点（返回菜单表全部字段）
+/// </summary>
+public class RbacMenuTreeDto
+{
+    public string Id { get; set; } = string.Empty;
+
+    public bool IsDeleted { get; set; }
+
+    public DateTime CreationTime { get; set; }
+
+    public string? CreatorId { get; set; }
+
+    public string? LastModifierId { get; set; }
+
+    public DateTime? LastModificationTime { get; set; }
+
+    public int OrderNum { get; set; }
+
+    public bool State { get; set; }
+
+    public string MenuName { get; set; } = string.Empty;
+
+    public string? RouterName { get; set; }
+
+    public int MenuType { get; set; }
+
+    public string? PermissionCode { get; set; }
+
+    public string ParentId { get; set; } = string.Empty;
+
+    public string? MenuIcon { get; set; }
+
+    public string? Router { get; set; }
+
+    public bool IsLink { get; set; }
+
+    public bool IsCache { get; set; }
+
+    public bool IsShow { get; set; }
+
+    public string? Remark { get; set; }
+
+    public string? Component { get; set; }
+
+    public int MenuSource { get; set; }
+
+    public string? Query { get; set; }
+
+    public string? ConcurrencyStamp { get; set; }
+
+    public List<RbacMenuTreeDto>? Children { get; set; }
+}
+
 using FoodLabeling.Application.Contracts.Dtos.RbacMenu;
-using FoodLabeling.Application.Contracts.Dtos.Common;
-using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 namespace FoodLabeling.Application.Contracts.IServices;
@@ -11,14 +9,14 @@ namespace FoodLabeling.Application.Contracts.IServices;
 public interface IRbacMenuAppService : IApplicationService
 {
     /// <summary>
-    /// 权限分页列表
+    /// 权限列表（不分页）
     /// </summary>
-    Task<PagedResultWithPageDto<RbacMenuGetListOutputDto>> GetListAsync(RbacMenuGetListInputVo input);
+    Task<List<RbacMenuGetListOutputDto>> GetListAsync(RbacMenuGetListInputVo input);
     /// <summary>
     /// 权限详情
     /// </summary>
-    Task<RbacMenuGetListOutputDto> GetAsync(Guid id);
+    Task<RbacMenuGetListOutputDto> GetAsync(string id);
     /// <summary>
     /// 新增权限
@@ -28,11 +26,17 @@ public interface IRbacMenuAppService : IApplicationService
     /// <summary>
     /// 编辑权限
     /// </summary>
-    Task<RbacMenuGetListOutputDto> UpdateAsync(Guid id, RbacMenuUpdateInputVo input);
+    Task<RbacMenuGetListOutputDto> UpdateAsync(string id, RbacMenuUpdateInputVo input);
     /// <summary>
     /// 删除权限（逻辑删除）
     /// </summary>
-    Task DeleteAsync(List<Guid> ids);
+    Task DeleteAsync(List<string> ids);
+
+    /// <summary>
+    /// 获取全部权限树（GET）
+    /// </summary>
+    /// <returns>树状权限列表</returns>
+    Task<List<RbacMenuTreeDto>> GetTreeAsync();
 }
+using SqlSugar;
+
+namespace FoodLabeling.Application.Services.DbModels;
+
+/// <summary>
+/// menu 表映射（兼容数字/字符串类型的 Id、ParentId）
+/// </summary>
+[SugarTable("menu")]
+public class MenuDbEntity
+{
+    [SugarColumn(IsPrimaryKey = true)]
+    public string Id { get; set; } = string.Empty;
+
+    public bool IsDeleted { get; set; }
+
+    public DateTime CreationTime { get; set; }
+
+    public string? CreatorId { get; set; }
+
+    public string? LastModifierId { get; set; }
+
+    public DateTime? LastModificationTime { get; set; }
+
+    public int OrderNum { get; set; }
+
+    public bool State { get; set; }
+
+    public string MenuName { get; set; } = string.Empty;
+
+    public string? RouterName { get; set; }
+
+    public int MenuType { get; set; }
+
+    public string? PermissionCode { get; set; }
+
+    public string ParentId { get; set; } = "0";
+
+    public string? MenuIcon { get; set; }
+
+    public string? Router { get; set; }
+
+    public bool IsLink { get; set; }
+
+    public bool IsCache { get; set; }
+
+    public bool IsShow { get; set; }
+
+    public string? Remark { get; set; }
+
+    public string? Component { get; set; }
+
+    public int MenuSource { get; set; }
+
+    public string? Query { get; set; }
+
+    public string? ConcurrencyStamp { get; set; }
+}
+
 using FoodLabeling.Application.Contracts.Dtos.RbacMenu;
-using FoodLabeling.Application.Contracts.Dtos.Common;
 using FoodLabeling.Application.Contracts.IServices;
+using FoodLabeling.Application.Services.DbModels;
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
 using Volo.Abp;
 using Volo.Abp.Application.Services;
-using Volo.Abp.Domain.Entities;
-using Yi.Framework.Rbac.Domain.Entities;
 using Yi.Framework.SqlSugarCore.Abstractions;
 namespace FoodLabeling.Application.Services;
@@ -16,57 +14,44 @@ namespace FoodLabeling.Application.Services;
 /// </summary>
 public class RbacMenuAppService : ApplicationService, IRbacMenuAppService
 {
-    private readonly ISqlSugarRepository<MenuAggregateRoot, Guid> _menuRepository;
+    private readonly ISqlSugarDbContext _dbContext;
-    public RbacMenuAppService(ISqlSugarRepository<MenuAggregateRoot, Guid> menuRepository)
+    public RbacMenuAppService(ISqlSugarDbContext dbContext)
     {
-        _menuRepository = menuRepository;
+        _dbContext = dbContext;
     }
     /// <inheritdoc />
-    public async Task<PagedResultWithPageDto<RbacMenuGetListOutputDto>> GetListAsync([FromQuery] RbacMenuGetListInputVo input)
+    public async Task<List<RbacMenuGetListOutputDto>> GetListAsync([FromQuery] RbacMenuGetListInputVo input)
     {
-        RefAsync<int> total = 0;
-
-        var query = _menuRepository._DbQueryable
+        var query = _dbContext.SqlSugarClient.Queryable<MenuDbEntity>()
             .Where(x => x.IsDeleted == false)
             .WhereIF(!string.IsNullOrWhiteSpace(input.MenuName), x => x.MenuName.Contains(input.MenuName!.Trim()))
             .WhereIF(input.State is not null, x => x.State == input.State)
-            .WhereIF(input.MenuSource is not null, x => x.MenuSource == (Yi.Framework.Rbac.Domain.Shared.Enums.MenuSourceEnum)input.MenuSource!.Value)
+            .WhereIF(input.MenuSource is not null, x => x.MenuSource == input.MenuSource!.Value)
             .OrderBy(x => x.OrderNum, OrderByType.Desc);
-        var entities = await query.ToPageListAsync(input.SkipCount, input.MaxResultCount, total);
+        var entities = await query.ToListAsync();
-        var items = entities.Select(x => new RbacMenuGetListOutputDto
+        return entities.Select(x => new RbacMenuGetListOutputDto
         {
             Id = x.Id,
             ParentId = x.ParentId,
             MenuName = x.MenuName ?? string.Empty,
             PermissionCode = x.PermissionCode,
-            MenuType = (int)x.MenuType,
-            MenuSource = (int)x.MenuSource,
+            MenuType = x.MenuType,
+            MenuSource = x.MenuSource,
             OrderNum = x.OrderNum,
             State = x.State
         }).ToList();
-
-        var pageSize = input.MaxResultCount <= 0 ? items.Count : input.MaxResultCount;
-        var pageIndex = pageSize <= 0 ? 1 : (input.SkipCount / pageSize) + 1;
-        var totalPages = pageSize <= 0 ? 0 : (int)Math.Ceiling(total / (double)pageSize);
-
-        return new PagedResultWithPageDto<RbacMenuGetListOutputDto>
-        {
-            PageIndex = pageIndex,
-            PageSize = pageSize,
-            TotalCount = total,
-            TotalPages = totalPages,
-            Items = items
-        };
     }
     /// <inheritdoc />
-    public async Task<RbacMenuGetListOutputDto> GetAsync(Guid id)
+    public async Task<RbacMenuGetListOutputDto> GetAsync(string id)
     {
-        var entity = await _menuRepository.GetSingleAsync(x => x.Id == id && x.IsDeleted == false);
+        var entity = await _dbContext.SqlSugarClient.Queryable<MenuDbEntity>()
+            .Where(x => x.Id == id && x.IsDeleted == false)
+            .SingleAsync();
         if (entity is null)
         {
             throw new UserFriendlyException("权限不存在");
@@ -78,8 +63,8 @@ public class RbacMenuAppService : ApplicationService, IRbacMenuAppService
             ParentId = entity.ParentId,
             MenuName = entity.MenuName ?? string.Empty,
             PermissionCode = entity.PermissionCode,
-            MenuType = (int)entity.MenuType,
-            MenuSource = (int)entity.MenuSource,
+            MenuType = entity.MenuType,
+            MenuSource = entity.MenuSource,
             OrderNum = entity.OrderNum,
             State = entity.State
         };
@@ -94,28 +79,35 @@ public class RbacMenuAppService : ApplicationService, IRbacMenuAppService
             throw new UserFriendlyException("权限名称不能为空");
         }
-        var entity = new MenuAggregateRoot
+        var entity = new MenuDbEntity
         {
+            Id = GuidGenerator.Create().ToString(),
             MenuName = name,
-            ParentId = input.ParentId,
-            MenuType = (Yi.Framework.Rbac.Domain.Shared.Enums.MenuTypeEnum)input.MenuType,
-            MenuSource = (Yi.Framework.Rbac.Domain.Shared.Enums.MenuSourceEnum)input.MenuSource,
+            ParentId = string.IsNullOrWhiteSpace(input.ParentId) ? "0" : input.ParentId.Trim(),
+            MenuType = input.MenuType,
+            MenuSource = input.MenuSource,
             PermissionCode = input.PermissionCode?.Trim(),
             Router = input.Router?.Trim(),
             Component = input.Component?.Trim(),
             OrderNum = input.OrderNum,
-            State = input.State
+            State = input.State,
+            IsDeleted = false,
+            CreationTime = DateTime.Now,
+            IsCache = false,
+            IsLink = false,
+            IsShow = true,
+            ConcurrencyStamp = string.Empty
         };
-        EntityHelper.TrySetId(entity, () => GuidGenerator.Create());
-
-        await _menuRepository.InsertAsync(entity);
+        await _dbContext.SqlSugarClient.Insertable(entity).ExecuteCommandAsync();
         return await GetAsync(entity.Id);
     }
     /// <inheritdoc />
-    public async Task<RbacMenuGetListOutputDto> UpdateAsync(Guid id, [FromBody] RbacMenuUpdateInputVo input)
+    public async Task<RbacMenuGetListOutputDto> UpdateAsync(string id, [FromBody] RbacMenuUpdateInputVo input)
     {
-        var entity = await _menuRepository.GetSingleAsync(x => x.Id == id && x.IsDeleted == false);
+        var entity = await _dbContext.SqlSugarClient.Queryable<MenuDbEntity>()
+            .Where(x => x.Id == id && x.IsDeleted == false)
+            .SingleAsync();
         if (entity is null)
         {
             throw new UserFriendlyException("权限不存在");
@@ -128,30 +120,118 @@ public class RbacMenuAppService : ApplicationService, IRbacMenuAppService
         }
         entity.MenuName = name;
-        entity.ParentId = input.ParentId;
-        entity.MenuType = (Yi.Framework.Rbac.Domain.Shared.Enums.MenuTypeEnum)input.MenuType;
-        entity.MenuSource = (Yi.Framework.Rbac.Domain.Shared.Enums.MenuSourceEnum)input.MenuSource;
+        entity.ParentId = string.IsNullOrWhiteSpace(input.ParentId) ? "0" : input.ParentId.Trim();
+        entity.MenuType = input.MenuType;
+        entity.MenuSource = input.MenuSource;
         entity.PermissionCode = input.PermissionCode?.Trim();
         entity.Router = input.Router?.Trim();
         entity.Component = input.Component?.Trim();
         entity.OrderNum = input.OrderNum;
         entity.State = input.State;
+        entity.LastModificationTime = DateTime.Now;
-        await _menuRepository.UpdateAsync(entity);
+        await _dbContext.SqlSugarClient.Updateable(entity)
+            .Where(x => x.Id == entity.Id)
+            .ExecuteCommandAsync();
         return await GetAsync(entity.Id);
     }
     /// <inheritdoc />
-    public async Task DeleteAsync([FromBody] List<Guid> ids)
+    public async Task DeleteAsync([FromBody] List<string> ids)
     {
-        var idList = ids?.Distinct().ToList() ?? new List<Guid>();
+        var idList = ids?.Where(x => !string.IsNullOrWhiteSpace(x)).Select(x => x.Trim()).Distinct().ToList() ?? new List<string>();
         if (idList.Count == 0)
         {
             return;
         }
-        // 权限表为软删（ISoftDelete）
-        await _menuRepository.DeleteAsync(x => idList.Contains(x.Id));
+        await _dbContext.SqlSugarClient.Updateable<MenuDbEntity>()
+            .SetColumns(x => new MenuDbEntity { IsDeleted = true })
+            .Where(x => idList.Contains(x.Id))
+            .ExecuteCommandAsync();
+    }
+
+    /// <inheritdoc />
+    public async Task<List<RbacMenuTreeDto>> GetTreeAsync()
+    {
+        // 返回所有字段，但过滤逻辑删除数据
+        var menus = await _dbContext.SqlSugarClient.Queryable<MenuDbEntity>()
+            .Where(x => x.IsDeleted == false)
+            .OrderBy(x => x.OrderNum, OrderByType.Desc)
+            .ToListAsync();
+
+        var nodes = menus.Select(m => new RbacMenuTreeDto
+        {
+            Id = m.Id,
+            IsDeleted = m.IsDeleted,
+            CreationTime = m.CreationTime,
+            CreatorId = m.CreatorId,
+            LastModifierId = m.LastModifierId,
+            LastModificationTime = m.LastModificationTime,
+            OrderNum = m.OrderNum,
+            State = m.State,
+            MenuName = m.MenuName ?? string.Empty,
+            RouterName = m.RouterName,
+            MenuType = m.MenuType,
+            PermissionCode = m.PermissionCode,
+            ParentId = m.ParentId,
+            MenuIcon = m.MenuIcon,
+            Router = m.Router,
+            IsLink = m.IsLink,
+            IsCache = m.IsCache,
+            IsShow = m.IsShow,
+            Remark = m.Remark,
+            Component = m.Component,
+            MenuSource = m.MenuSource,
+            Query = m.Query,
+            ConcurrencyStamp = m.ConcurrencyStamp,
+            Children = new List<RbacMenuTreeDto>()
+        }).ToList();
+
+        // TreeHelper 仅支持 Guid Id/ParentId，这里使用字符串 ParentId 自行构建树
+        var nodeById = nodes
+            .Where(x => !string.IsNullOrWhiteSpace(x.Id))
+            .GroupBy(x => x.Id)
+            .ToDictionary(g => g.Key, g => g.First());
+
+        foreach (var node in nodes)
+        {
+            node.Children ??= new List<RbacMenuTreeDto>();
+            var parentId = string.IsNullOrWhiteSpace(node.ParentId) ? "0" : node.ParentId.Trim();
+            if (parentId == "0" || parentId == "00000000-0000-0000-0000-000000000000")
+            {
+                continue;
+            }
+
+            if (nodeById.TryGetValue(parentId, out var parent))
+            {
+                parent.Children ??= new List<RbacMenuTreeDto>();
+                parent.Children.Add(node);
+            }
+        }
+
+        var roots = nodes
+            .Where(n =>
+            {
+                var pid = string.IsNullOrWhiteSpace(n.ParentId) ? "0" : n.ParentId.Trim();
+                return pid == "0" || pid == "00000000-0000-0000-0000-000000000000" || !nodeById.ContainsKey(pid);
+            })
+            .ToList();
+
+        SortTree(roots);
+        return roots;
+    }
+
+    private static void SortTree(List<RbacMenuTreeDto> nodes)
+    {
+        nodes.Sort((a, b) => b.OrderNum.CompareTo(a.OrderNum));
+        foreach (var node in nodes)
+        {
+            if (node.Children is { Count: > 0 })
+            {
+                SortTree(node.Children);
+            }
+        }
     }
 }