From 599d33b8223284e3aab8a02ab4b3ff8677b43806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Thu, 4 Jan 2024 20:58:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=98=A8=E5=A4=A9=E6=96=B0=E5=A2=9E=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dtos/Article/ArticleImprotDto.cs              |  2 +-
 .../Dtos/BbsUser/BbsUserAnalyseGetOutput.cs       |  5 +++++
 .../Services/Analyses/BbsUserAnalyseService.cs    | 15 ++++++++++++---
 .../Enums/ArticleImportTypeEnum.cs                |  2 +-
 .../Managers/ForumManager.cs                      |  2 +-
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/Article/ArticleImprotDto.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/Article/ArticleImprotDto.cs
index 98e8ba3d..9adb2ac5 100644
--- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/Article/ArticleImprotDto.cs
+++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/Article/ArticleImprotDto.cs
@@ -19,6 +19,6 @@ namespace Yi.Framework.Bbs.Application.Contracts.Dtos.Article
 
         public Guid ArticleParentId { get; set; }= Guid.Empty;
 
-        public ArticleImportTypeEnum ImportType { get; set; } = ArticleImportTypeEnum.Defalut;
+        public ArticleImportTypeEnum ImportType { get; set; } = ArticleImportTypeEnum.Default;
 }
 }
diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/BbsUser/BbsUserAnalyseGetOutput.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/BbsUser/BbsUserAnalyseGetOutput.cs
index bba3a652..34edba67 100644
--- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/BbsUser/BbsUserAnalyseGetOutput.cs
+++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/BbsUser/BbsUserAnalyseGetOutput.cs
@@ -18,5 +18,10 @@ namespace Yi.Framework.Bbs.Application.Contracts.Dtos.BbsUser
         /// 在线人数
         /// </summary>
         public long OnlineNumber { get; set; }
+
+        /// <summary>
+        /// 昨天新增用户
+        /// </summary>
+        public long YesterdayNewUser { get; set; }
     }
 }
diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Analyses/BbsUserAnalyseService.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Analyses/BbsUserAnalyseService.cs
index de463a0f..e7d46205 100644
--- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Analyses/BbsUserAnalyseService.cs
+++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Analyses/BbsUserAnalyseService.cs
@@ -18,7 +18,7 @@ namespace Yi.Framework.Bbs.Application.Services.Analyses
         public BbsUserAnalyseService(BbsUserManager bbsUserManager, IOnlineService onlineService)
         {
             _bbsUserManager = bbsUserManager;
-            _onlineService= onlineService;
+            _onlineService = onlineService;
         }
 
         /// <summary>
@@ -63,8 +63,17 @@ namespace Yi.Framework.Bbs.Application.Services.Analyses
 
             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;
         }
diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain.Shared/Enums/ArticleImportTypeEnum.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain.Shared/Enums/ArticleImportTypeEnum.cs
index 01686b76..1f5a6024 100644
--- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain.Shared/Enums/ArticleImportTypeEnum.cs
+++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain.Shared/Enums/ArticleImportTypeEnum.cs
@@ -8,7 +8,7 @@ namespace Yi.Framework.Bbs.Domain.Shared.Enums
     public enum ArticleImportTypeEnum
     {
        [Description("默认导入方式")] 
-        Defalut,
+        Default,
 
         [Description("vuePresss方式")] 
         VuePress
diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ForumManager.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ForumManager.cs
index 0bc3dab3..8e57f5b4 100644
--- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ForumManager.cs
+++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ForumManager.cs
@@ -57,7 +57,7 @@ namespace Yi.Framework.Bbs.Domain.Managers
             AbstractArticleImport abstractArticleImport = default;
             switch (importType)
             {
-                case ArticleImportTypeEnum.Defalut:
+                case ArticleImportTypeEnum.Default:
                     abstractArticleImport = new DefaultArticleImport();
 
                     break;