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

fix: 修复头像字段

Browse Source
This commit is contained in:
橙子
2023-12-25 21:41:37 +08:00
parent 006679ce5d
commit 547b8b0f91
4 changed files with 97 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Analyses/BbsDisucssAnalyseService.cs
View File

@@ -1,58 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Application.Services;
using Yi.Framework.Bbs.Application.Contracts.Dtos.BbsUser;
using Yi.Framework.Bbs.Domain.Managers;
using Yi.Framework.Rbac.Domain.Shared.Consts;
namespace Yi.Framework.Bbs.Application.Services.Analyses
{
public class BbsUserAnalyseService : ApplicationService, IApplicationService
{
private BbsUserManager _bbsUserManager;
public BbsUserAnalyseService(BbsUserManager bbsUserManager)
{
_bbsUserManager = bbsUserManager;
}
/// <summary>
/// 推荐好友，随机返回好友列表
/// </summary>
/// <returns></returns>
[HttpGet("analyse/bbs-user/random")]
public async Task<List<BbsUserGetListOutputDto>> GetRandomUserAsync([FromQuery] PagedResultRequestDto input)
{
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);
var output = await _bbsUserManager.GetBbsUserInfoAsync(randUserIds);
return output.Adapt<List<BbsUserGetListOutputDto>>();
}
/// <summary>
/// 积分排行榜
/// </summary>
/// <returns></returns>
[HttpGet("analyse/bbs-user/integral-top")]
public async Task<List<BbsUserGetListOutputDto>> GetIntegralTopUserAsync([FromQuery] PagedResultRequestDto input)
{
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);
var output = await _bbsUserManager.GetBbsUserInfoAsync(randUserIds);
return output.Adapt<List<BbsUserGetListOutputDto>>();
}
}
}

59
Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Analyses/BbsForumAnalyseService.cs Normal file
View File

@@ -0,0 +1,59 @@
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Application.Services;
using Yi.Framework.Bbs.Application.Contracts.Dtos.BbsUser;
using Yi.Framework.Bbs.Application.Contracts.Dtos.Discuss;
using Yi.Framework.Bbs.Domain.Entities;
using Yi.Framework.Bbs.Domain.Managers;
using Yi.Framework.Bbs.Domain.Shared.Enums;
using Yi.Framework.Rbac.Domain.Entities;
using Yi.Framework.Rbac.Domain.Shared.Consts;
using Yi.Framework.SqlSugarCore.Abstractions;
namespace Yi.Framework.Bbs.Application.Services.Analyses
{
public class BbsForumAnalyseService : ApplicationService, IApplicationService
{
private ForumManager _forumManager;
public BbsForumAnalyseService(ForumManager forumManager)
{
_forumManager = forumManager;
}
/// <summary>
/// 推荐主题，随机返回主题列表
/// </summary>
/// <returns></returns>
[HttpGet("analyse/bbs-discuss/random")]
public async Task<List<DiscussGetListOutputDto>> GetRandomDiscussAsync([FromQuery] PagedResultRequestDto input)
{
var output = await _forumManager._discussRepository._DbQueryable
.Where(discuss=>discuss.PermissionType== DiscussPermissionTypeEnum.Public)
.LeftJoin<UserEntity>((discuss, user) => discuss.CreatorId == user.Id)
.LeftJoin<BbsUserExtraInfoEntity>((discuss, user, info) => user.Id == info.UserId)
.OrderBy(x => SqlFunc.GetRandom())
.Select((discuss, user, info) => new DiscussGetListOutputDto
{
Id = discuss.Id,
IsAgree = SqlFunc.Subqueryable<AgreeEntity>().WhereIF(CurrentUser.Id != null, x => x.CreatorId == CurrentUser.Id && x.DiscussId == discuss.Id).Any(),
User = new BbsUserGetListOutputDto()
{
Id = user.Id,
UserName = user.UserName,
Nick = user.Nick,
Icon = user.Icon,
Level = info.Level,
UserLimit = info.UserLimit
}
}, true)
.ToPageListAsync(input.SkipCount, input.MaxResultCount);
return output;
}
}
}

73
Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Analyses/BbsUserAnalyseService.cs
View File

