增加撤销与启动，详见：#I3ILBG

调整工程结构，采用模块化机制
2025-09-19 18:22:11 +08:00 · 2021-04-15 00:40:30 +08:00
parent 484daa48f0
commit cf23d0025f
86 changed files with 3032 additions and 2819 deletions
--- a/OpenAuth.App/Relevance/Request/AssignDataReq.cs
+++ b/OpenAuth.App/Relevance/Request/AssignDataReq.cs
@@ -0,0 +1,21 @@
+namespace OpenAuth.App.Request
+{
+    /// <summary>
+    /// 为角色分配数据字段权限
+    /// </summary>
+    public class AssignDataReq
+    {
+        /// <summary>
+        /// 角色ID
+        /// </summary>
+        public string RoleId { get; set; }
+        /// <summary>
+        /// 模块的Code,比如Category/Resource
+        /// </summary>
+        public string ModuleCode { get; set; }
+        /// <summary>
+        /// 字段名称列表
+        /// </summary>
+        public string[] Properties { get; set; }
+    }
+}
--- a/OpenAuth.App/Relevance/Request/AssignOrgUsers.cs
+++ b/OpenAuth.App/Relevance/Request/AssignOrgUsers.cs
@@ -0,0 +1,17 @@
+namespace OpenAuth.App.Request
+{
+    /// <summary>
+    /// 部门分配用户
+    /// </summary>
+    public class AssignOrgUsers
+    {
+        /// <summary>
+        /// 部门id
+        /// </summary>
+        public string OrgId { get; set; }
+        /// <summary>
+        /// 用户id列表
+        /// </summary>
+        public string[] UserIds { get; set; }
+    }
+}
--- a/OpenAuth.App/Relevance/Request/AssignReq.cs
+++ b/OpenAuth.App/Relevance/Request/AssignReq.cs
@@ -0,0 +1,18 @@
+namespace OpenAuth.App.Request
+{
+    /// <summary>
+    /// 比如给用户分配资源，那么firstId就是用户ID，secIds就是资源ID列表
+    /// </summary>
+    public class AssignReq
+    {
+        /// <summary>
+        /// 分配的关键字，比如：UserRole
+        /// </summary>
+        public string type { get; set; }
+        /// <summary>
+        /// 比如给用户分配角色，那么firstId就是用户ID，secIds就是角色ID列表
+        /// </summary>
+        public string firstId { get; set; }
+        public string[] secIds { get; set; }
+    }
+}
--- a/OpenAuth.App/Relevance/Request/AssignRoleUsers.cs
+++ b/OpenAuth.App/Relevance/Request/AssignRoleUsers.cs
@@ -0,0 +1,17 @@
+namespace OpenAuth.App.Request
+{
+    /// <summary>
+    /// 角色分配用户
+    /// </summary>
+    public class AssignRoleUsers
+    {
+        /// <summary>
+        /// 角色id
+        /// </summary>
+        public string RoleId { get; set; }
+        /// <summary>
+        /// 用户id列表
+        /// </summary>
+        public string[] UserIds { get; set; }
+    }
+}
--- a/OpenAuth.App/Relevance/RevelanceManagerApp.cs
+++ b/OpenAuth.App/Relevance/RevelanceManagerApp.cs
@@ -0,0 +1,238 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Infrastructure;
+using Microsoft.Extensions.Logging;
+using OpenAuth.App.Interface;
+using OpenAuth.App.Request;
+using OpenAuth.Repository;
+using OpenAuth.Repository.Domain;
+using OpenAuth.Repository.Interface;
+
+namespace OpenAuth.App
+{
+    public class RevelanceManagerApp : BaseStringApp<Relevance,OpenAuthDBContext>
+    {
+        private readonly ILogger<RevelanceManagerApp> _logger;
+        public RevelanceManagerApp(IUnitWork<OpenAuthDBContext> unitWork, IRepository<Relevance,OpenAuthDBContext> repository, IAuth auth, ILogger<RevelanceManagerApp> logger) : base(unitWork,
+            repository, auth)
+        {
+            _logger = logger;
+        }
+
+        /// <summary>
+        /// 添加关联
+        /// <para>比如给用户分配资源，那么firstId就是用户ID，secIds就是资源ID列表</para>
+        /// </summary>
+        /// <param name="type">关联的类型，如Define.USERRESOURCE</param>
+        public void Assign(AssignReq request)
+        {
+            Assign(request.type, request.secIds.ToLookup(u => request.firstId));
+        }
+
+        /// <summary>
+        /// 添加关联，需要人工删除以前的关联
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="idMaps"></param>
+        public void Assign(string key, ILookup<string, string> idMaps)
+        {
+            UnitWork.BatchAdd((from sameVals in idMaps
+                from value in sameVals
+                select new Relevance
+                {
+                    Key = key,
+                    FirstId = sameVals.Key,
+                    SecondId = value,
+                    OperateTime = DateTime.Now
+                }).ToArray());
+            UnitWork.Save();
+        }
+
+        /// <summary>
+        /// 取消关联
+        /// </summary>
+        /// <param name="type">关联的类型，如Define.USERRESOURCE</param>
+        /// <param name="firstId">The first identifier.</param>
+        /// <param name="secIds">The sec ids.</param>
+        public void UnAssign(AssignReq req)
+        {
+            if (req.secIds == null || req.secIds.Length == 0)
+            {
+                DeleteBy(req.type, req.firstId);
+            }
+            else
+            {
+                DeleteBy(req.type, req.secIds.ToLookup(u => req.firstId));
+            }
+        }
+
+        /// <summary>
+        /// 删除关联
+        /// </summary>
+        /// <param name="key">关联标识</param>
+        /// <param name="idMaps">关联的&lt;firstId, secondId&gt;数组</param>
+        private void DeleteBy(string key, ILookup<string, string> idMaps)
+        {
+            foreach (var sameVals in idMaps)
+            {
+                foreach (var value in sameVals)
+                {
+                    _logger.LogInformation($"start=> delete {key} {sameVals.Key} {value}");
+                    try
+                    {
+                        UnitWork.Delete<Relevance>(u => u.Key == key && u.FirstId == sameVals.Key && u.SecondId == value);
+                    }
+                    catch (Exception e)
+                    {
+                        _logger.LogError(e,e.Message);
+                    }
+                    _logger.LogInformation($"end=> {key} {sameVals.Key} {value}");
+                }
+            }
+        }
+
+        public void DeleteBy(string key, params string[] firstIds)
+        {
+            UnitWork.Delete<Relevance>(u => firstIds.Contains(u.FirstId) && u.Key == key);
+        }
+
+
+        /// <summary>
+        /// 根据关联表的一个键获取另外键的值
+        /// </summary>
+        /// <param name="key">映射标识</param>
+        /// <param name="returnSecondIds">返回的是否为映射表的第二列，如果不是则返回第一列</param>
+        /// <param name="ids">已知的ID列表</param>
+        /// <returns>List&lt;System.String&gt;.</returns>
+        public List<string> Get(string key, bool returnSecondIds, params string[] ids)
+        {
+            if (returnSecondIds)
+            {
+                return Repository.Find(u => u.Key == key
+                                            && ids.Contains(u.FirstId)).Select(u => u.SecondId).ToList();
+            }
+            else
+            {
+                return Repository.Find(u => u.Key == key
+                                            && ids.Contains(u.SecondId)).Select(u => u.FirstId).ToList();
+            }
+        }
+
+        /// <summary>
+        /// 根据key ,firstId,secondId获取thirdId
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="firstId"></param>
+        /// <param name="secondId"></param>
+        /// <returns></returns>
+        public List<string> Get(string key, string firstId, string secondId)
+        {
+            return Repository.Find(u => u.Key == key && u.FirstId == firstId && u.SecondId == secondId)
+                .Select(u => u.ThirdId).ToList();
+        }
+
+        /// <summary>
+        /// 分配数据字段权限
+        /// </summary>
+        /// <param name="request"></param>
+        public void AssignData(AssignDataReq request)
+        {
+            if (!request.Properties.Any())
+            {
+                return;
+            }
+
+            var relevances = new List<Relevance>();
+            foreach (var requestProperty in request.Properties)
+            {
+                relevances.Add(new Relevance
+                {
+                    Key = Define.ROLEDATAPROPERTY,
+                    FirstId = request.RoleId,
+                    SecondId = request.ModuleCode,
+                    ThirdId = requestProperty,
+                    OperateTime = DateTime.Now
+                });
+            }
+
+            UnitWork.BatchAdd(relevances.ToArray());
+            UnitWork.Save();
+        }
+
+        /// <summary>
+        /// 取消数据字段分配
+        /// </summary>
+        /// <param name="request"></param>
+        public void UnAssignData(AssignDataReq request)
+        {
+            if (request.Properties == null || request.Properties.Length == 0)
+            {
+                if (string.IsNullOrEmpty(request.ModuleCode)) //模块为空，直接把角色的所有授权删除
+                {
+                    DeleteBy(Define.ROLEDATAPROPERTY, request.RoleId);
+                }
+                else //把角色的某一个模块权限全部删除
+                {
+                    DeleteBy(Define.ROLEDATAPROPERTY, new[] {request.ModuleCode}.ToLookup(u => request.RoleId));
+                }
+            }
+            else //按具体的id删除
+            {
+                foreach (var property in request.Properties)
+                {
+                    UnitWork.Delete<Relevance>(u => u.Key == Define.ROLEDATAPROPERTY
+                                                    && u.FirstId == request.RoleId
+                                                    && u.SecondId == request.ModuleCode
+                                                    && u.ThirdId == property);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 为角色分配用户，需要统一提交，会删除以前该角色的所有用户
+        /// </summary>
+        /// <param name="request"></param>
+        public void AssignRoleUsers(AssignRoleUsers request)
+        {
+            UnitWork.ExecuteWithTransaction(() =>
+            {
+                //删除以前的所有用户
+                UnitWork.Delete<Relevance>(u => u.SecondId == request.RoleId && u.Key == Define.USERROLE);
+                //批量分配用户角色
+                UnitWork.BatchAdd((from firstId in request.UserIds
+                    select new Relevance
+                    {
+                        Key = Define.USERROLE,
+                        FirstId = firstId,
+                        SecondId = request.RoleId,
+                        OperateTime = DateTime.Now
+                    }).ToArray());
+                UnitWork.Save();
+            });
+        }
+
+        /// <summary>
+        /// 为部门分配用户，需要统一提交，会删除以前该部门的所有用户
+        /// </summary>
+        /// <param name="request"></param>
+        public void AssignOrgUsers(AssignOrgUsers request)
+        {
+            UnitWork.ExecuteWithTransaction(() =>
+            {
+                //删除以前的所有用户
+                UnitWork.Delete<Relevance>(u => u.SecondId == request.OrgId && u.Key == Define.USERORG);
+                //批量分配用户角色
+                UnitWork.BatchAdd((from firstId in request.UserIds
+                    select new Relevance
+                    {
+                        Key = Define.USERORG,
+                        FirstId = firstId,
+                        SecondId = request.OrgId,
+                        OperateTime = DateTime.Now
+                    }).ToArray());
+                UnitWork.Save();
+            });
+        }
+    }
+}