vue.admin: permission assign

anjoy8 · anjoy8 · commit 07779cbe8da3 · 2019-02-23T22:04:21.000+08:00
diff --git a/Blog.Core.Common/Helper/RecursionHelper.cs b/Blog.Core.Common/Helper/RecursionHelper.cs
@@ -34,7 +34,7 @@ public static void LoopToAppendChildren(List<PermissionTree> all, PermissionTree
 
             if (curItem.isbtn)
             {
-                curItem.label += "按钮";
+                //curItem.label += "按钮";
             }
 
             foreach (var subItem in subItems)
@@ -49,7 +49,7 @@ public static void LoopToAppendChildren(List<PermissionTree> all, PermissionTree
 
         public static void LoopToAppendChildrenT<T>(List<T> all, T curItem, string parentIdName = "Pid", string idName = "value", string childrenName = "children")
         {
-            var subItems = all.Where(ee => ee.GetType().GetProperty(parentIdName).GetValue(ee, null).ToString() == curItem.GetType().GetProperty(idName).GetValue(curItem, null).ToString()).ToList(); //新闻1
+            var subItems = all.Where(ee => ee.GetType().GetProperty(parentIdName).GetValue(ee, null).ToString() == curItem.GetType().GetProperty(idName).GetValue(curItem, null).ToString()).ToList(); 
 
             if (subItems.Count > 0) curItem.GetType().GetField(childrenName).SetValue(curItem, subItems);
             foreach (var subItem in subItems)
diff --git a/Blog.Core.Model/Models/Module.cs b/Blog.Core.Model/Models/Module.cs
@@ -96,7 +96,7 @@ public Module()
         /// 创建时间
         /// </summary>
         [SugarColumn(IsNullable = true)]
-        public DateTime CreateTime { get; set; }
+        public DateTime CreateTime { get; set; } = DateTime.Now;
         /// <summary>
         /// 修改ID
         /// </summary>
@@ -111,7 +111,7 @@ public Module()
         /// 修改时间
         /// </summary>
         [SugarColumn(IsNullable = true)]
-        public DateTime? ModifyTime { get; set; }
+        public DateTime? ModifyTime { get; set; } = DateTime.Now;
 
         //public virtual Module ParentModule { get; set; }
         //public virtual ICollection<Module> ChildModule { get; set; }
diff --git a/Blog.Core.Model/Models/Permission.cs b/Blog.Core.Model/Models/Permission.cs
@@ -75,7 +75,7 @@ public Permission()
         /// 创建时间
         /// </summary>
         [SugarColumn(IsNullable = true)]
-        public DateTime? CreateTime { get; set; }
+        public DateTime? CreateTime { get; set; } = DateTime.Now;
         /// <summary>
         /// 修改ID
         /// </summary>
@@ -90,7 +90,7 @@ public Permission()
         /// 修改时间
         /// </summary>
         [SugarColumn(IsNullable = true)]
-        public DateTime? ModifyTime { get; set; }
+        public DateTime? ModifyTime { get; set; } = DateTime.Now;
 
         /// <summary>
         ///获取或设置是否禁用，逻辑上的删除，非物理删除
diff --git a/Blog.Core.Model/Models/Role.cs b/Blog.Core.Model/Models/Role.cs
@@ -67,7 +67,7 @@ public Role(string name)
         /// 创建时间
         /// </summary>
         [SugarColumn( IsNullable = true)]
-        public DateTime? CreateTime { get; set; }
+        public DateTime? CreateTime { get; set; } = DateTime.Now;
         /// <summary>
         /// 修改ID
         /// </summary>
@@ -82,7 +82,7 @@ public Role(string name)
         /// 修改时间
         /// </summary>
         [SugarColumn( IsNullable = true)]
-        public DateTime? ModifyTime { get; set; }
+        public DateTime? ModifyTime { get; set; } = DateTime.Now;
 
 
     }
diff --git a/Blog.Core.Model/Models/RoleModulePermission.cs b/Blog.Core.Model/Models/RoleModulePermission.cs
@@ -10,9 +10,9 @@ public class RoleModulePermission : RootEntity
     {
         public RoleModulePermission()
         {
-            this.Role = new Role();
-            this.Module = new Module();
-            this.Permission = new Permission();
+            //this.Role = new Role();
+            //this.Module = new Module();
+            //this.Permission = new Permission();
 
         }
 
@@ -48,7 +48,7 @@ public RoleModulePermission()
         /// 创建时间
         /// </summary>
         [SugarColumn(IsNullable = true)]
-        public DateTime? CreateTime { get; set; }
+        public DateTime? CreateTime { get; set; } = DateTime.Now;
         /// <summary>
         /// 修改ID
         /// </summary>
@@ -63,14 +63,14 @@ public RoleModulePermission()
         /// 修改时间
         /// </summary>
         [SugarColumn(IsNullable = true)]
-        public DateTime? ModifyTime { get; set; }
+        public DateTime? ModifyTime { get; set; } = DateTime.Now;
 
         // 下边三个实体参数，只是做传参作用，所以忽略下
         [SugarColumn(IsIgnore = true)]
-        public virtual Role Role { get; set; }
+        public Role Role { get; set; }
         [SugarColumn(IsIgnore = true)]
-        public virtual Module Module { get; set; }
+        public Module Module { get; set; }
         [SugarColumn(IsIgnore = true)]
-        public virtual Permission Permission { get; set; }
+        public Permission Permission { get; set; }
     }
 }
diff --git a/Blog.Core.Repository/RoleModulePermissionRepository.cs b/Blog.Core.Repository/RoleModulePermissionRepository.cs
@@ -14,11 +14,11 @@ public class RoleModulePermissionRepository : BaseRepository<RoleModulePermissio
 
         public async Task<List<RoleModulePermission>> WithChildrenModel()
         {
-            var list = await Task.Run(() => Db.Queryable<RoleModulePermission>()
-                    .Mapper(it => it.Role, it => it.RoleId)
-                    .Mapper(it => it.Module, it => it.ModuleId).ToList());
+            //var list = await Task.Run(() => Db.Queryable<RoleModulePermission>()
+            //        .Mapper(it => it.Role, it => it.RoleId)
+            //        .Mapper(it => it.Module, it => it.ModuleId).ToList());
 
-            return list;
+            return null;
         }
 
     }
