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

重构user控制器

Browse Source
This commit is contained in:
lzw
2021-10-27 23:03:56 +08:00
parent 7c255f383a
commit 9d83b24a8d
9 changed files with 102 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,7 @@ namespace Yi.Framework.Service
public partial class UserService : BaseService<user>, IUserService
{
private IRoleService _roleService;
short Normal = (short)Common.Enum.DelFlagEnum.Normal;
public UserService(IDbContextFactory DbFactory, IRoleService roleService) : base(DbFactory)
{
_roleService = roleService;
@@ -30,147 +31,46 @@ namespace Yi.Framework.Service
}
return false;
}
/// <summary>
/// 大优化，直接传用户id即可
///
/// </summary>
/// <param name="_user"></param>
/// <param name="userId"></param>
/// <returns></returns>
public async Task<List<menu>> GetMenusByUser(user _user)
public async Task<user> GetUserById(int userId)
{
var role_data = await GetRolesByUser(_user);
var menuList = new List<menu>();
role_data.ForEach(u =>
return await _Db.Set<user>().Include(u => u.roles).ThenInclude(u => u.menus).ThenInclude(u => u.children).ThenInclude(u => u.mould).Where(u=>u.id==userId).FirstOrDefaultAsync();
}
public async Task<List<menu>> GetAxiosByRouter(string router, int userId, List<int> menuIds)
{
var user_data =await GetUserById(userId);
List<menu> menuList = new();
foreach(var item in user_data.roles)
{
var menu_data = _roleService.GetMenusByRole(u);
menuList = menuList.Concat(menu_data.GetAwaiter().GetResult()).ToList();
});
menuList.ForEach(u => u.roles = null);
return menuList;
}
/// <summary>
/// 大优化只用id即可，这个方法和GetMenusByUser几乎没有任何区别
/// </summary>
/// <param name="_user"></param>
/// <returns></returns>
public async Task<List<mould>> GetMouldByUser(user _user)
{
var menu = await GetMenusByUser(_user);
var mouldList = menu.Select(u => u.mould).ToList();
return mouldList;
}
public async Task<List<role>> GetRolesByUser(user _user)
{
var user_data = await _Db.Set<user>().Include(u => u.roles)
.Where(u => u.id == _user.id && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync();
var roleList = user_data.roles.Where(u => u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToList();
roleList.ForEach(u => u.users = null);
return roleList;
}
public async Task<user> Login(user _user)
{
var user_data = await _Db.Set<user>().Include(u => u.roles).Where(u => u.username == _user.username && u.password == _user.password &&
u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync();
return user_data;
}
public async Task<bool> Register(user _user)
{
var user_data = await GetEntity(u => u.username == _user.username);
if (user_data != null)
{
return false;
var m= item.menus.Where(u => u.router.ToUpper() == router.ToUpper()).FirstOrDefault();
menuList= m.children.Where(u => menuIds.Contains(u.id)&&u.is_delete==Normal).ToList();
if (m != null) { break; }
}
return await AddAsync(_user);
}
return menuList;
}
/// <summary>
/// 优化，如果是传的id，或者是传一个对象，不是要返回全部信息，那么可知直接认为该id一定存在
/// </summary>
/// <param name="roleIds"></param>
/// <param name="userIds"></param>
/// <returns></returns>
public async Task<bool> SetRolesByUser(List<int> roleIds, List<int> userIds)
public async Task<List<menu>> GetMenuByHttpUser(int userId)
{
var user_data = await _Db.Set<user>().Include(u => u.roles).Where(u => userIds.Contains(u.id) ).ToListAsync();
if (user_data == null)
var user_data = await GetUserById(userId);
List<menu> menuList = new();
foreach (var item in user_data.roles)
{
return false;
}
var roleList = await _Db.Set<role>().Where(u => roleIds.Contains(u.id)).ToListAsync();
foreach (var item in user_data)
{
item.roles = roleList;
}
return await UpdateListAsync(user_data);
}
/// <summary>
/// 有可简化的GetUserById
/// </summary>
/// <param name="_user"></param>
/// <returns></returns>
public async Task<List<menu>> GetMenuByUser(user _user)
{
var user_data = await _Db.Set<user>().Include(u => u.roles).ThenInclude(u => u.menus).Where(u => u.id == _user.id ).FirstOrDefaultAsync();
List<menu> menu_data = new();
foreach (var role in user_data.roles)
{
var menu = role.menus.ToList();
menu.ForEach(u => u.roles = null);
menu_data = menu_data.Concat(menu).ToList();
}
return menu_data;
}
public async Task<user> GetUserInfoById(int user_id)
{
var user_data = await GetUserById(user_id);
user_data.roles.ToList().ForEach(u => u.users = null);
return user_data;
}
/// <summary>
/// 这个方法可以被超级多个其他方法利用，这个是重要的
/// </summary>
/// <param name="user_id"></param>
/// <returns></returns>
public async Task<user> GetUserById(int user_id)
{
var user_data = await _Db.Set<user>().Include(u => u.roles)
.Where(u => u.id == user_id && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync();
return user_data;
}
/// <summary>
/// 有可简化的GetUserById
/// </summary>
/// <param name="user_id"></param>
/// <returns></returns>
public async Task<List<menu>> GetMenuById(int user_id)
{
var user_data = await _Db.Set<user>().Include(u => u.roles).Where(u => u.id == user_id).FirstOrDefaultAsync();
List<menu> menu_data = new();
foreach (var role in user_data.roles)
{
var menu = await _roleService.GetMenusByRole(role);
menu.ForEach(u => u.roles = null);
menu_data = menu_data.Union(menu).OrderByDescending(u => u.sort).ToList();
var m = item.menus.Where(u => u.is_delete == Normal).ToList();
menuList = menuList.Union(m).OrderByDescending(u => u.sort).ToList();
}
//menu_data为角色所有的菜单，不是一个递归的啊
var allMenuIds = menu_data.Select(u => u.id).ToList();
var topMenu = menu_data.Where(u => u.is_top == (short)Common.Enum.ShowFlagEnum.Show);
var allMenuIds = menuList.Select(u => u.id).ToList();
var topMenu = menuList.Where(u => u.is_top == (short)Common.Enum.ShowFlagEnum.Show);
//现在要开始关联菜单了
List<menu> endMenu = new List<menu>();
List<menu> endMenu = new();
foreach (var item in topMenu)
{
var p = await _Db.Set<menu>().Where(u => u.id == item.id).Include(u => u.children).ThenInclude(u => u.children).ThenInclude(u => u.children).ThenInclude(u => u.children).ThenInclude(u => u.children).ToListAsync();
@@ -221,7 +121,7 @@ namespace Yi.Framework.Service
{
if (menu_data[i].children.Count() == 0)
{
menu_data[i].children = null;f
menu_data[i].children = null;
}
else if (menu_data[i].children != null)
{
@@ -230,24 +130,35 @@ namespace Yi.Framework.Service
}
return menu_data;
}
public async Task<List<menu>> GetMenuByUserId(string router, int userId, List<int> menuIds)
public async Task<user> GetUserInRolesByHttpUser(int userId)
{
var user_data = await _Db.Set<user>().Include(u => u.roles).ThenInclude(u => u.menus).ThenInclude(u => u.children)
.ThenInclude(u => u.mould).Where(u => u.id == userId).FirstOrDefaultAsync();
var roleList = user_data.roles.ToList();
roleList.ForEach(u => u.users = null);
List<menu> menu_data = new();
foreach (var item in roleList)
return await GetUserById(userId);
}
public async Task<user> Login(user _user)
{
var user_data = await _Db.Set<user>().Include(u => u.roles).Where(u => u.username == _user.username && u.password ==_user.password &&u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync();
return user_data;
}
public async Task<bool> Register(user _user)
{
var user_data = await GetEntity(u => u.username == _user.username);
if (user_data != null)
{
item.menus.ToList().ForEach(u => u.roles = null);
var menuData = item.menus.Where(u => u.router.ToUpper() == router.ToUpper()).FirstOrDefault();
menu_data = menuData.children?.Where(u => menuIds.Contains(u.id) && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToList();
if (menu_data != null) { break; }
return false;
}
return menu_data;
return await AddAsync(_user);
}
public async Task<bool> SetRoleByUser(List<int> roleIds, List<int> userIds)
{
var user_data = await _Db.Set<user>().Include(u => u.roles).Where(u => userIds.Contains(u.id)).ToListAsync();
var roleList = await _Db.Set<role>().Where(u => roleIds.Contains(u.id)).ToListAsync();
user_data.ForEach(u => u.roles = roleList);
return await UpdateListAsync(user_data);
}
}
}