From f7cebdbce6b6612a5bc81eec0c8f07346b34d0f6 Mon Sep 17 00:00:00 2001 From: lzw <605106923@qq.com> Date: Tue, 19 Oct 2021 14:50:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8E=A7=E5=88=B6=E5=99=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/MenuController.cs | 4 +-- .../Controllers/UserController.cs | 23 ++++++++++++++++++ .../Yi.Framework.ApiMicroservice/YIDB.db | Bin 65536 -> 65536 bytes .../Yi.Framework.ApiMicroservice/YIDB.db-shm | Bin 0 -> 32768 bytes .../Yi.Framework.ApiMicroservice/YIDB.db-wal | Bin 0 -> 86552 bytes .../Yi.Framework.Interface/IMenuService.cs | 2 +- .../Yi.Framework.Interface/IUserService.cs | 6 +++++ .../Yi.Framework.Service/MenuService.cs | 7 +++--- .../Yi.Framework.Service/UserService.cs | 9 +++++-- 9 files changed, 43 insertions(+), 8 deletions(-) create mode 100644 Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-shm create mode 100644 Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-wal diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs index 0b746043..39cf7e08 100644 --- a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs +++ b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs @@ -27,7 +27,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers public async Task GetMenu() { - return Result.Success().SetData(await _menuService.GetMenuMould()); + return Result.Success().SetData(await _menuService.GetAllEntitiesTrueAsync()); } /// @@ -105,7 +105,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers public async Task AddChildrenMenu(ChildrenDto childrenDto) { - var _children= await _menuService.AddChildrenMenu(new menu() { id=childrenDto.parentId}, childrenDto.data); + var _children= await _menuService.AddChildrenMenu(childrenDto.parentId, childrenDto.data); return Result.Success(); } /// diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs index 0b1f374b..5f2225d9 100644 --- a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs +++ b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs @@ -108,6 +108,29 @@ namespace Yi.Framework.ApiMicroservice.Controllers var roleList = await _userService.GetRolesByUser(_user); return Result.Success().SetData(roleList); } + /// + /// 根据用户id得到该用户有哪些角色 + /// + /// + [HttpGet] + public async Task GetRolesByUserId(int user_id) + { + var _user =await _userService.GetEntityById(user_id); + var roleList = await _userService.GetRolesByUser(_user); + return Result.Success().SetData(roleList); + } + /// + /// 根据http上下文的用户得到该用户信息，关联角色 + /// + /// + [HttpGet] + public async Task GetUserInfoById() + { + var _user = HttpContext.GetCurrentUserInfo(); + return Result.Success().SetData(await _userService.GetUserInfoById(_user.id)); + } + + } } diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db b/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db index f084e71bbfc4f2793b42572ec571c0ae6734dd82..ce65e2c6cf84ebb1b446089c7cab020962e55839 100644 GIT binary patch delta 179 zcmZo@U})hQET%;KO4UczZky&(6}vp zLafY;jG9^?Qe6{FYD`u-{|Km5e=_?8pi)bI6MlW5(#w4OEX)jyS|CCbL}+ZbyMIUl E0M{2Lwg3PC delta 73 zcmZo@U})hQGN46e`N(`b#CFw>;?Xt1qJqUZ5FQn=)$bduQZwc07&Ev-(-RF ZER)sF-vbKTO=iCU5`4k8+3x-!1puJ(8X^Dy diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-shm b/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-shm new file mode 100644 index 0000000000000000000000000000000000000000..41e182bc95dd14e1bdfdb866ed34f33dd9d12f52 GIT binary patch literal 32768 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 literal 0 HcmV?d00001 diff --git a/Yi.Framework/Yi.Framework.Interface/IMenuService.cs b/Yi.Framework/Yi.Framework.Interface/IMenuService.cs index e0d24536..4e7e7357 100644 --- a/Yi.Framework/Yi.Framework.Interface/IMenuService.cs +++ b/Yi.Framework/Yi.Framework.Interface/IMenuService.cs @@ -49,7 +49,7 @@ namespace Yi.Framework.Interface /// /// /// - Task AddChildrenMenu(menu _menu, menu _children); + Task AddChildrenMenu(int menu_id, menu _children); /// /// 获取根目录菜单 /// diff --git a/Yi.Framework/Yi.Framework.Interface/IUserService.cs b/Yi.Framework/Yi.Framework.Interface/IUserService.cs index 8a60b2c9..b0160e82 100644 --- a/Yi.Framework/Yi.Framework.Interface/IUserService.cs +++ b/Yi.Framework/Yi.Framework.Interface/IUserService.cs @@ -63,5 +63,11 @@ namespace Yi.Framework.Interface /// /// Task> GetMenuByUser(user _user); + /// + /// 通过用户id，得到该用户的所有信息，关联角色 + /// + /// + /// + Task GetUserInfoById(int user_id); } } diff --git a/Yi.Framework/Yi.Framework.Service/MenuService.cs b/Yi.Framework/Yi.Framework.Service/MenuService.cs index 0da06e45..0a73b762 100644 --- a/Yi.Framework/Yi.Framework.Service/MenuService.cs +++ b/Yi.Framework/Yi.Framework.Service/MenuService.cs @@ -11,9 +11,9 @@ namespace Yi.Framework.Service { public partial class MenuService:BaseService, IMenuService { - public async Task AddChildrenMenu(menu _menu, menu _children) + public async Task AddChildrenMenu(int menu_id, menu _children) { - var menu_data = await _Db.Set().Include(u => u.children).Where(u => u.id == _menu.id).FirstOrDefaultAsync(); + var menu_data = await _Db.Set().Include(u => u.children).Where(u => u.id == menu_id).FirstOrDefaultAsync(); _children.is_top = (short)Common.Enum.TopFlagEnum.Children; menu_data.children.Add(_children); await UpdateAsync(menu_data); @@ -58,7 +58,8 @@ namespace Yi.Framework.Service public async Task GetMenuMouldByMenu(menu _menu) { - var menu_data = await _Db.Set().Include(u => u.children).Include(u=>u.mould).Where(u=>u.id==_menu.id).FirstOrDefaultAsync(); + var menu_data = await _Db.Set().Include(u => u.children).Include(u=>u.mould) + .Where(u=>u.id==_menu.id&& u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync(); return menu_data; } diff --git a/Yi.Framework/Yi.Framework.Service/UserService.cs b/Yi.Framework/Yi.Framework.Service/UserService.cs index b41af503..31835bb8 100644 --- a/Yi.Framework/Yi.Framework.Service/UserService.cs +++ b/Yi.Framework/Yi.Framework.Service/UserService.cs @@ -113,6 +113,11 @@ namespace Yi.Framework.Service } return menu_data; } - - } + public async Task GetUserInfoById(int user_id) + { + var user_data=await _Db.Set().Include(u=>u.roles) + .Where(u => u.id == user_id && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync(); + return user_data; + } + } }