diff --git a/Blog.Core/Blog.Core.Model.xml b/Blog.Core/Blog.Core.Model.xml
diff --git a/Blog.Core/Blog.Core.xml b/Blog.Core/Blog.Core.xml
diff --git a/Blog.Core/Controllers/ClaimsController.cs b/Blog.Core/Controllers/ClaimsController.cs
@@ -8,7 +8,7 @@
 
 namespace Blog.Core.Controllers
 {
-    [Authorize("Permission")]
+    //[Authorize("Permission")]
     [Route("api/Claims")]
     [ApiController]
     public class ClaimsController : Controller
diff --git a/Blog.Core/Controllers/ModuleController.cs b/Blog.Core/Controllers/ModuleController.cs
@@ -13,7 +13,7 @@ namespace Blog.Core.Controllers
 {
     [Route("api/[controller]/[action]")]
     [ApiController]
-    //[Authorize("Permission")]
+    [Authorize("Permission")]
     public class ModuleController : ControllerBase
     {
         IModuleServices _ModuleServices;
diff --git a/Blog.Core/Controllers/PermissionController.cs b/Blog.Core/Controllers/PermissionController.cs
@@ -14,21 +14,24 @@ namespace Blog.Core.Controllers
 {
     [Route("api/[controller]/[action]")]
     [ApiController]
-    //[Authorize("Permission")]
+    [Authorize("Permission")]
     public class PermissionController : ControllerBase
     {
         IPermissionServices _PermissionServices;
         IModuleServices _ModuleServices;
+        IRoleModulePermissionServices _roleModulePermissionServices;
 
         /// <summary>
         /// 构造函数
         /// </summary>
         /// <param name="PermissionServices"></param>
         /// <param name="ModuleServices"></param>
-        public PermissionController(IPermissionServices PermissionServices, IModuleServices ModuleServices)
+        /// <param name="roleModulePermissionServices"></param>
+        public PermissionController(IPermissionServices PermissionServices, IModuleServices ModuleServices, IRoleModulePermissionServices roleModulePermissionServices)
         {
             _PermissionServices = PermissionServices;
             _ModuleServices = ModuleServices;
+            _roleModulePermissionServices = roleModulePermissionServices;
         }
 
         // GET: api/User
@@ -129,7 +132,59 @@ public async Task<MessageModel<string>> Post([FromBody] Permission Permission)
             return data;
         }
 
-        // POST: api/User
+
+        [HttpPost]
+        public async Task<MessageModel<string>> Assign([FromBody] AssignView assignView)
+        {
+            var data = new MessageModel<string>();
+
+            try
+            {
+                if (assignView.rid > 0)
+                {
+
+                    data.success = true;
+
+                    var roleModulePermissions = await _roleModulePermissionServices.Query(d => d.RoleId == assignView.rid);
+
+                    var remove = roleModulePermissions.Where(d => !assignView.pids.Contains(d.PermissionId.ObjToInt())).Select(c => (object)c.Id);
+                    data.success |= await _roleModulePermissionServices.DeleteByIds(remove.ToArray());
+
+                    foreach (var item in assignView.pids)
+                    {
+                        var rmpitem = roleModulePermissions.Where(d => d.PermissionId == item);
+                        if (rmpitem.Count() == 0)
+                        {
+                            var moduleid = (await _PermissionServices.Query(p => p.Id == item)).FirstOrDefault()?.Mid;
+                            RoleModulePermission roleModulePermission = new RoleModulePermission()
+                            {
+                                IsDeleted = false,
+                                RoleId = assignView.rid,
+                                ModuleId = moduleid.ObjToInt(),
+                                PermissionId = item,
+                            };
+
+                            data.success |= (await _roleModulePermissionServices.Add(roleModulePermission)) > 0;
+
+                        }
+                    }
+
+                    if (data.success)
+                    {
+                        data.response = "";
+                        data.msg = "保存成功";
+                    }
+
+                }
+            }
+            catch (Exception)
+            {
+                data.success = false;
+            }
+
+            return data;
+        }
+
         [HttpGet]
         public async Task<MessageModel<PermissionTree>> GetPermissionTree(int pid = 0, bool needbtn = false)
         {
@@ -164,6 +219,27 @@ orderby child.Id
         }
 
 
+        [HttpGet]
+        public async Task<MessageModel<List<int>>> GetPermissionIdByRoleId(int rid = 0)
+        {
+            var data = new MessageModel<List<int>>();
+
+            var permissions = await _roleModulePermissionServices.Query(d => d.IsDeleted == false && d.RoleId == rid);
+            var permissionTrees = (from child in permissions
+                                   orderby child.Id
+                                   select child.PermissionId.ObjToInt()).ToList();
+
+            data.success = true;
+            if (data.success)
+            {
+                data.response = permissionTrees.Distinct().ToList();
+                data.msg = "获取成功";
+            }
+
+            return data;
+        }
+
+
         // PUT: api/User/5
         [HttpPut]
         public async Task<MessageModel<string>> Put([FromBody] Permission Permission)
@@ -203,5 +279,10 @@ public async Task<MessageModel<string>> Delete(int id)
         }
     }
 
+    public class AssignView
+    {
+        public List<int> pids { get; set; }
+        public int rid { get; set; }
+    }
 
 }
diff --git a/Blog.Core/Controllers/RoleController.cs b/Blog.Core/Controllers/RoleController.cs
@@ -13,7 +13,7 @@ namespace Blog.Core.Controllers
 {
     [Route("api/[controller]/[action]")]
     [ApiController]
-    //[Authorize("Permission")]
+    [Authorize("Permission")]
     public class RoleController : ControllerBase
     {
         IRoleServices _roleServices;
diff --git a/Blog.Core/Controllers/UserController.cs b/Blog.Core/Controllers/UserController.cs
@@ -14,7 +14,7 @@ namespace Blog.Core.Controllers
 {
     [Route("api/[controller]/[action]")]
     [ApiController]
-    //[Authorize("Permission")]
+    [Authorize("Permission")]
     public class UserController : ControllerBase
     {
         IsysUserInfoServices _sysUserInfoServices;
diff --git a/Blog.Core/Controllers/UserRoleController.cs b/Blog.Core/Controllers/UserRoleController.cs
@@ -8,7 +8,7 @@ namespace Blog.Core.Controllers
     /// <summary>
     /// 用户权限控制器所有接口
     /// </summary>
-    [Authorize("Permission")]
+    //[Authorize("Permission")]
     [Produces("application/json")]
     [Route("api/[controller]/[action]")]
     [ApiController]
diff --git a/Blog.Core/Controllers/ValuesController.cs b/Blog.Core/Controllers/ValuesController.cs
@@ -20,7 +20,7 @@ namespace Blog.Core.Controllers
     //[Authorize]
     //[Authorize(Roles = "Admin,Client")]
     //[Authorize(Policy = "SystemOrAdmin")]
-    [Authorize("Permission")]
+    //[Authorize("Permission")]
     public class ValuesController : ControllerBase
     {
         private IMapper _mapper;

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public static void LoopToAppendChildren(List<PermissionTree> all, PermissionTree`
`34`	`34`
`35`	`35`	`if (curItem.isbtn)`
`36`	`36`	`{`
`37`		`- curItem.label += "按钮";`
	`37`	`+ //curItem.label += "按钮";`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`foreach (var subItem in subItems)`
`@@ -49,7 +49,7 @@ public static void LoopToAppendChildren(List<PermissionTree> all, PermissionTree`
`49`	`49`
`50`	`50`	`public static void LoopToAppendChildrenT<T>(List<T> all, T curItem, string parentIdName = "Pid", string idName = "value", string childrenName = "children")`
`51`	`51`	`{`
`52`		`- var subItems = all.Where(ee => ee.GetType().GetProperty(parentIdName).GetValue(ee, null).ToString() == curItem.GetType().GetProperty(idName).GetValue(curItem, null).ToString()).ToList(); //新闻1`
	`52`	`+ var subItems = all.Where(ee => ee.GetType().GetProperty(parentIdName).GetValue(ee, null).ToString() == curItem.GetType().GetProperty(idName).GetValue(curItem, null).ToString()).ToList();`
`53`	`53`
`54`	`54`	`if (subItems.Count > 0) curItem.GetType().GetField(childrenName).SetValue(curItem, subItems);`
`55`	`55`	`foreach (var subItem in subItems)`
Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,11 @@ public class RoleModulePermissionRepository : BaseRepository<RoleModulePermissio`
`14`	`14`
`15`	`15`	`public async Task<List<RoleModulePermission>> WithChildrenModel()`
`16`	`16`	`{`
`17`		`- var list = await Task.Run(() => Db.Queryable<RoleModulePermission>()`
`18`		`- .Mapper(it => it.Role, it => it.RoleId)`
`19`		`- .Mapper(it => it.Module, it => it.ModuleId).ToList());`
	`17`	`+ //var list = await Task.Run(() => Db.Queryable<RoleModulePermission>()`
	`18`	`+ // .Mapper(it => it.Role, it => it.RoleId)`
	`19`	`+ // .Mapper(it => it.Module, it => it.ModuleId).ToList());`
`20`	`20`
`21`		`- return list;`
	`21`	`+ return null;`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`namespace Blog.Core.Controllers`
`10`	`10`	`{`
`11`		`- [Authorize("Permission")]`
	`11`	`+ //[Authorize("Permission")]`
`12`	`12`	`[Route("api/Claims")]`
`13`	`13`	`[ApiController]`
`14`	`14`	`public class ClaimsController : Controller`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ namespace Blog.Core.Controllers`
`13`	`13`	`{`
`14`	`14`	`[Route("api/[controller]/[action]")]`
`15`	`15`	`[ApiController]`
`16`		`- //[Authorize("Permission")]`
	`16`	`+ [Authorize("Permission")]`
`17`	`17`	`public class ModuleController : ControllerBase`
`18`	`18`	`{`
`19`	`19`	`IModuleServices _ModuleServices;`