xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

实现接口

Browse Source
This commit is contained in:
lzw
2021-10-12 21:44:50 +08:00
parent 1761e8845f
commit d159cce849
6 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Yi.Framework/Yi.Framework.Interface/IMenuService.cs
View File

@@ -20,7 +20,7 @@ namespace Yi.Framework.Interface
Task<mould> GetMouldByMenu(menu _menu); Task<mould> GetMouldByMenu(menu _menu);
/// <summary> /// <summary>
/// 通过menu得到他自己与mould（注意：确保返回的menu里含有menu） /// 通过menu得到他自己与mould（注意：确保返回的menu里含有mould）
/// </summary> /// </summary>
/// <param name="_menu"></param> /// <param name="_menu"></param>
/// <returns></returns> /// <returns></returns>

1
Yi.Framework/Yi.Framework.Interface/IRoleService.cs
View File

@@ -33,5 +33,6 @@ namespace Yi.Framework.Interface
/// <param name="menuId"></param> /// <param name="menuId"></param>
/// <returns></returns> /// <returns></returns>
Task<bool> SetMenusByRolesId(List<int> menuIds, int roleId); Task<bool> SetMenusByRolesId(List<int> menuIds, int roleId);
} }
} }

14
Yi.Framework/Yi.Framework.Service/MenuService.cs
View File

@@ -27,22 +27,22 @@ namespace Yi.Framework.Service
public async Task<List<menu>> GetChildrenByMenu(menu _menu) public async Task<List<menu>> GetChildrenByMenu(menu _menu)
{ {
var menu_data = await GetEntity(u=>u.id==_menu.id); var menu_data = await GetEntity(u=>u.id==_menu.id&& u.is_delete == (short)Common.Enum.DelFlagEnum.Normal);
var childrenList = menu_data.children; var childrenList = menu_data.children.ToList();
return (List<menu>)childrenList; return childrenList;
} }
public async Task<menu> GetMenuMouldByMenu(menu _menu) public async Task<menu> GetMenuMouldByMenu(menu _menu)
{ {
var menu_data = await GetEntity(u => u.id == _menu.id); var menu_data = await GetEntityById(_menu.id);
return menu_data; return menu_data;
} }
public async Task<mould> GetMouldByMenu(menu _menu) public async Task<mould> GetMouldByMenu(menu _menu)
{ {
var menu_data = await GetEntity(u => u.id == _menu.id); var menu_data =await _Db.Set<menu>().Include(u => u.mould)
var mould_data =await _Db.Set<mould>().Include(u => u.menu).Where(u => u.menu == menu_data).FirstOrDefaultAsync(); .Where(u => u.id == _menu.id & u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync();
return mould_data; return menu_data.mould;
} }
public async Task<bool> SetMouldByMenu(int mouldId, int menuId) public async Task<bool> SetMouldByMenu(int mouldId, int menuId)

5
Yi.Framework/Yi.Framework.Service/MouldService.cs
View File

@@ -27,9 +27,8 @@ namespace Yi.Framework.Service
public async Task<menu> GetMenuByMould(mould _mould) public async Task<menu> GetMenuByMould(mould _mould)
{ {
var mould_data =await GetEntity(u => u.id ==_mould.id); var mould_data= await _Db.Set<mould>().Include(u=>u.menu).Where(u => u.id == _mould.id&& u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync();
return await _Db.Set<menu>().Where(u => u.mould == mould_data).FirstOrDefaultAsync(); return mould_data.menu;
//return mould_data.menu;
} }
} }
} }

13
Yi.Framework/Yi.Framework.Service/RoleService.cs
View File

@@ -27,14 +27,17 @@ namespace Yi.Framework.Service
} }
public async Task<List<menu>> GetMenusByRole(role _role) public async Task<List<menu>> GetMenusByRole(role _role)
{ {
return await _Db.Set<menu>().Include(u=>u.mould).ThenInclude(u=>u.menu) var role_data =await _Db.Set<role>().Include(u => u.menus)
.Where(u=>u.roles.Contains(_role)&& u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToListAsync(); .Where(u => u.id == _role.id && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync();
return role_data.menus.ToList();
} }
public async Task<List<user>> GetUsersByRole(role _role) public async Task<List<user>> GetUsersByRole(role _role)
{ {
return await _Db.Set<user>().Where(u => u.roles.Contains(_role) && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToListAsync(); var role_data = await _Db.Set<role>().Include(u => u.users)
.Where(u => u.id == _role.id && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync();
return role_data.users.ToList();
} }
public async Task<bool> SetMenusByRolesId(List<int> menuIds, int roleId) public async Task<bool> SetMenusByRolesId(List<int> menuIds, int roleId)
@@ -46,7 +49,7 @@ namespace Yi.Framework.Service
} }
var menuList = _Db.Set<menu>().Where(u => menuIds.Contains(u.id)&&u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToListAsync(); var menuList = _Db.Set<menu>().Where(u => menuIds.Contains(u.id)&&u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToListAsync();
role_data.menus = (ICollection<menu>)menuList; role_data.menus = (ICollection<menu>)menuList;
return await AddAsync(role_data); return await AddAsync(role_data);
} }
} }

21
Yi.Framework/Yi.Framework.Service/UserService.cs
View File

@@ -30,20 +30,24 @@ namespace Yi.Framework.Service
public async Task<List<menu>> GetMenusByUser(user _user) public async Task<List<menu>> GetMenusByUser(user _user)
{ {
return await _Db.Set<menu>().Include(u => u.roles).ThenInclude(u => u.menus) var user_data= await _Db.Set<user>().Include(u => u.roles).ThenInclude(u => u.menus)
.Where(u=>u.id==_user.id&& u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToListAsync(); .Where(u=>u.id==_user.id&& u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync();
var menuList= user_data.roles.Select(u => u.menus);
return (List<menu>)menuList;
} }
public async Task<List<mould>> GetMouldByUser(user _user) public async Task<List<mould>> GetMouldByUser(user _user)
{ {
return await _Db.Set<mould>().Include(u => u.menu) var user_data = await GetEntity(u => u.id == _user.id && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal);
.Where(u => u.id == _user.id && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToListAsync(); var menu = await GetMenusByUser(user_data);
var mouldList = menu.Select(u=>u.mould);
return (List<mould>)mouldList;
} }
public async Task<List<role>> GetRolesByUser(user _user) public async Task<List<role>> GetRolesByUser(user _user)
{ {
return await _Db.Set<role>().Include(u => u.users) var user_data = await GetEntity(u => u.id == _user.id && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal);
.Where(u => u.id == _user.id && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToListAsync(); return (List<role>)user_data.roles;
} }
public async Task<bool> Login(user _user) public async Task<bool> Login(user _user)
@@ -75,7 +79,8 @@ namespace Yi.Framework.Service
{ {
return false; return false;
} }
var roleList = _Db.Set<role>().Where(u => roleIds.Contains(u.id)).ToList(); var roleList = _Db.Set<role>().Where(u => roleIds.Contains(u.id)).ToList();
user_data.roles = roleList; user_data.roles = roleList;
return await AddAsync(user_data); return await AddAsync(user_data);
} }