From cdd9e8f45b6aa6dca18caae4cd8224d3422a304d Mon Sep 17 00:00:00 2001 From: lzw <605106923@qq.com> Date: Sat, 16 Oct 2021 23:17:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=8F=9C=E5=8D=95Top?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/MenuController.cs | 3 ++- .../Yi.Framework.ApiMicroservice/YIDB.db | Bin 65536 -> 65536 bytes .../Models/Enum/TopFlagEnum.cs | 14 ++++++++++++++ .../Yi.Framework.Interface/IMenuService.cs | 14 ++++++++++++++ .../Yi.Framework.Service/MenuService.cs | 17 ++++++++++++++++- 5 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 Yi.Framework/Yi.Framework.Common/Models/Enum/TopFlagEnum.cs diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs index 3a4aebfc..40cff08b 100644 --- a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs +++ b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs @@ -26,7 +26,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers [HttpGet] public async Task GetMenu() { - return Result.Success().SetData(await _menuService.GetMenuMouldByMenu( new menu())); + return Result.Success().SetData(await _menuService.GetTopMenu()); } /// @@ -62,6 +62,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers [HttpPost] public async Task AddMenu(menu _menu) { + _menu.is_top = (short)Common.Enum.TopFlagEnum.Top; await _menuService.AddAsync(_menu); return Result.Success(); } diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db b/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db index 819a767cf0b14de7625f22adbe4716a57579ebd5..85be485f61d53ccb16ea9cdb6e5a46cc55119517 100644 GIT binary patch delta 174 zcmYk$p$>vj7>41)L)hk$3Y$e`N(ZUcQ42{P+2H^H1k5=J)4!<~QTl { Task DelListByUpdateAsync(List _ids); + /// + /// 获取所有菜单 + /// + /// Task> GetAllEntitiesTrueAsync(); /// @@ -46,5 +50,15 @@ namespace Yi.Framework.Interface /// /// Task AddChildrenMenu(menu _menu, menu _children); + /// + /// 获取根目录菜单 + /// + /// + Task> GetTopMenu(); + /// + /// 获取子菜单 + /// + /// + Task> GetChildrenMenu(); } } diff --git a/Yi.Framework/Yi.Framework.Service/MenuService.cs b/Yi.Framework/Yi.Framework.Service/MenuService.cs index ccea412f..96999a96 100644 --- a/Yi.Framework/Yi.Framework.Service/MenuService.cs +++ b/Yi.Framework/Yi.Framework.Service/MenuService.cs @@ -16,6 +16,7 @@ namespace Yi.Framework.Service public async Task AddChildrenMenu(menu _menu, menu _children) { 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); return menu_data; @@ -30,7 +31,7 @@ namespace Yi.Framework.Service public async Task> GetAllEntitiesTrueAsync() { - return await GetEntitiesAsync(u => u.is_delete == (short)Common.Enum.DelFlagEnum.Normal); + return await GetEntitiesAsync(u=> u.is_delete == (short)Common.Enum.DelFlagEnum.Normal); } public async Task> GetChildrenByMenu(menu _menu) @@ -40,6 +41,13 @@ namespace Yi.Framework.Service return childrenList; } + public async Task> GetChildrenMenu() + { + return await _Db.Set().Include(u => u.children) + .Where(u => u.is_delete == (short)Common.Enum.DelFlagEnum.Normal&& u.is_top == (short)Common.Enum.TopFlagEnum.Children ) + .ToListAsync(); + } + 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(); @@ -53,6 +61,13 @@ namespace Yi.Framework.Service return menu_data.mould; } + public async Task> GetTopMenu() + { + return await _Db.Set().Include(u => u.children) + .Where(u => u.is_delete == (short)Common.Enum.DelFlagEnum.Normal && u.is_top == (short)Common.Enum.TopFlagEnum.Top) + .ToListAsync(); + } + public async Task SetMouldByMenu(int mouldId, int menuId) { var menu_data = await GetEntity(u => u.id == menuId);