feat: Permission Tree Add Create And Update Delete

src/LinCms.Application.Contracts/Cms/Permissions/IPermissionService.cs

@@ -8,7 +8,7 @@ namespace LinCms.Cms.Permissions;
 public interface IPermissionService
 {
     Task<List<PermissionTreeNode>> GetPermissionTreeNodes();
-    Task<bool> CheckPermissionAsync(string module, string permission);
+    Task<bool> CheckPermissionAsync(string permission);
     Task DeletePermissionsAsync(RemovePermissionDto permissionDto);
 
     Task DispatchPermissions(DispatchPermissionsDto permissionDto, List<PermissionDefinition> permissionDefinition);
@@ -17,6 +17,11 @@ public interface IPermissionService
 
     List<IDictionary<string, object>> StructuringPermissions(List<LinPermission> permissions);
 
+    Task UpdateAsync(int id,PermissioCreateUpdateDto createUpdateDto);
+    Task CreateAsync(PermissioCreateUpdateDto createUpdateDto);
+
+    Task DeleteAsync(int id);
+
     Task<LinPermission> GetAsync(string permissionName);
 
 }

src/LinCms.Application.Contracts/Cms/Permissions/PermissioCreateUpdateDto.cs

@@ -0,0 +1,29 @@
+using LinCms.Entities;
+
+namespace LinCms.Cms.Permissions;
+
+public class PermissioCreateUpdateDto
+{
+
+    public PermissionType PermissionType { get; set; }
+
+    /// <summary>
+    /// 父级Id
+    /// </summary>
+    public long ParentId { get; set; }
+
+    /// <summary>
+    /// 所属权限、权限名称，例如：访问首页
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 后台路由
+    /// </summary>
+    public string Router { get; set; }
+
+    /// <summary>
+    ///  排序
+    /// </summary>
+    public int SortCode { get; set; }
+}

src/LinCms.Application.Contracts/Cms/Permissions/PermissionDto.cs

@@ -7,23 +7,23 @@ namespace LinCms.Cms.Permissions;
 
 public class PermissionDto : EntityDto<long>
 {
-    public string Name { get; set; }
-
-    public PermissionType PermissionType { get; set; }
-
     /// <summary>
     /// 父级Id
     /// </summary>
     public long ParentId { get; set; }
+    public string Name { get; set; }
+
+    public PermissionType PermissionType { get; set; }
 
     public string Router { get; set; }
 
 }
 
-public class PermissionTreeNode : PermissionNode
+public class PermissionTreeNode : TreeNode
 {
+    public int SortCode { get; set; }
     public string Router { get; set; }
-
+    public PermissionType PermissionType { get; set; }
     public DateTime? CreateTime { get; set; }
     public List<PermissionTreeNode> Children { get; set; }
 
@@ -34,16 +34,15 @@ public PermissionTreeNode()
 
 }
 
-public class PermissionNode
+public class TreeNode
 {
     public long Id { get; set; }
-    public PermissionType PermissionType { get; set; }
     public long ParentId { get; set; }
     public string Name { get; set; }
-    public List<PermissionNode> Children { get; set; }
+    public List<TreeNode> Children { get; set; }
 
-    public PermissionNode()
+    public TreeNode()
     {
-        Children = new List<PermissionNode>();
+        Children = new List<TreeNode>();
     }
 }

src/LinCms.Application/Cms/Permissions/PermissionProfile.cs

@@ -8,7 +8,8 @@ public class PermissionProfile : Profile
     public PermissionProfile()
     {
         CreateMap<LinPermission, PermissionDto>();
-        CreateMap<LinPermission, PermissionNode>();
+        CreateMap<LinPermission, TreeNode>();
         CreateMap<LinPermission, PermissionTreeNode>();
+        CreateMap<PermissioCreateUpdateDto, LinPermission>();
     }
 }

src/LinCms.Application/Cms/Permissions/PermissionService.cs

@@ -1,44 +1,18 @@
-using System;
-using System.Collections.Generic;
-using System.Dynamic;
-using System.Linq;
-using System.Threading.Tasks;
-using IGeekFan.FreeKit.Extras.FreeSql;
+using IGeekFan.FreeKit.Extras.FreeSql;
 using IGeekFan.FreeKit.Extras.Security;
 using LinCms.Common;
 using LinCms.Data;
 using LinCms.Entities;
 using LinCms.Security;
+using System;
+using System.Collections.Generic;
+using System.Dynamic;
+using System.Linq;
+using System.Security;
+using System.Threading.Tasks;
 
 namespace LinCms.Cms.Permissions;
 
-public class PermissionTreeBuilder
-{
-    public List<PermissionTreeNode> BuildTree(List<PermissionTreeNode> nodes)
-    {
-        var nodeDict = nodes.ToDictionary(n => n.Id);
-        List<PermissionTreeNode> roots = new List<PermissionTreeNode>();
-
-        foreach (var node in nodes)
-        {
-            if (node.ParentId == 0)  // 假定ParentId为0表示根节点
-            {
-                roots.Add(node);
-            }
-            else
-            {
-                if (nodeDict.TryGetValue(node.ParentId, out PermissionTreeNode parentNode))
-                {
-                    parentNode.Children.Add(node);
-                }
-            }
-        }
-
-        return roots;  // 返回森林中所有根节点的列表
-    }
-
-}
-
 public class PermissionService(IAuditBaseRepository<LinPermission, long> permissionRepository,
         IAuditBaseRepository<LinGroupPermission, long> groupPermissionRepository, ICurrentUser currentUser)
     : ApplicationService, IPermissionService
