From 26495a974d7adc4566ec096226cace79e2bf6b76 Mon Sep 17 00:00:00 2001 From: lzw <605106923@qq.com> Date: Sat, 23 Oct 2021 18:46:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/UserController.cs | 8 +- .../Yi.Framework.Interface/IUserService.cs | 7 + .../Yi.Framework.Model/DbInit/DataSeed.cs | 140 +++++++++++++++++- .../Yi.Framework.Service/UserService.cs | 5 + 4 files changed, 156 insertions(+), 4 deletions(-) diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs index 77a34597..2eec5b16 100644 --- a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs +++ b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs @@ -139,9 +139,11 @@ namespace Yi.Framework.ApiMicroservice.Controllers public async Task GetRouterByUserId( AxiosUrlsModel urlsModel,string router) { var _user = HttpContext.GetCurrentUserInfo(); - var menuList= await _userService.GetMenuById(_user.id); - var menu_data= menuList.Where(u => u.router == router).FirstOrDefault(); - foreach(var _menu in menu_data.children) + var menuList = await _userService.GetMenuById(_user.id); + //var menu_data= await _userService.GetMenuByUserId(router); + var menu_data =menuList.Where(u=>u.router==router).FirstOrDefault(); + + foreach (var _menu in menu_data.children) if (_menu.mould.mould_name == "get") { urlsModel.get= _menu.mould.url; diff --git a/Yi.Framework/Yi.Framework.Interface/IUserService.cs b/Yi.Framework/Yi.Framework.Interface/IUserService.cs index a4e07ea3..3c66e0b0 100644 --- a/Yi.Framework/Yi.Framework.Interface/IUserService.cs +++ b/Yi.Framework/Yi.Framework.Interface/IUserService.cs @@ -81,5 +81,12 @@ namespace Yi.Framework.Interface /// /// Task> GetMenuById(int user_id); + /// + /// 根据路由获取菜单 + /// + /// + /// + Task GetMenuByUserId(string router); + } } diff --git a/Yi.Framework/Yi.Framework.Model/DbInit/DataSeed.cs b/Yi.Framework/Yi.Framework.Model/DbInit/DataSeed.cs index b15c61b0..bff9b22e 100644 --- a/Yi.Framework/Yi.Framework.Model/DbInit/DataSeed.cs +++ b/Yi.Framework/Yi.Framework.Model/DbInit/DataSeed.cs @@ -66,8 +66,146 @@ namespace Yi.Framework.Model.DbInit } } } + }, + new menu() + { + menu_name="角色管理",router="/admrole", is_show=1,children=new List() + { + new menu() + { + menu_name="get",is_show=0, + mould=new mould() + { + mould_name="get",url="/role/getrole" + } + }, + new menu() + { + menu_name="update",is_show=0, + mould=new mould() + { + mould_name="update",url="/role/updaterole" + } + }, + new menu() + { + menu_name="del",is_show=0, + mould=new mould() + { + mould_name="del",url="/role/dellistrole" + } + }, + new menu() + { + menu_name="add",is_show=0, + mould=new mould() + { + mould_name="del",url="/role/addroler" + } + } + } } - } + } + + }, + new menu() + { + menu_name="角色接口管理",is_show=1,children=new List() + { + new menu() + { + menu_name="菜单管理",router="/AdmMenu", is_show=1,children=new List() + { + new menu() + { + menu_name="get",is_show=0, + mould=new mould() + { + mould_name="get",url="/Menu/getMenu" + } + }, + new menu() + { + menu_name="update",is_show=0, + mould=new mould() + { + mould_name="update",url="/Menu/updateMenu" + } + }, + new menu() + { + menu_name="del",is_show=0, + mould=new mould() + { + mould_name="del",url="/Menu/dellistMenu" + } + }, + new menu() + { + menu_name="add",is_show=0, + mould=new mould() + { + mould_name="del",url="/Menu/addMenu" + } + } + } + }, + new menu() + { + menu_name="接口管理",router="/admMould", is_show=1,children=new List() + { + new menu() + { + menu_name="get",is_show=0, + mould=new mould() + { + mould_name="get",url="/Mould/getMould" + } + }, + new menu() + { + menu_name="update",is_show=0, + mould=new mould() + { + mould_name="update",url="/Mould/updateMould" + } + }, + new menu() + { + menu_name="del",is_show=0, + mould=new mould() + { + mould_name="del",url="/Mould/dellistMould" + } + }, + new menu() + { + menu_name="add",is_show=0, + mould=new mould() + { + mould_name="del",url="/Mould/addMould" + } + } + } + }, + new menu() + { + menu_name="角色菜单分配管理",router="/admRoleMenu", is_show=1,children=null + } + } + + }, + new menu() + { + menu_name="路由管理",is_show=1,children=new List() + { + new menu() + { + menu_name="用户信息",router="/userinfo", is_show=1,children=null + + } + } + } } } diff --git a/Yi.Framework/Yi.Framework.Service/UserService.cs b/Yi.Framework/Yi.Framework.Service/UserService.cs index 3a732794..f42f34ae 100644 --- a/Yi.Framework/Yi.Framework.Service/UserService.cs +++ b/Yi.Framework/Yi.Framework.Service/UserService.cs @@ -169,5 +169,10 @@ namespace Yi.Framework.Service } return menu_data; } + public async Task GetMenuByUserId(string router) + { + return await _Db.Set().Include(u => u.children).ThenInclude(u => u.mould) + .Where(u => u.router==router&&u.is_delete == (short)Common.Enum.DelFlagEnum.Normal && u.is_delete == (short)Common.Enum.ShowFlagEnum.Show).FirstOrDefaultAsync(); + } } }