lingyun/NetAdmin
Template
7
0
Fork 0
mirror of https://github.com/nsnail/NetAdmin.git synced 2025-09-17 11:05:34 +08:00
Code Issues 1 Packages Projects Releases Wiki Activity

feat: ✨ 手动执行计划作业 (#122)

Browse Source
This commit is contained in:
nsnail
2024-05-15 14:50:26 +08:00
committed by GitHub
parent 7214a22ea5
commit 3b8336105a
9 changed files with 109 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/backend/NetAdmin.Infrastructure/Constant/Chars.cs
View File

@@ -14,6 +14,7 @@ public static class Chars
public const string FLG_CONTEXT_OWNER_DEPT_ID = nameof(FLG_CONTEXT_OWNER_DEPT_ID);
public const string FLG_CONTEXT_USER_ID = nameof(FLG_CONTEXT_USER_ID);
public const string FLG_CONTEXT_USER_INFO = nameof(FLG_CONTEXT_USER_INFO);
public const string FLG_CRON_PER_SECS = "* * * * * *";
public const string FLG_DB_EXCEPTION_PRIVATE_KEY_CONFLICT = "PRIMARY KEY";
public const string FLG_DB_FIELD_TYPE_NVARCHAR = "nvarchar";
public const string FLG_DB_FIELD_TYPE_NVARCHAR_1022 = "nvarchar(1022)";

5
src/backend/NetAdmin.SysComponent.Application/Modules/Sys/IJobModule.cs
View File

@@ -20,6 +20,11 @@ public interface IJobModule : ICrudModule<CreateJobReq, QueryJobRsp // 创建类
/// </summary>
Task<QueryJobRsp> EditAsync(UpdateJobReq req);
/// <summary>
/// 执行作业
/// </summary>
Task ExecuteAsync(QueryJobReq req);
/// <summary>
/// 获取作业记录条形图数据
/// </summary>

36
src/backend/NetAdmin.SysComponent.Application/Services/Sys/JobService.cs
View File

@@ -1,4 +1,5 @@
using Cronos;
using FreeSql.Internal;
using NetAdmin.Application.Repositories;
using NetAdmin.Application.Services;
using NetAdmin.Domain.DbMaps.Sys;
@@ -84,6 +85,41 @@ public sealed class JobService(DefaultRepository<Sys_Job> rpo, IJobRecordService
return (await update.ExecuteUpdatedAsync().ConfigureAwait(false))[0].Adapt<QueryJobRsp>();
}
/// <inheritdoc />
public async Task ExecuteAsync(QueryJobReq req)
{
req.ThrowIfInvalid();
var df = new DynamicFilterInfo {
Filters = [
new DynamicFilterInfo {
Field = nameof(QueryJobReq.Enabled)
, Operator = DynamicFilterOperators.Eq
, Value = true
}
, new DynamicFilterInfo {
Field = nameof(QueryJobReq.Status)
, Operator = DynamicFilterOperators.Eq
, Value = JobStatues.Idle
}
]
};
var job = await QueryInternal(new QueryReq<QueryJobReq> { Count = 1, Filter = req, DynamicFilter = df })
.ToOneAsync()
.ConfigureAwait(false) ?? throw new NetAdminInvalidOperationException(Ln.未获取到待执行任务);
var nextExecTime = GetNextExecTime(Chars.FLG_CRON_PER_SECS);
try {
_ = await UpdateAsync(job.Adapt<UpdateJobReq>() with {
NextExecTime = nextExecTime
, NextTimeId = nextExecTime?.TimeUnixUtc()
})
.ConfigureAwait(false);
}
catch (DbUpdateVersionException) {
throw new NetAdminInvalidOperationException(Ln.并发冲突请稍后重试);
}
}
/// <inheritdoc />
public Task<bool> ExistAsync(QueryReq<QueryJobReq> req)
{

6
src/backend/NetAdmin.SysComponent.Cache/Sys/JobCache.cs
View File

@@ -42,6 +42,12 @@ public sealed class JobCache(IDistributedCache cache, IJobService service)
return Service.EditAsync(req);
}
/// <inheritdoc />
public Task ExecuteAsync(QueryJobReq req)
{
return Service.ExecuteAsync(req);
}
/// <inheritdoc />
public Task<bool> ExistAsync(QueryReq<QueryJobReq> req)
{

8
src/backend/NetAdmin.SysComponent.Host/Controllers/Sys/JobController.cs
View File

@@ -60,6 +60,14 @@ public sealed class JobController(IJobCache cache) : ControllerBase<IJobCache, I
return Cache.EditAsync(req);
}
/// <summary>
/// 执行作业
/// </summary>
public Task ExecuteAsync(QueryJobReq req)
{
return Cache.ExecuteAsync(req);
}
/// <summary>
/// 计划作业是否存在
/// </summary>