feat(tasks): add status Queuing

apps/vue/src/api/task-management/model/backgroundJobInfoModel.ts

@@ -1,6 +1,7 @@
 export enum JobStatus {
   None = -1,
   Completed = 0,
+  Queuing = 5,
   Running = 10,
   FailedRetry = 15,
   Paused = 20,

apps/vue/src/views/task-management/background-jobs/components/JobModal.vue

@@ -54,14 +54,14 @@
             <DatePicker
               style="width: 100%"
               :value="getDate('beginTime')"
-              @change="(val) => dateChange('beginTime', val, 'YYYY-MM-DD 00:00:00')"
+              @change="(val) => dateChange('beginTime', val, 'YYYY-MM-DDT00:00:00')"
             />
           </FormItem>
           <FormItem name="endTime" :label="L('DisplayName:EndTime')">
             <DatePicker
               style="width: 100%"
               :value="getDate('endTime')"
-              @change="(val) => dateChange('endTime', val, 'YYYY-MM-DD 23:59:59')"
+              @change="(val) => dateChange('endTime', val, 'YYYY-MM-DDT23:59:59')"
             />
           </FormItem>
           <FormItem

apps/vue/src/views/task-management/background-jobs/datas/ModalData.ts

@@ -41,8 +41,10 @@ export function getSearchFormSchemas(): Partial<FormProps> {
         componentProps: {
           options: [
             { label: JobStatusMap[JobStatus.None], value: JobStatus.None },
+            { label: JobStatusMap[JobStatus.Queuing], value: JobStatus.Queuing },
             { label: JobStatusMap[JobStatus.Running], value: JobStatus.Running },
             { label: JobStatusMap[JobStatus.Completed], value: JobStatus.Completed },
+            { label: JobStatusMap[JobStatus.FailedRetry], value: JobStatus.FailedRetry },
             { label: JobStatusMap[JobStatus.Paused], value: JobStatus.Paused },
             { label: JobStatusMap[JobStatus.Stopped], value: JobStatus.Stopped },
           ],

apps/vue/src/views/task-management/background-jobs/datas/typing.ts

@@ -6,6 +6,7 @@ const { L } = useLocalization('TaskManagement');
 export const JobStatusMap = {
   [JobStatus.None]: L('DisplayName:None'),
   [JobStatus.Completed]: L('DisplayName:Completed'),
+  [JobStatus.Queuing]: L('DisplayName:Queuing'),
   [JobStatus.Running]: L('DisplayName:Running'),
   [JobStatus.FailedRetry]: L('DisplayName:FailedRetry'),
   [JobStatus.Paused]: L('DisplayName:Paused'),
@@ -14,6 +15,7 @@ export const JobStatusMap = {
 export const JobStatusColor = {
   [JobStatus.None]: '',
   [JobStatus.Completed]: '#339933',
+  [JobStatus.Queuing]: '#008B8B',
   [JobStatus.Running]: '#3399CC',
   [JobStatus.FailedRetry]: '#FF6600',
   [JobStatus.Paused]: '#CC6633',

aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Abstractions/LINGYUN/Abp/BackgroundTasks/JobStatus.cs

@@ -11,6 +11,10 @@ public enum JobStatus
     /// </summary>
     Completed = 0,
     /// <summary>
+    /// 队列中
+    /// </summary>
+    Queuing = 5,
+    /// <summary>
     /// 运行中
     /// </summary>
     Running = 10,

aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Quartz/LINGYUN/Abp/BackgroundTasks/Quartz/QuartzJobListener.cs

@@ -40,7 +40,11 @@ public class QuartzJobListener : JobListenerSupport, ISingletonDependency
             jobName = !jobType.IsGenericType ? jobType.Name : jobType.GetGenericArguments()[0].Name;
         }
         
-        Logger.LogWarning($"The task {jobName} could not be performed...");
+        // 作业被锁定才记录warn事件
+        if (context.TryGetCache("JobLocked", out var time) && time != null && int.TryParse(time.ToString(), out var lockTime))
+        {
+            Logger.LogWarning($"The task {jobName} could not be performed, Because it is being scheduled by another job scheduler");
+        }
 
         return Task.FromResult(-1);
     }

aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Quartz/LINGYUN/Abp/BackgroundTasks/Quartz/QuartzJobSearchJobAdapter.cs

@@ -30,7 +30,7 @@ public class QuartzJobSearchJobAdapter : IJob
             jobDefinition.JobType,
             scope.ServiceProvider,
             context.MergedJobDataMap.ToImmutableDictionary(),
-            getCache: (key) => context.Get(key),
+            getCache: context.Get,
             setCache: context.Put,
             cancellationToken: context.CancellationToken);
 

aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Quartz/LINGYUN/Abp/BackgroundTasks/Quartz/QuartzTriggerListener.cs

@@ -49,6 +49,7 @@ public class QuartzTriggerListener : TriggerListenerSupport, ISingletonDependenc
             // 传递令牌将清除本次锁, 那并无意义
             if (!await JobLockProvider.TryLockAsync(NormalizeKey(context, jobId), time))
             {
+                context.Put("JobLocked", time);
                 Logger.LogDebug("The exclusive job is already in use by another scheduler. Ignore this schedule.");
                 return true;
             }

aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Quartz/Quartz/IJobExecutionContextExtensions.cs

@@ -42,4 +42,11 @@ public static class IJobExecutionContextExtensions
         }
         return false;
     }
+
+    public static bool TryGetCache(this IJobExecutionContext context, string key, out object value)
+    {
+        value = context.Get(key);
+
+        return value != null;
+    }
 }

aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks/LINGYUN/Abp/BackgroundTasks/BackgroundWorkerAdapter.cs

@@ -75,7 +75,6 @@ public class BackgroundWorkerAdapter<TWorker> : BackgroundWorkerBase, IBackgroun
             JobType = JobType.Persistent,
             Interval = period.Value / 1000,
             MaxCount = 0,
-            // TODO: 可配置
             MaxTryCount = 10,
             // 确保不会被轮询入队
             Status = JobStatus.None,

aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Domain.Shared/LINGYUN/Abp/TaskManagement/Localization/Resources/en.json

@@ -57,6 +57,7 @@
     "DisplayName:None": "None",
     "DisplayName:Completed": "Completed",
     "DisplayName:Running": "Running",
+    "DisplayName:Queuing": "Queuing",
     "DisplayName:Paused": "Paused",
     "DisplayName:FailedRetry": "Failed Retry",
     "DisplayName:Stopped": "Stopped",

aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Domain.Shared/LINGYUN/Abp/TaskManagement/Localization/Resources/zh-Hans.json

@@ -57,6 +57,7 @@
     "DisplayName:None": "未定义",
     "DisplayName:Completed": "已完成",
     "DisplayName:Running": "运行中",
+    "DisplayName:Queuing": "队列中",
     "DisplayName:Paused": "已暂停",
     "DisplayName:FailedRetry": "失败重试",
     "DisplayName:Stopped": "已停止",

aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Domain/LINGYUN/Abp/TaskManagement/BackgroundJobInfo.cs

@@ -141,7 +141,7 @@ public class BackgroundJobInfo : AuditedAggregateRoot<string>, IMultiTenant
         NodeName = Check.Length(nodeName, nameof(nodeName), BackgroundJobInfoConsts.MaxNodeNameLength);
         TenantId = tenantId;
 
-        Status = JobStatus.Running;
+        Status = JobStatus.Queuing;
 
         // TODO: 是否需要将参数挪到另一个实体? 
         // 任务参数的建议是尽量最小化, 仅存储关键信息

aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Domain/LINGYUN/Abp/TaskManagement/BackgroundJobInfoWaitingPeriodSpecification.cs

@@ -8,7 +8,7 @@ public class BackgroundJobInfoWaitingPeriodSpecification : BackgroundJobInfoWait
 {
     public override Expression<Func<BackgroundJobInfo, bool>> ToExpression()
     {
-        var status = new JobStatus[] { JobStatus.Running, JobStatus.FailedRetry };
+        var status = new JobStatus[] { JobStatus.Queuing, JobStatus.FailedRetry };
 
         Expression<Func<BackgroundJobInfo, bool>> expression = _ => true;
         return expression

aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Domain/LINGYUN/Abp/TaskManagement/BackgroundJobInfoWaitingSpecification.cs

@@ -9,7 +9,7 @@ public class BackgroundJobInfoWaitingSpecification : Volo.Abp.Specifications.Spe
 {
     public override Expression<Func<BackgroundJobInfo, bool>> ToExpression()
     {
-        var status = new JobStatus[] { JobStatus.Running, JobStatus.FailedRetry };
+        var status = new JobStatus[] { JobStatus.Queuing, JobStatus.FailedRetry };
 
         Expression<Func<BackgroundJobInfo, bool>> expression = _ => true;
 

aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Domain/LINGYUN/Abp/TaskManagement/BackgroundJobManager.cs

@@ -170,7 +170,7 @@ public class BackgroundJobManager : DomainService
 
     public async virtual Task ResumeAsync(BackgroundJobInfo jobInfo)
     {
-        jobInfo.SetStatus(JobStatus.Running);
+        jobInfo.SetStatus(JobStatus.Queuing);
         jobInfo.IsAbandoned = false;
         jobInfo.IsEnabled = true;
 
@@ -192,7 +192,7 @@ public class BackgroundJobManager : DomainService
     {
         foreach (var jobInfo in jobInfos)
         {
-            jobInfo.SetStatus(JobStatus.Running);
+            jobInfo.SetStatus(JobStatus.Queuing);
             jobInfo.IsAbandoned = false;
             jobInfo.IsEnabled = true;
         }