feat:完善任务界面

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/Assignment/AssignmentGetListOutputDto.cs

@@ -23,7 +23,10 @@ public class AssignmentGetListOutputDto:EntityDto<Guid>
     /// 总共步骤数
     /// </summary>
     public int TotalStepNumber { get; set; }
-
+    /// <summary>
+    /// 任务类型
+    /// </summary>
+    public AssignmentTypeEnum AssignmentType { get; set; }
     
     /// <summary>
     /// 任务需求类型

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Extensions/AccessLogMiddleware.cs

@@ -1,109 +1,51 @@
-using Microsoft.AspNetCore.Http;
+using FreeRedis;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Options;
 using Volo.Abp.Caching;
 using Volo.Abp.DependencyInjection;
-using Yi.Framework.Bbs.Domain.Entities;
 using Yi.Framework.Bbs.Domain.Shared.Caches;
-using Yi.Framework.Bbs.Domain.Shared.Enums;
-using Yi.Framework.SqlSugarCore.Abstractions;
 
 namespace Yi.Framework.Bbs.Application.Extensions;
 
 /// <summary>
 /// 访问日志中间件
 /// 并发最高，采用缓存，默认10分钟才会真正操作一次数据库
-///
 /// 需考虑一致性问题，又不能上锁影响性能
 /// </summary>
 public class AccessLogMiddleware : IMiddleware, ITransientDependency
 {
-    private readonly IDistributedCache<AccessLogCacheItem> _accessLogCache;
-    private readonly ISqlSugarRepository<AccessLogAggregateRoot> _repository;
+    /// <summary>
+    /// 缓存前缀
+    /// </summary>
+    private string CacheKeyPrefix => LazyServiceProvider.LazyGetRequiredService<IOptions<AbpDistributedCacheOptions>>()
+        .Value.KeyPrefix;
 
-    public AccessLogMiddleware(IDistributedCache<AccessLogCacheItem> accessLogCache,
-        ISqlSugarRepository<AccessLogAggregateRoot> repository)
+    /// <summary>
+    /// 使用懒加载防止报错
+    /// </summary>
+    private IRedisClient RedisClient => LazyServiceProvider.LazyGetRequiredService<IRedisClient>();
+
+    /// <summary>
+    /// 属性注入
+    /// </summary>
+    public IAbpLazyServiceProvider LazyServiceProvider { get; set; }
+
+    private bool EnableRedisCache
     {
-        _accessLogCache = accessLogCache;
-        _repository = repository;
+        get
+        {
+            var redisEnabled = LazyServiceProvider.LazyGetRequiredService<IConfiguration>()["Redis:IsEnabled"];
+            return redisEnabled.IsNullOrEmpty() || bool.Parse(redisEnabled);
+        }
     }
 
     public async Task InvokeAsync(HttpContext context, RequestDelegate next)
     {
         await next(context);
-
-        //获取缓存
-        var cache = await _accessLogCache.GetAsync(AccessLogCacheConst.Key);
-
-        //当前缓存需赋的值
-        long currentNumber = 1;
-        //最后插入的时间
-        DateTime lastInsertTime = DateTime.Now;
-        //cahce是空，创建缓存，当前数量从数据库中获取
-        //不等于空，如果大于当前天，插入数据库（间隔超过10分钟，也插入）
-
-        //获取当前访问数量
-        //没有缓存
-        if (cache is null)
+        if (EnableRedisCache)
         {
-            //获取数据库今天最后最后一条数据
-            var currentDayEntity = await GetDateAccessLogEntityAsync();
-
-            //数据库有数据，以数据库数据为准+1
-            if (currentDayEntity is not null)
-            {
-                currentNumber = currentDayEntity.Number + 1;
-            }
-            //数据库没有数据，就是默认的1，重新开始
+            await RedisClient.IncrByAsync($"{CacheKeyPrefix}:{AccessLogCacheConst.Key}:{DateTime.Now.Date}", 1);
         }
-        else
-        {
-            //有缓存，根据根据缓存的值来
-            currentNumber = cache.Number + 1;
-            lastInsertTime = cache.LastInsertTime;
-
-            //数据库持久化
-            //缓存的日期大于当天的日期，插入到数据库,同时缓存变成0，重新开始统计
-            if (cache.LastModificationTime.Date > DateTime.Today)
-            {
-                await _repository.InsertAsync(new AccessLogAggregateRoot()
-                    { AccessLogType = AccessLogTypeEnum.Request, Number = currentNumber });
-                currentNumber = 0;
-            }
-            else
-            {
-                if (cache.LastInsertTime <= DateTime.Now - TimeSpan.FromMinutes(10))
-                {
-                    //这里还需要判断数据库是否有值，不能之间更新
-                    
-                    //缓存的时间大于当前数据库时间10分钟之后，更新（减少数据库交互，10分钟才更新一次）
-                    var currentDayEntity = await GetDateAccessLogEntityAsync();
-                    if (currentDayEntity is null)
-                    {
-                        await _repository.InsertAsync(new AccessLogAggregateRoot()
-                            { AccessLogType = AccessLogTypeEnum.Request, Number = currentNumber });
-                    }
-                    await _repository.UpdateAsync(currentDayEntity);
-                }
-            }
-        }
-
-
-        //覆盖缓存
-        var newCache = new AccessLogCacheItem(currentNumber) { LastInsertTime = lastInsertTime };
-        await _accessLogCache.SetAsync(AccessLogCacheConst.Key, newCache);
-    }
-
-    /// <summary>
-    /// 获取今天的统计
-    /// </summary>
-    /// <returns></returns>
-    private async Task<AccessLogAggregateRoot?> GetDateAccessLogEntityAsync()
-    {
-        //获取数据库今天最后最后一条数据
-        var currentDayEntity = await _repository._DbQueryable
-            .Where(x => x.AccessLogType == AccessLogTypeEnum.Request)
-            .Where(x => x.CreationTime == DateTime.Today)
-            .OrderByDescending(x => x.CreationTime)
-            .FirstAsync();
-        return currentDayEntity;
     }
 }

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

