feat: 新增请求访问统计功能

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Jobs/AccessLogStoreJob.cs

@@ -5,6 +5,7 @@ using Quartz;
 using Volo.Abp.BackgroundWorkers.Quartz;
 using Volo.Abp.Caching;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Entities;
 using Yi.Framework.Bbs.Domain.Entities;
 using Yi.Framework.Bbs.Domain.Shared.Caches;
 using Yi.Framework.Bbs.Domain.Shared.Enums;
@@ -46,10 +47,13 @@ public class AccessLogStoreJob : QuartzBackgroundWorkerBase
         _repository = repository;
         JobDetail = JobBuilder.Create<AccessLogStoreJob>().WithIdentity(nameof(AccessLogStoreJob))
             .Build();
+        
         //每分钟执行一次
         Trigger = TriggerBuilder.Create().WithIdentity(nameof(AccessLogStoreJob))
-            .WithCronSchedule("* * * * *")
+            .WithCronSchedule("0 * * * * ?")
             .Build();
+        
+    
     }
 
     public override async Task Execute(IJobExecutionContext context)
@@ -64,9 +68,20 @@ public class AccessLogStoreJob : QuartzBackgroundWorkerBase
             var entity = await _repository._DbQueryable.Where(x => x.AccessLogType == AccessLogTypeEnum.Request)
                 .Where(x => x.CreationTime.Date == DateTime.Today)
                 .FirstAsync();
-           // _repository._Db.Storageable(list2).ExecuteCommandAsync();
 
 
+            if (entity is not null)
+            {
+                entity.Number = number+1;
+                await _repository.UpdateAsync(entity);
+            }
+            else
+            {
+                await _repository.InsertAsync((new AccessLogAggregateRoot() { Number = number,AccessLogType = AccessLogTypeEnum.Request}));
+            }
+
+            //删除前一天的缓存
+            await RedisClient.DelAsync($"{CacheKeyPrefix}:{AccessLogCacheConst.Key}:{DateTime.Now.Date.AddDays(-1)}");
         }
     }
 }

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Analyses/AccessLogService.cs

@@ -55,9 +55,9 @@ namespace Yi.Framework.Bbs.Application.Services
         /// </summary>
         /// <param name="AccessLogType"></param>
         /// <returns></returns>