@@ -1,59 +1,58 @@
using Microsoft.AspNetCore.Mvc; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using SqlSugar; using SqlSugar;
using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Dtos;
using Volo.Abp.Application.Services; using Volo.Abp.Application.Services;
using Yi.Framework.Bbs.Application.Contracts.Dtos.BbsUser; using Yi.Framework.Bbs.Application.Contracts.Dtos.BbsUser;
using Yi.Framework.Bbs.Application.Contracts.Dtos.Discuss;
using Yi.Framework.Bbs.Domain.Entities;
using Yi.Framework.Bbs.Domain.Managers; using Yi.Framework.Bbs.Domain.Managers;
using Yi.Framework.Bbs.Domain.Shared.Enums;
using Yi.Framework.Rbac.Domain.Entities;
using Yi.Framework.Rbac.Domain.Shared.Consts; using Yi.Framework.Rbac.Domain.Shared.Consts;
using Yi.Framework.SqlSugarCore.Abstractions;
namespace Yi.Framework.Bbs.Application.Services.Analyses namespace Yi.Framework.Bbs.Application.Services.Analyses
{ {
public class BbsForumAnalyseService : ApplicationService, IApplicationService public class BbsUserAnalyseService : ApplicationService, IApplicationService
{ {
private ForumManager _forumManager; private BbsUserManager _bbsUserManager;
public BbsForumAnalyseService(ForumManager forumManager) public BbsUserAnalyseService(BbsUserManager bbsUserManager)
{ {
_forumManager = forumManager; _bbsUserManager = bbsUserManager;
} }
/// <summary> /// <summary>
/// 推荐主题，随机返回主题列表 /// 推荐好友，随机返回好友列表
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet("analyse/bbs-discuss/random")] [HttpGet("analyse/bbs-user/random")]
public async Task<List<DiscussGetListOutputDto>> GetRandomDiscussAsync([FromQuery] PagedResultRequestDto input) public async Task<List<BbsUserGetListOutputDto>> GetRandomUserAsync([FromQuery] PagedResultRequestDto input)
{ {
var output = await _forumManager._discussRepository._DbQueryable var randUserIds = await _bbsUserManager._userRepository._DbQueryable
.Where(discuss=>discuss.PermissionType== DiscussPermissionTypeEnum.Public) .Where(x => x.UserName != UserConst.Admin)
.LeftJoin<UserEntity>((discuss, user) => discuss.CreatorId == user.Id) .OrderBy(x => SqlFunc.GetRandom())
.LeftJoin<BbsUserExtraInfoEntity>((discuss, user, info) => user.Id == info.UserId) .Select(x => x.Id).
ToPageListAsync(input.SkipCount, input.MaxResultCount);
.OrderBy(x => SqlFunc.GetRandom()) var output = await _bbsUserManager.GetBbsUserInfoAsync(randUserIds);
.Select((discuss, user, info) => new DiscussGetListOutputDto return output.Adapt<List<BbsUserGetListOutputDto>>();
{
Id = discuss.Id,
IsAgree = SqlFunc.Subqueryable<AgreeEntity>().WhereIF(CurrentUser.Id != null, x => x.CreatorId == CurrentUser.Id && x.DiscussId == discuss.Id).Any(),
User = new BbsUserGetListOutputDto()
{
Id = user.Id,
UserName = user.UserName,
Nick = user.Nick,
Icon = user.Icon,
Level = info.Level,
UserLimit = info.UserLimit
}
}, true)
.ToPageListAsync(input.SkipCount, input.MaxResultCount);
return output;
} }
/// <summary>
/// 积分排行榜
/// </summary>
/// <returns></returns>
[HttpGet("analyse/bbs-user/integral-top")]
public async Task<List<BbsUserGetListOutputDto>> GetIntegralTopUserAsync([FromQuery] PagedResultRequestDto input)
{
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);
var output = await _bbsUserManager.GetBbsUserInfoAsync(randUserIds);
return output.Adapt<List<BbsUserGetListOutputDto>>();
}
} }
} }

4
Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/BbsUserManager.cs
View File

@@ -25,7 +25,7 @@ namespace Yi.Framework.Bbs.Domain.Managers
public async Task<BbsUserInfoDto?> GetBbsUserInfoAsync(Guid userId) public async Task<BbsUserInfoDto?> GetBbsUserInfoAsync(Guid userId)
{ {
return await _userRepository._DbQueryable.LeftJoin<BbsUserExtraInfoEntity>((user, info) => user.Id == info.Id) return await _userRepository._DbQueryable.LeftJoin<BbsUserExtraInfoEntity>((user, info) => user.Id == info.Id)
.Select((user, info) => new BbsUserInfoDto { Id = user.Id }, true) .Select((user, info) => new BbsUserInfoDto { Id = user.Id ,Icon=user.Icon}, true)
.FirstAsync(user => user.Id==userId); .FirstAsync(user => user.Id==userId);
} }
@@ -34,7 +34,7 @@ namespace Yi.Framework.Bbs.Domain.Managers
return await _userRepository._DbQueryable return await _userRepository._DbQueryable
.Where(user => userIds.Contains(user.Id)) .Where(user => userIds.Contains(user.Id))
.LeftJoin<BbsUserExtraInfoEntity>((user, info) => user.Id == info.Id) .LeftJoin<BbsUserExtraInfoEntity>((user, info) => user.Id == info.Id)
.Select((user, info) => new BbsUserInfoDto { Id = user.Id },true) .Select((user, info) => new BbsUserInfoDto { Id = user.Id , Icon = user.Icon },true)
.ToListAsync(); .ToListAsync();
} }