@@ -0,0 +1,72 @@
+using FreeRedis;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Options;
+using Quartz;
+using Volo.Abp.BackgroundWorkers.Quartz;
+using Volo.Abp.Caching;
+using Volo.Abp.DependencyInjection;
+using Yi.Framework.Bbs.Domain.Entities;
+using Yi.Framework.Bbs.Domain.Shared.Caches;
+using Yi.Framework.Bbs.Domain.Shared.Enums;
+using Yi.Framework.SqlSugarCore.Abstractions;
+
+namespace Yi.Framework.Bbs.Application.Jobs;
+
+public class AccessLogStoreJob : QuartzBackgroundWorkerBase
+{
+    private readonly ISqlSugarRepository<AccessLogAggregateRoot> _repository;
+    
+    /// <summary>
+    /// 缓存前缀
+    /// </summary>
+    private string CacheKeyPrefix => LazyServiceProvider.LazyGetRequiredService<IOptions<AbpDistributedCacheOptions>>()
+        .Value.KeyPrefix;
+
+    /// <summary>
+    /// 使用懒加载防止报错
+    /// </summary>
+    private IRedisClient RedisClient => LazyServiceProvider.LazyGetRequiredService<IRedisClient>();
+
+    /// <summary>
+    /// 属性注入
+    /// </summary>
+    public IAbpLazyServiceProvider LazyServiceProvider { get; set; }
+
+    private bool EnableRedisCache
+    {
+        get
+        {
+            var redisEnabled = LazyServiceProvider.LazyGetRequiredService<IConfiguration>()["Redis:IsEnabled"];
+            return redisEnabled.IsNullOrEmpty() || bool.Parse(redisEnabled);
+        }
+    }
+
+    public AccessLogStoreJob(ISqlSugarRepository<AccessLogAggregateRoot> repository)
+    {
+        _repository = repository;
+        JobDetail = JobBuilder.Create<AccessLogStoreJob>().WithIdentity(nameof(AccessLogStoreJob))
+            .Build();
+        //每分钟执行一次
+        Trigger = TriggerBuilder.Create().WithIdentity(nameof(AccessLogStoreJob))
+            .WithCronSchedule("* * * * *")
+            .Build();
+    }
+
+    public override async Task Execute(IJobExecutionContext context)
+    {
+        if (EnableRedisCache)
+        {
+            //当天的访问量
+            var number =
+                await RedisClient.GetAsync<long>($"{CacheKeyPrefix}:{AccessLogCacheConst.Key}:{DateTime.Now.Date}");
+
+
+            var entity = await _repository._DbQueryable.Where(x => x.AccessLogType == AccessLogTypeEnum.Request)
+                .Where(x => x.CreationTime.Date == DateTime.Today)
+                .FirstAsync();
+           // _repository._Db.Storageable(list2).ExecuteCommandAsync();
+
+
+        }
+    }
+}

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