-        public async Task<List<AccessLogDto>> GetListAsync([FromQuery] AccessLogTypeEnum AccessLogType)
+        public async Task<List<AccessLogDto>> GetListAsync([FromQuery] AccessLogTypeEnum accessLogType)
         {
-            var entities = await _repository._DbQueryable.Where(x => x.AccessLogType == AccessLogType)
+            var entities = await _repository._DbQueryable.Where(x => x.AccessLogType == accessLogType)
                 .Where(x => x.CreationTime >= DateTime.Now.AddMonths(-3))
                 .OrderBy(x => x.CreationTime).ToListAsync();
             var output = entities.Adapt<List<AccessLogDto>>();
@@ -73,11 +73,11 @@ namespace Yi.Framework.Bbs.Application.Services
         public async Task AccessAsync()
         {
             //可判断http重复，防止同一ip多次访问
-            var last = await _repository._DbQueryable.OrderByDescending(x => x.CreationTime).FirstAsync();
+            var last = await _repository._DbQueryable.Where(x=>x.AccessLogType==AccessLogTypeEnum.HomeClick).OrderByDescending(x => x.CreationTime).FirstAsync();
 
             if (last is null || last.CreationTime.Date != DateTime.Today)
             {
-                await _repository.InsertAsync(new AccessLogAggregateRoot());
+                await _repository.InsertAsync(new AccessLogAggregateRoot(){AccessLogType=AccessLogTypeEnum.HomeClick});
             }
             else
             {
@@ -90,10 +90,10 @@ namespace Yi.Framework.Bbs.Application.Services
         /// 获取当前周首页点击数据
         /// </summary>
         /// <returns></returns>
-        public async Task<AccessLogDto[]> GetWeekAsync()
+        public async Task<AccessLogDto[]> GetWeekAsync([FromQuery] AccessLogTypeEnum accessLogType)
         {
             var lastSeven = await _repository._DbQueryable
-                .Where(x => x.AccessLogType == AccessLogTypeEnum.HomeClick)
+                .Where(x => x.AccessLogType == accessLogType)
                 .OrderByDescending(x => x.CreationTime).ToPageListAsync(1, 7);
 
             return WeekTimeHandler(lastSeven.ToArray());

Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs

@@ -288,8 +288,8 @@ namespace Yi.Abp.Web
             //swagger
             app.UseYiSwagger();
 
-            //流量访问统计,不启用
+            //流量访问统计,需redis支持，否则不生效
-            //app.UseAccessLog();
+            app.UseAccessLog();
 
             //请求处理
             app.UseYiApiHandlinge();

Yi.Bbs.Vue3/src/apis/accessApi.js

@@ -9,16 +9,18 @@ export function access() {
 }
 
 // 获取本周数据
-export function getWeek() {
+export function getWeek(data) {
   return request({
     url: "/access-log/week",
     method: "get",
+    params :data
   });
 }
 // 获取全部数据
-export function getAccessList() {
+export function getAccessList(data) {
   return request({
     url: "/access-log",
     method: "get",
+    params :data
   });
 }

Yi.Bbs.Vue3/src/components/InfoCard.vue

@@ -37,7 +37,14 @@ const onClickText=()=>{
 .el-divider {
   margin: 0.2rem 0;
 }
-
+.VisitsLineChart /deep/ .el-card__body{
+  padding: 0 20px;
+}
+ .box-card-info {
+  width: 100%;
+  height: v-bind(height);
+  padding-bottom: 10px;
+}
 .card-header {
   display: flex;
   justify-content: space-between;
@@ -52,9 +59,4 @@ const onClickText=()=>{
   margin: 1rem 0;
 }
 
-.box-card {
-  width: 100%;
-  height: v-bind(height);
-  padding-bottom: 10px;
-}
 </style>

Yi.Bbs.Vue3/src/views/home/Index.vue

@@ -3,7 +3,8 @@
     <el-row :gutter="20" class="top-div">
       <el-col :span="17">
         <div class="chat-hub">
-          <p @click="onClickToChatHub">点击前往-最新上线<span>《聊天室》 </span>，现已支持<span>Ai助手</span>，希望能帮助大家</p>
+          <p @click="onClickToChatHub">点击前往-最新上线<span>《聊天室》 </span>，现已支持<span>Ai助手</span>，希望能帮助大家
+          </p>
         </div>
         <div class="scrollbar">
           <ScrollbarInfo/>
@@ -97,23 +98,26 @@
           <el-col :span="24">
             <InfoCard header="访问统计" class="VisitsLineChart" text="全站历史统计" @onClickText="onClickAccessLog">
               <template #content>
+                <p class="switch-span" @click="onClickWeekSwitch">切换</p>
                 <VisitsLineChart :option="statisOptions" class="statisChart"/>
+
               </template>
             </InfoCard>
 
             <el-dialog v-model="accessLogDialogVisible" title="全站历史统计" width="1200px" center>
               <el-tabs v-model="accessLogTab">
-                <el-tab-pane label="访问统计（近3月）" name="AccessLogChart" style="display: flex;justify-content: center;">
+                <el-tab-pane label="访问统计（近3月）" name="AccessLogChart"
+                             style="display: flex;justify-content: center;">
                   <AccessLogChart :option="accessLogOptins" style="height: 600px;width: 1200px;"/>
                 </el-tab-pane>
-                <el-tab-pane label="注册统计（近3月）" name="RegisterChart" style="display: flex;justify-content: center;">
+                <el-tab-pane label="注册统计（近3月）" name="RegisterChart"
+                             style="display: flex;justify-content: center;">
                   <AccessLogChart :option="registerLogOptins" style="height: 600px;width: 1200px;"/>
                 </el-tab-pane>
 
               </el-tabs>
 
 
-
             </el-dialog>
           </el-col>
 
@@ -129,7 +133,8 @@
 
           <el-col :span="24">
             <template v-if="isPointFinished">
-              <InfoCard :items="pointList" header="财富排行榜" text="查看我的位置" height="400" @onClickText="onClickMoneyTop">
+              <InfoCard :items="pointList" header="财富排行榜" text="查看我的位置" height="400"
+                        @onClickText="onClickMoneyTop">
                 <template #item="temp">
                   <PointsRanking :pointsData="temp"/>
                 </template>
@@ -256,6 +261,7 @@ const query = reactive({
   isTop: true,
 });
 
+const weekQuery = reactive({accessLogType: "Request"});
 //初始化
 onMounted(async () => {
   access();
@@ -266,7 +272,7 @@ onMounted(async () => {
   isDiscussFinished.value = discussConfig.isFinish;
   const {data: bannerData} = await bannerGetList();
   bannerList.value = bannerData.items;
-  const { data: weekData } = await getWeek();
+  const {data: weekData} = await getWeek(weekQuery);
   weekList.value = weekData;
   const {data: pointData, config: pointConfig} = await getRankingPoints();
   pointList.value = pointData.items;
@@ -372,7 +378,7 @@ watch(
     async (value) => {
       switch (value) {
         case "AccessLogChart":
-        const { data } = await getAccessList();
+          const {data} = await getAccessList(weekQuery);
           accessAllList.value = data;
 
           break;
@@ -383,7 +389,6 @@ watch(
           break;
       }
     }
-
 )
 const onClickAccessLog = async () => {
   accessLogDialogVisible.value = true;
@@ -391,6 +396,17 @@ const onClickAccessLog = async () => {
 
 }
 
+//切换统计开关
+const onClickWeekSwitch = async () => {
+  if (weekQuery.accessLogType === "HomeClick") {
+    weekQuery.accessLogType= "Request";
+  } else if (weekQuery.accessLogType === "Request") {
+    weekQuery.accessLogType = "HomeClick";
+  }
+
+  const {data: weekData} = await getWeek(weekQuery);
+  weekList.value = weekData;
+}
 </script>
 <style scoped lang="scss">
 .home-box {
@@ -539,6 +555,13 @@ const onClickAccessLog = async () => {
     padding: 0.5rem;
   }
   
+.VisitsLineChart p{
+  display: flex;
+  justify-content: flex-end;
+  color: #409eff;
+  cursor: pointer;
+  margin-top: 8px;
+}
   .statisChart {
     width: 100%;
     height: 300px;
@@ -550,6 +573,7 @@ const onClickAccessLog = async () => {
   }
 }
 
+
 //走马灯，聊天室链接
 .chat-hub {
   background-color: #E6A23C;