mikhail/parr_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(bll, dal, templateGenertartor, templateMatcher, templateUpdater): интеграция с INextRunServiceV2

Browse Source
This commit is contained in:
Mikhail Trubnikov
2026-02-26 14:42:53 +10:00
parent 62059683ba
commit c718a4b406
12 changed files with 4273 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
PARR.TemplateGeneratorWorker/TemplateGenerator.cs
View File

@@ -20,7 +20,9 @@ namespace PARR.TemplateGeneratorWorker
private readonly IJobService jobService;
private readonly IShortcodesService shortcodesService;
private readonly ITemplateService templateService;
private readonly INextRunService nextRunService;
private readonly INextRunServiceV2 nextRunService;
//private readonly INextRunService nextRunService;
//private readonly IEsppScheduleTransformService esppScheduleTransformService;
@@ -31,7 +33,8 @@ namespace PARR.TemplateGeneratorWorker
IJobService jobService,
IShortcodesService shortcodesService,
ITemplateService templateService,
INextRunService nextRunService
INextRunServiceV2 nextRunService
//INextRunService nextRunService
//IEsppScheduleTransformService esppScheduleTransformService
)
{
@@ -42,6 +45,7 @@ namespace PARR.TemplateGeneratorWorker
this.shortcodesService = shortcodesService;
this.templateService = templateService;
this.nextRunService = nextRunService;
//this.nextRunService = nextRunService;
//this.esppScheduleTransformService = esppScheduleTransformService;
}
@@ -99,8 +103,16 @@ namespace PARR.TemplateGeneratorWorker
var templateName = await shortcodesService.ApplyShortcodesAsync(job.TemplateNameMask!, tempTemplateForShortcodes);
var responseArea = await shortcodesService.ApplyShortcodesAsync(job.ResponseAreaMask, tempTemplateForShortcodes);
var workGroup = await shortcodesService.ApplyShortcodesAsync(job.WorkGroupMask, tempTemplateForShortcodes);
//var nextRun = await esppScheduleTransformService.GetNextDateAsync(job.GroupId, job.Group!.ReferenceDate);
var nextRun = await nextRunService.GetNextRunForNewTemplateAsync(job.GroupId, responseArea);
//var nextRun = await nextRunService.GetNextRunForNewTemplateAsync(job.GroupId, responseArea);
var nextRun = await nextRunService.GetNextRunForNewTemplateAsync(job.GroupId, workGroup, responseArea);
if (!nextRun.HasValue)
{
logger.LogError("Job {JobId}, пытался создать шаблон с именем {templateName}, при получении nextRun вернулся null", query.JobId, templateName);
return;
}
var template = new Template
{
@@ -110,7 +122,7 @@ namespace PARR.TemplateGeneratorWorker
JobId = query.JobId,
IsActiveTemplate = query.IsActiveTemplate ?? false,
IsActiveSchedule = query.IsActiveSchedule ?? false,
NextRun = nextRun,
NextRun = nextRun.Value,
StatusTypeId = TemplateStatusTypeEnum.Used,
InitiatorComment = query.HistoryInitiator?.InitiatorComment,
InitiatorParrComponentId = query.HistoryInitiator?.InitiatorParrComponentId,