@@ -64,9 +64,10 @@ public class AssignmentService : ApplicationService
         var output = await _assignmentManager._assignmentRepository._DbQueryable
             .Where(x => x.UserId == CurrentUser.GetId())
             .WhereIF(input.AssignmentQueryState == AssignmentQueryStateEnum.Progress,
-                x => x.AssignmentState == AssignmentStateEnum.Progress)
+                x => x.AssignmentState == AssignmentStateEnum.Progress||
+                     x.AssignmentState == AssignmentStateEnum.Completed)
             .WhereIF(input.AssignmentQueryState == AssignmentQueryStateEnum.End,
-                x => x.AssignmentState == AssignmentStateEnum.Completed ||
+                x => x.AssignmentState == AssignmentStateEnum.End ||
                      x.AssignmentState == AssignmentStateEnum.Expired)
             .OrderBy(x=>x.CreationTime)
             .LeftJoin<AssignmentDefineAggregateRoot>((x, define) => x.AssignmentDefineId==define.Id)

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain.Shared/Enums/AssignmentStateEnum.cs

@@ -15,5 +15,10 @@ public enum AssignmentStateEnum
     /// <summary>
     /// 已过期
     /// </summary>
-    Expired
+    Expired,
+    
+    /// <summary>
+    /// 已结束
+    /// </summary>
+    End
 }

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/Assignment/AssignmentAggregateRoot.cs

@@ -52,7 +52,7 @@ public class AssignmentAggregateRoot : AggregateRoot<Guid>, IHasCreationTime, IO
     /// 任务需求类型
     /// </summary>
     public AssignmentRequirementTypeEnum AssignmentRequirementType{ get; set; }
-    public DateTime? CompleteTime { get; set; }
+    public DateTime? EndTime { get; set; }
     
     
     public DateTime CreationTime { get; set; }
@@ -62,7 +62,7 @@ public class AssignmentAggregateRoot : AggregateRoot<Guid>, IHasCreationTime, IO
 
     public bool IsAllowCompleted()
     {
-        return AssignmentState == AssignmentStateEnum.Progress && this.CurrentStepNumber == this.TotalStepNumber;
+        return AssignmentState == AssignmentStateEnum.Completed && this.CurrentStepNumber == this.TotalStepNumber;
     }
 
     public bool TrySetExpire()
@@ -76,10 +76,10 @@ public class AssignmentAggregateRoot : AggregateRoot<Guid>, IHasCreationTime, IO
         return true;
     }
 
-    public void SetComplete()
+    public void SetEnd()
     {
-        this.AssignmentState = AssignmentStateEnum.Completed;
-        this.CompleteTime=DateTime.Now;
+        this.AssignmentState = AssignmentStateEnum.End;
+        this.EndTime=DateTime.Now;
         
     }
 }

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/EventHandlers/AssignmentEventHandler.cs

@@ -68,10 +68,14 @@ public class AssignmentEventHandler : ILocalEventHandler<AssignmentEventArgs>, I
     {
         currentAssignmentList.ForEach(x =>
         {
-            if (x.AssignmentRequirementType == AssignmentRequirementTypeEnum.Agree &&
+            if (x.AssignmentRequirementType == requirementType &&
                 x.CurrentStepNumber < x.TotalStepNumber)
             {
                 x.CurrentStepNumber += 1;
+                if (x.CurrentStepNumber==x.TotalStepNumber)
+                {
+                    x.AssignmentState = AssignmentStateEnum.Completed;
+                }
             }
         });
     }

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/AssignmentManager.cs

@@ -74,7 +74,7 @@ public class AssignmentManager : DomainService
                 new MoneyChangeEventArgs { UserId = assignment.UserId, Number = assignment.RewardsMoneyNumber }, false);
 
             //设置已完成，并领取奖励，钱钱
-            assignment.SetComplete();
+            assignment.SetEnd();
             await _assignmentRepository.UpdateAsync(assignment);
         }
         else

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/AssignmentProviders/TimerAbstractProvider.cs

