From eebafda9e53eb5e5d1ef02c3d2700ec7f4099f51 Mon Sep 17 00:00:00 2001 From: chenchun <454313500@qq.com> Date: Sat, 10 Sep 2022 13:36:01 +0800 Subject: [PATCH] =?UTF-8?q?db=E6=9F=A5=E8=AF=A2=E5=AF=B9=E8=B1=A1=E7=AE=80?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/TestController.cs | 3 ++- Yi.Framework.Net6/Yi.Framework.Service/LogService.cs | 2 +- Yi.Framework.Net6/Yi.Framework.Service/MenuService.cs | 2 +- Yi.Framework.Net6/Yi.Framework.Service/RoleService.cs | 2 +- Yi.Framework.Net6/Yi.Framework.Service/UserService.cs | 8 ++++---- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/TestController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/TestController.cs index a4a78aa9..9bd99c92 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/TestController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/TestController.cs @@ -63,8 +63,9 @@ namespace Yi.Framework.ApiMicroservice.Controllers //还行，直接切换其他仓储，怎么爽怎么来 await _iUserService._repository.ChangeRepository>().GetListAsync(); - //最好不要直接操作Db对象 + //最好不要在控制器直接操作Db对象 await _iUserService._repository._Db.Queryable().ToListAsync(); + await _iUserService._repository._DbQueryable.ToListAsync(); return Result.Success().SetData(await _iUserService.DbTest()); } diff --git a/Yi.Framework.Net6/Yi.Framework.Service/LogService.cs b/Yi.Framework.Net6/Yi.Framework.Service/LogService.cs index 045568fe..992e978d 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/LogService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/LogService.cs @@ -17,7 +17,7 @@ namespace Yi.Framework.Service public async Task> GetListTest() { - return await _repository._Db.Queryable().SplitTable(tas => tas.Where(u => u.TableName.Contains("2020") || u.TableName.Contains("2021"))).ToListAsync(); + return await _repository._DbQueryable.SplitTable(tas => tas.Where(u => u.TableName.Contains("2020") || u.TableName.Contains("2021"))).ToListAsync(); } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Service/MenuService.cs b/Yi.Framework.Net6/Yi.Framework.Service/MenuService.cs index 014dde7f..9448fa44 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/MenuService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/MenuService.cs @@ -12,7 +12,7 @@ namespace Yi.Framework.Service { public async Task> SelctGetList(MenuEntity menu) { - var data = await _repository._Db.Queryable() + var data = await _repository._DbQueryable .WhereIF(!string.IsNullOrEmpty(menu.MenuName), u => u.MenuName.Contains(menu.MenuName)) .Where(u => u.IsDeleted == false) .OrderBy(u => u.OrderNum, OrderByType.Desc) diff --git a/Yi.Framework.Net6/Yi.Framework.Service/RoleService.cs b/Yi.Framework.Net6/Yi.Framework.Service/RoleService.cs index 6e0f68ea..0bd24471 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/RoleService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/RoleService.cs @@ -54,7 +54,7 @@ namespace Yi.Framework.Service public async Task>> SelctPageList(RoleEntity role, PageParModel page) { RefAsync total = 0; - var data = await _repository._Db.Queryable() + var data = await _repository._DbQueryable .WhereIF(!string.IsNullOrEmpty(role.RoleName), u => u.RoleName.Contains(role.RoleName)) .WhereIF(!string.IsNullOrEmpty(role.RoleCode), u => u.RoleCode.Contains(role.RoleCode)) .WhereIF(page.StartTime.IsNotNull() && page.EndTime.IsNotNull(), u => u.CreateTime >= page.StartTime && u.CreateTime <= page.EndTime) diff --git a/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs b/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs index 4799fc57..3906b4e7 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs @@ -72,7 +72,7 @@ namespace Yi.Framework.Service public async Task> GetListInRole() { - return await _repository._Db.Queryable().Includes(u => u.Roles).ToListAsync(); + return await _repository._DbQueryable.Includes(u => u.Roles).ToListAsync(); } public async Task GiveUserSetRole(List userIds, List roleIds) @@ -105,7 +105,7 @@ namespace Yi.Framework.Service public async Task> GetRoleListByUserId(long userId) { - return (await _repository._Db.Queryable().Includes(u => u.Roles).InSingleAsync(userId)).Roles; + return (await _repository._DbQueryable.Includes(u => u.Roles).InSingleAsync(userId)).Roles; } public async Task GetUserAllInfo(long userId) @@ -115,7 +115,7 @@ namespace Yi.Framework.Service //首先获取到该用户全部信息，导航到角色、菜单，(菜单需要去重,完全交给Set来处理即可) //得到用户 - var user = await _repository._Db.Queryable().Includes(u => u.Roles.Where(r => r.IsDeleted == false).ToList(), r => r.Menus.Where(m => m.IsDeleted == false).ToList()).InSingleAsync(userId); + var user = await _repository._DbQueryable.Includes(u => u.Roles.Where(r => r.IsDeleted == false).ToList(), r => r.Menus.Where(m => m.IsDeleted == false).ToList()).InSingleAsync(userId); //得到角色集合 var roleList = user.Roles; @@ -168,7 +168,7 @@ namespace Yi.Framework.Service public async Task>> SelctPageList(UserEntity user, PageParModel page) { RefAsync total = 0; - var data = await _repository._Db.Queryable() + var data = await _repository._DbQueryable .WhereIF(!string.IsNullOrEmpty(user.UserName), u => u.UserName.Contains(user.UserName)) .WhereIF(!string.IsNullOrEmpty(user.Name), u => u.Name.Contains(user.Name)) .WhereIF(!string.IsNullOrEmpty(user.Phone), u => u.Phone.Contains(user.Phone))