feat: 新增bbs排行榜功能

This commit is contained in:
橙子
2024-08-09 22:39:27 +08:00
parent b30e2f0cc0
commit 1c7486a7bc
8 changed files with 142 additions and 105 deletions

View File

@@ -5,9 +5,9 @@ namespace Yi.Framework.Bbs.Application.Contracts.Dtos.BbsUser;
public class MoneyTopUserDto
{
public string UserName { get; set; }
public string? Nice { get; set; }
public string? Nick { get; set; }
public decimal Money { get; set; }
public string Order { get; set; }
public int Order { get; set; }
public string? Icon { get; set; }
public int Level { get; set; }
/// <summary>

View File

@@ -19,6 +19,7 @@ namespace Yi.Framework.Bbs.Application.Services.Analyses
{
private BbsUserManager _bbsUserManager;
private IOnlineService _onlineService;
public BbsUserAnalyseService(BbsUserManager bbsUserManager, IOnlineService onlineService)
{
_bbsUserManager = bbsUserManager;
@@ -36,22 +37,24 @@ namespace Yi.Framework.Bbs.Application.Services.Analyses
{
RefAsync<int> total = 0;
var output = await _bbsUserManager._userRepository._DbQueryable
.LeftJoin<BbsUserExtraInfoEntity>((u,info)=>u.Id==info.UserId)
.LeftJoin<BbsUserExtraInfoEntity>((u, info) => u.Id == info.UserId)
.OrderByDescending((u,info) => info.Money)
.Select((u, info) =>
new MoneyTopUserDto
{
UserName = u.UserName,
Nice = u.Nick,
Nick = u.Nick,
Money = info.Money,
Icon = u.Icon,
Level = info.Level,
UserLimit = info.UserLimit
UserLimit = info.UserLimit,
Order = SqlFunc.RowNumber(u.Id)
}
)
.OrderBy(info=>info.Money)
.ToPageListAsync(input.SkipCount, input.MaxResultCount,total);
output.ForEach(x => { x.LevelName = _bbsUserManager._levelCacheDic[x.Level].Name;});
.ToPageListAsync(input.SkipCount, input.MaxResultCount, total);
output.ForEach(x => { x.LevelName = _bbsUserManager._levelCacheDic[x.Level].Name; });
return new PagedResultDto<MoneyTopUserDto>
{
Items = output,
@@ -71,10 +74,9 @@ namespace Yi.Framework.Bbs.Application.Services.Analyses
using (DataFilter.DisablePermissionHandler())
{
var randUserIds = await _bbsUserManager._userRepository._DbQueryable
//.Where(x => x.UserName != UserConst.Admin)
.OrderBy(x => SqlFunc.GetRandom())
.Select(x => x.Id).
ToPageListAsync(input.SkipCount, input.MaxResultCount);
//.Where(x => x.UserName != UserConst.Admin)
.OrderBy(x => SqlFunc.GetRandom())
.Select(x => x.Id).ToPageListAsync(input.SkipCount, input.MaxResultCount);
var output = await _bbsUserManager.GetBbsUserInfoAsync(randUserIds);
return output.Adapt<List<BbsUserGetListOutputDto>>();
@@ -83,26 +85,6 @@ namespace Yi.Framework.Bbs.Application.Services.Analyses
//这里有数据权限,会根据用户角色进行过滤
}
/// <summary>
/// 积分钱钱排行榜
/// </summary>
/// <returns></returns>
[HttpGet("analyse/bbs-user/integral-top")]
public async Task<List<BbsUserGetListOutputDto>> GetIntegralTopUserAsync([FromQuery] PagedResultRequestDto input)
{
using (DataFilter.DisablePermissionHandler())
{
var randUserIds = await _bbsUserManager._userRepository._DbQueryable
// .Where(user => user.UserName != UserConst.Admin)
.LeftJoin<BbsUserExtraInfoEntity>((user, info) => user.Id == info.UserId)
.OrderByDescending((user, info) => info.Money)
.Select((user, info) => user.Id).
ToPageListAsync(input.SkipCount, input.MaxResultCount);
var output = await _bbsUserManager.GetBbsUserInfoAsync(randUserIds);
return output.OrderByDescending(x => x.Money).ToList().Adapt<List<BbsUserGetListOutputDto>>();
}
}
/// <summary>
/// 用户分析
/// </summary>
@@ -112,7 +94,7 @@ namespace Yi.Framework.Bbs.Application.Services.Analyses
{
using (DataFilter.DisablePermissionHandler())
{
var sss= DataFilter.IsEnabled<IDataPermission>();
var sss = DataFilter.IsEnabled<IDataPermission>();
var registerUser = await _bbsUserManager._userRepository._DbQueryable.CountAsync();
@@ -121,16 +103,15 @@ namespace Yi.Framework.Bbs.Application.Services.Analyses
DateTime startTime = new DateTime(yesterday.Year, yesterday.Month, yesterday.Day, 0, 0, 0);
DateTime endTime = startTime.AddHours(24);
var yesterdayNewUser = await _bbsUserManager._userRepository._DbQueryable
.Where(x => x.CreationTime >= startTime && x.CreationTime <= endTime).CountAsync();
.Where(x => x.CreationTime >= startTime && x.CreationTime <= endTime).CountAsync();
var userOnline = (await _onlineService.GetListAsync(new OnlineUserModel { })).TotalCount;
var output = new BbsUserAnalyseGetOutput() { OnlineNumber = userOnline, RegisterNumber = registerUser, YesterdayNewUser = yesterdayNewUser };
var output = new BbsUserAnalyseGetOutput()
{ OnlineNumber = userOnline, RegisterNumber = registerUser, YesterdayNewUser = yesterdayNewUser };
return output;
}
}
}
}
}