@@ -24,10 +24,11 @@ public abstract class TimerProvider : IAssignmentProvider
         //2: 存在已完成，但是完成时间是过期的
         var assignmentFilterIds = context.CurrentUserAssignments
             .Where(x => 
-                        //正在进行的，要去掉
+                        //正在进行的，已经完成，要去掉
                         x.AssignmentState == AssignmentStateEnum.Progress||
-                        //已完成，但是还没过期，要去掉
-                        (x.AssignmentState == AssignmentStateEnum.Completed&&!AssignmentType.IsExpire(x.CompleteTime!.Value)))
+                        x.AssignmentState==AssignmentStateEnum.Completed||
+                        //已结束，但是还没过期，要去掉
+                        (x.AssignmentState == AssignmentStateEnum.End&&!AssignmentType.IsExpire(x.EndTime!.Value)))
             .Select(x => x.AssignmentDefineId)
             .ToList();
 

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

@@ -2,6 +2,7 @@
 import {getAssignmentList, getCanReceiveAssignment, acceptAssignment, receiveAssignment} from '@/apis/assignmentApi'
 import {onMounted, reactive, ref} from "vue";
 import AssignmentCard from "./components/AssignmentCard.vue"
+
 const canReceiveAssignmentList = ref([]);
 
 const assignmentList = ref([]);