@@ -47,27 +21,25 @@ public class PermissionService(IAuditBaseRepository<LinPermission, long> permiss
 
     public async Task<List<PermissionTreeNode>> GetPermissionTreeNodes()
     {
-        var permissionList = await permissionRepository.Select.ToListAsync();
+        var permissionList = await permissionRepository.Select.OrderBy(r => r.SortCode).ToListAsync();
         var nodes = Mapper.Map<List<LinPermission>, List<PermissionTreeNode>>(permissionList);
-        return new PermissionTreeBuilder().BuildTree(nodes);
+        return new TreeBuilder().BuildPermissionTree(nodes);
     }
 
-
     /// <summary>
     /// 检查当前登录的用户的分组权限
     /// </summary>
-    /// <param name="module">模块</param>
     /// <param name="permission">权限名</param>
     /// <returns></returns>
-    public async Task<bool> CheckPermissionAsync(string module, string permission)
+    public async Task<bool> CheckPermissionAsync(string permission)
     {
         //默认Admin角色拥有所有权限
         if (CurrentUser.IsInGroup(LinConsts.Group.Admin)) return true;
         long[] groups = CurrentUser.FindGroupIds().Select(long.Parse).ToArray();
 
         LinPermission linPermission = await permissionRepository.Where(r => r.PermissionType == PermissionType.Permission && r.Name == permission).FirstAsync();
 
-        if (linPermission == null || groups == null || groups.Length == 0) return false;
+        if (linPermission == null || groups.Length == 0) return false;
 
         bool existPermission = await groupPermissionRepository.Select
             .AnyAsync(r => groups.Contains(r.GroupId) && r.PermissionId == linPermission.Id);
@@ -135,6 +107,23 @@ public List<IDictionary<string, object>> StructuringPermissions(List<LinPermissi
         return list;
     }
 
+    public async Task UpdateAsync(int id, PermissioCreateUpdateDto createUpdateDto)
+    {
+        LinPermission permission = await permissionRepository.GetAsync(id);
+        Mapper.Map(createUpdateDto, permission);
+        await permissionRepository.UpdateAsync(permission);
+    }
+
+    public async Task CreateAsync(PermissioCreateUpdateDto createUpdateDto)
+    {
+        await permissionRepository.UpdateAsync(Mapper.Map<LinPermission>(createUpdateDto));
+    }
+
+    public  async Task DeleteAsync(int id)
+    {
+        await permissionRepository.DeleteAsync(id);
+    }
+
     public Task<LinPermission> GetAsync(string permissionName)
     {
         return permissionRepository.Where(r => r.Name == permissionName).FirstAsync();

src/LinCms.Application/Cms/Permissions/TreeBuilder.cs

@@ -0,0 +1,51 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace LinCms.Cms.Permissions;
+
+public record TreeBuilder
+{
+    public List<PermissionTreeNode> BuildPermissionTree(List<PermissionTreeNode> nodes)
+    {
+        var nodeDict = nodes.ToDictionary(n => n.Id);
+        List<PermissionTreeNode> roots = new List<PermissionTreeNode>();
+
+        foreach (var node in nodes)
+        {
+            if (node.ParentId == 0)  // 假定ParentId为0表示根节点
+            {
+                roots.Add(node);
+            }
+            else
+            {
+                if (nodeDict.TryGetValue(node.ParentId, out PermissionTreeNode parentNode))
+                {
+                    parentNode.Children.Add(node);
+                }
+            }
+        }
+        return roots;  // 返回森林中所有根节点的列表
+    }
+
+    public List<TreeNode> BuildTree(List<TreeNode> nodes)
+    {
+        var nodeDict = nodes.ToDictionary(n => n.Id);
+        List<TreeNode> roots = new List<TreeNode>();
+
+        foreach (var node in nodes)
+        {
+            if (node.ParentId == 0)  // 假定ParentId为0表示根节点
+            {
+                roots.Add(node);
+            }
+            else
+            {
+                if (nodeDict.TryGetValue(node.ParentId, out TreeNode parentNode))
+                {
+                    parentNode.Children.Add(node);
+                }
+            }
+        }
+        return roots;  // 返回森林中所有根节点的列表
+    }
+}

src/LinCms.Application/LinCms.Application.csproj

@@ -36,8 +36,5 @@
 	  <PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
 	</ItemGroup>
 
-	<ItemGroup>
-	  <Folder Include="Cms\Admin\" />
-	</ItemGroup>
 
 </Project>

src/LinCms.Core/Entities/LinPermission.cs

@@ -39,6 +39,12 @@ public LinPermission(string name, PermissionType permissionType, string router)
         /// </summary>
         [Column(StringLength = 200)]
         public string Router { get; set; }
+
+        /// <summary>
+        ///  排序
+        /// </summary>
+        public int SortCode { get; set; }
+
     }
 
     public enum PermissionType