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

Merge branch 'abp' of https://gitee.com/ccnetcore/Yi into abp

Browse Source
This commit is contained in:
Xwen
2024-01-04 21:04:53 +08:00
parent 60a36ee5f0 aa8eb5d389
commit 7ca101e5dd
5 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/Article/ArticleImprotDto.cs
View File

@@ -19,6 +19,6 @@ namespace Yi.Framework.Bbs.Application.Contracts.Dtos.Article
public Guid ArticleParentId { get; set; }= Guid.Empty; public Guid ArticleParentId { get; set; }= Guid.Empty;
public ArticleImportTypeEnum ImportType { get; set; } = ArticleImportTypeEnum.Defalut; public ArticleImportTypeEnum ImportType { get; set; } = ArticleImportTypeEnum.Default;
} }
} }

5
Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/BbsUser/BbsUserAnalyseGetOutput.cs
View File

@@ -18,5 +18,10 @@ namespace Yi.Framework.Bbs.Application.Contracts.Dtos.BbsUser
/// 在线人数 /// 在线人数
/// </summary> /// </summary>
public long OnlineNumber { get; set; } public long OnlineNumber { get; set; }
/// <summary>
/// 昨天新增用户
/// </summary>
public long YesterdayNewUser { get; set; }
} }
} }

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

@@ -18,7 +18,7 @@ namespace Yi.Framework.Bbs.Application.Services.Analyses
public BbsUserAnalyseService(BbsUserManager bbsUserManager, IOnlineService onlineService) public BbsUserAnalyseService(BbsUserManager bbsUserManager, IOnlineService onlineService)
{ {
_bbsUserManager = bbsUserManager; _bbsUserManager = bbsUserManager;
_onlineService= onlineService; _onlineService = onlineService;
} }
/// <summary> /// <summary>
@@ -63,8 +63,17 @@ namespace Yi.Framework.Bbs.Application.Services.Analyses
var registerUser = await _bbsUserManager._userRepository._DbQueryable.CountAsync(); var registerUser = await _bbsUserManager._userRepository._DbQueryable.CountAsync();
var userOnline =( await _onlineService.GetListAsync(new OnlineUserModel { })).TotalCount;
var output = new BbsUserAnalyseGetOutput() { OnlineNumber = userOnline, RegisterNumber = registerUser }; DateTime now = DateTime.Now;
DateTime yesterday = now.AddDays(-1);
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();
var userOnline = (await _onlineService.GetListAsync(new OnlineUserModel { })).TotalCount;
var output = new BbsUserAnalyseGetOutput() { OnlineNumber = userOnline, RegisterNumber = registerUser, YesterdayNewUser = yesterdayNewUser };
return output; return output;
} }

2
Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain.Shared/Enums/ArticleImportTypeEnum.cs
View File

@@ -8,7 +8,7 @@ namespace Yi.Framework.Bbs.Domain.Shared.Enums
public enum ArticleImportTypeEnum public enum ArticleImportTypeEnum
{ {
[Description("默认导入方式")] [Description("默认导入方式")]
Defalut, Default,
[Description("vuePresss方式")] [Description("vuePresss方式")]
VuePress VuePress

2
Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ForumManager.cs
View File

@@ -57,7 +57,7 @@ namespace Yi.Framework.Bbs.Domain.Managers
AbstractArticleImport abstractArticleImport = default; AbstractArticleImport abstractArticleImport = default;
switch (importType) switch (importType)
{ {
case ArticleImportTypeEnum.Defalut: case ArticleImportTypeEnum.Default:
abstractArticleImport = new DefaultArticleImport(); abstractArticleImport = new DefaultArticleImport();
break; break;