@@ -14,7 +15,6 @@ const currentTableSelect = ref("canAccept");
 
 //切换tab
 const changeClickTable = async (tabName) => {
-  console.log(tabName,"tabName")
   switch (tabName) {
     case "canAccept":
       const {data: canReceiveAssignmentListData} = await getCanReceiveAssignment();
@@ -47,11 +47,20 @@ const refreshData = async () => {
 //接收任务
 const onClickAcceptAssignment = async (item) => {
   await acceptAssignment(item.id);
+  ElMessage({
+    type: 'success',
+    message: '接受任务成功',
+  });
   await refreshData();
 }
 
-const onClickReceiveAssignment = async (id) => {
-  await receiveAssignment(id);
+//领取奖励
+const onClickReceiveAssignment = async (item) => {
+  await receiveAssignment(item.id);
+  ElMessage({
+    type: 'success',
+    message: '任务奖励领取成功',
+  });
   await refreshData();
 }
 
@@ -74,21 +83,32 @@ const changeTab = async (state) => {
       <el-tab-pane label="可接受" name="canAccept"/>
       <el-tab-pane label="已接受" name="progress"/>
       <el-tab-pane label="已结束" name="end"/>
-      
-      <div v-for="item in canReceiveAssignmentList" v-if="currentTableSelect==='canAccept'">
-        <AssignmentCard :data="item" @onClick="onClickAcceptAssignment"/>
-      </div>
 
-      <div v-for="item in assignmentList" v-else>{{ item }}
-        <button type="button" @click="onClickReceiveAssignment(item.id)">领取奖励</button>
+      <div v-if="currentTableSelect==='canAccept'">
+        <div v-for="item in canReceiveAssignmentList" class="assign-box" v-if="canReceiveAssignmentList.length>0">
+          <AssignmentCard :isDefind="true" :data="item" @onClick="onClickAcceptAssignment"/>
+        </div>
+        <el-empty v-else description="暂时没有可领取的任务" />
+
+
+      </div>
+      <div v-else>
+        <div v-for="item in assignmentList" class="assign-box" v-if="assignmentList.length>0">
+          <AssignmentCard :isDefind="false" :data="item" @onClick="onClickReceiveAssignment"/>
+        </div>
+        <el-empty v-else description="暂时没有任务" />
       </div>
     </el-tabs>
   </div>
 </template>
 <style scoped lang="scss">
-.content-body{
-  
-  padding: 30px ;
+.content-body {
+
+  padding: 30px;
+
+  .assign-box {
+    margin-bottom: 10px;
+  }
 }
 
 

Yi.Bbs.Vue3/src/views/assignment/components/AssignmentCard.vue

@@ -1,51 +1,105 @@
 <script setup>
-import {ref} from "vue";
+import {computed, ref, watch} from "vue";
+import { dayjs } from 'element-plus'
+const props = defineProps(['data', 'isDefind'])
+const cardData = ref(props.data);
 
-const props = defineProps(['data'])
-const cardData=ref(props.data);
-
-const emit =defineEmits(['onClick'])
-const  onClick=()=>{
-  emit('onClick',cardData.value)
+const emit = defineEmits(['onClick'])
+const onClick = () => {
+  emit('onClick', cardData.value)
 }
+//监视组件传值变化
+watch(() => props.data, (n, o) => {
+  cardData.value = n;
+})
 
+//任务类型
+const assignmentTypeEnum = {
+  "Daily": "每日任务",
+  "Weekly": "每周任务",
+  "Novice": "新手任务"
+}
+const computedAssignmentState = computed(() => {
+
+  if (props.isDefind) {
+    return btnAssignmentStateEnum["CanReceive"];
+  } else {
+    return btnAssignmentStateEnum[cardData.value.assignmentState];
+  }
+});
+const btnAssignmentStateEnum = {
+  "CanReceive": {name: "接受任务", backgroundColor: "primary",isDisabled:false},
+  "End": {name: "已完成", backgroundColor: "info",isDisabled:true},
+  "Progress": {name: "正在进行", backgroundColor: "Default",isDisabled:true},
+  "Completed": {name: "领取奖励", backgroundColor: "success",isDisabled:false},
+  "Expired": {name: "已过期", backgroundColor: "info",isDisabled:true}
+}
 </script>
 
 <template>
   <div class="card-box">
     <div class="left">
-      <div class="left-type">每日任务</div>
+      <div class="left-type">{{ assignmentTypeEnum[cardData.assignmentType] }}</div>
       <div class="content">
-        <h2>{{cardData.name}}</h2>
-       <h4>{{cardData.remarks}}</h4> 
+        <div class="content-title">
+        <h2>{{ cardData.name }}</h2>
+        <h4>{{ cardData.remarks }}</h4>
+        </div>
+        <div class="progress" v-if="props.isDefind===false">
+        <el-progress
+            :text-inside="true"
+            :stroke-width="20"
+            :percentage=" Math.round((cardData.currentStepNumber/cardData.totalStepNumber)*100)"
+            striped
+            striped-flow
+            status="success"
+        />
+       <span>{{cardData.currentStepNumber}}/{{cardData.totalStepNumber}}</span>
+        </div>
       </div>
+
     </div>
+
+
     <div class="right">
-      <div class="right-btn"> 
-        <h3>过期时间：无限制</h3>
-        <el-button @click="onClick()" type="primary">接受任务</el-button>
+      <div class="right-btn">
+        <h5>过期时间：{{ cardData.expireTime ==null? "无限制": dayjs(cardData.expireTime).format('YYYY年M月D日') }}</h5>
+       <h5>奖励：<span style="color: #FF0000;font-weight: bolder ">{{cardData.rewardsMoneyNumber}}</span> 钱钱</h5>
+        <el-button @click="onClick()" :disabled="computedAssignmentState.isDisabled" :type="computedAssignmentState.backgroundColor">
+          {{ computedAssignmentState.name }}
+        </el-button>
       </div>
-      
+
     </div>
-  
-   
+
+
   </div>
 </template>
 <style scoped lang="scss">
-.el-button{
+.el-progress{
+width: 450px;
+}
+.el-button {
   width: 100px;
   height: 40px;
+  margin-top: 5px;
 }
-h2{
+
+h2 {
   margin: 0 0 10px 0;
 }
-h3{
+
+h4 {
+  margin: 0 0 0 20px;
+  display: flex;
+  align-items: center;
+}
+h5 {
   margin: 0;
 }
-h4{
-  margin: 0;
-}
-.card-box{
+
+
+.card-box {
   padding: 10px;
   border: 2px solid #dcdfe6;
   display: flex;
@@ -54,21 +108,36 @@ h4{
   width: 100%;
   align-content: center;
   flex-wrap: wrap;
-  .right{
+
+  .right {
     display: flex;
     align-content: center;
     flex-wrap: wrap;
-    .right-btn{
+
+    .right-btn {
       text-align: right;
     }
   }
-  .left{
+
+  .left {
     display: flex;
-    .content{
+
+    align-content: center;
+    flex-wrap: wrap;
+    .content {
       margin-left: 30px;
+      .content-title{
+        display: flex;
+      }
+      .progress{
+        display: flex;
+      }
+      span{
+        margin: 0 10px;
+      }
     }
-    .left-type
-    {
+
+    .left-type {
       border: 1px solid #dcdfe6;
       height: 60px;
       width: 100px;