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

feat(api): jobGroup - управление автораспределением

Browse Source
This commit is contained in:
Mikhail Trubnikov
2026-01-23 16:18:56 +10:00
parent 9964e3388d
commit 21c957c3ca
13 changed files with 223 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
PARR.API/Controllers/V1/DistributionPeriodController.cs Normal file
View File

@@ -0,0 +1,52 @@
using AutoMapper;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using PARR.API.Contracts.V1;
using PARR.API.Contracts.V1.Responses;
using PARR.API.Contracts.V1.Responses.Base;
using PARR.API.Controllers.V1.Base;
using PARR.Constants;
using PARR.DAL.Services.Interfaces;
namespace PARR.API.Controllers.V1
{
/// <summary>
/// Периоды распределения РР
/// </summary>
[Authorize(Roles = ParrRoles.Administrator.Role)]
public class DistributionPeriodController : BaseApiController
{
private readonly IDistributionPeriodService distributionPeriodService;
private readonly IMapper mapper;
public DistributionPeriodController(
IDistributionPeriodService distributionPeriodService,
IMapper mapper
)
{
this.distributionPeriodService = distributionPeriodService;
this.mapper = mapper;
}
/// <summary>
/// Список периодов распределения
/// </summary>
/// <returns></returns>
[HttpGet(ApiRoutes.DistributionPeriod.GetAll)]
public async Task<IActionResult> GetAll()
{
var periods = await distributionPeriodService.Get()
.OrderBy(t => t.Name)
.ToListAsync();
if (!periods.Any())
return NoContent();
var response = mapper.Map<List<DistributionPeriodResponse>>(periods);
return Ok(new Response<List<DistributionPeriodResponse>>(response, true));
}
}
}

74
PARR.API/Controllers/V1/JobGroupController.cs
View File

@@ -160,14 +160,28 @@ namespace PARR.API.Controllers.V1
TemplateDuration = request.TemplateDuration.Trim(),
ReferenceDate = request.ReferenceDate,
ScheduleExcludeTypeId = request.ScheduleExcludeTypeId,
ScheduleExcludeTypeCalendarId = request.ScheduleExcludeTypeCalendarId
//IsAutoDistributionEnabled = request.IsAutoDistributionEnabled,
ScheduleExcludeTypeCalendarId = request.ScheduleExcludeTypeCalendarId,
IsAutoDistributionEnabled = request.IsAutoDistributionEnabled,
//IsAgent = request.IsAgent,
//AgentName = request.AgentName,
//AgentTimeOutSec = request.AgentTimeOutSec,
//AgentScript = request.AgentScript
};
#region Если включено автораспределение, добавляем настройки
if (request.IsAutoDistributionEnabled)
{
// на всякий проверим, но вообще это проверяется в валидаторе
if (request.DistributionConfig == null)
{
logger.LogError("Ошибка при создании группы работ '{name}', отсутствуют настройки автораспределения", request.Name);
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = "Ошибка при создании группы заданий на выполнение работ" } }));
}
jobGroup.DistributionConfig = CreateDistributionConfig(request.DistributionConfig, jobGroup.Id);
}
#endregion
//Добавляем настройки планировщика
request.Schedule.ForEach(item =>
{
@@ -220,6 +234,7 @@ namespace PARR.API.Controllers.V1
.Include(t => t.Jobs)
.ThenInclude(t => t.Tnk)
.Include(t => t.EsppSchValues)
.Include(t => t.DistributionConfig).ThenInclude(t => t.DistributionPeriod)
.FirstOrDefaultAsync(t => t.Id == id);
if (orig == null)
@@ -239,12 +254,45 @@ namespace PARR.API.Controllers.V1
orig.ReferenceDate = request.ReferenceDate;
orig.ScheduleExcludeTypeId = request.ScheduleExcludeTypeId;
orig.ScheduleExcludeTypeCalendarId = request.ScheduleExcludeTypeCalendarId;
//orig.IsAutoDistributionEnabled = request.IsAutoDistributionEnabled;
orig.IsAutoDistributionEnabled = request.IsAutoDistributionEnabled;
//orig.IsAgent = request.IsAgent;
//orig.AgentName = request.AgentName;
//orig.AgentTimeOutSec = request.AgentTimeOutSec;
//orig.AgentScript = request.AgentScript;
orig.DateModified = DateTimeOffset.UtcNow;
#region Обновляем настройки автораспределения
if (request.IsAutoDistributionEnabled)
{
if (request.DistributionConfig == null)
{
logger.LogError("Ошибка при изменении группы работ '{name}', отсутствуют настройки автораспределения", request.Name);
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = "Ошибка при изменении группы заданий на выполнение работ" } }));
}
// если настройки были, меняем, если не было, создаем
if (orig.DistributionConfig != null)
{
orig.DistributionConfig.DistributionPeriodId = request.DistributionConfig.DistributionPeriodId;
orig.DistributionConfig.IsExcludeWeekends = request.DistributionConfig.IsExcludeWeekends;
orig.DistributionConfig.IsGroupingByWorkGroup = request.DistributionConfig.IsGroupingByWorkGroup;
}
else
{
//создаем
orig.DistributionConfig = CreateDistributionConfig(request.DistributionConfig, orig.Id);
}
}
else
{
// удаляем настройки распределения если они были
if (orig.DistributionConfig != null)
{
groupService.DeleteDistributionConfig(orig.DistributionConfig);
}
}
#endregion
//обновляем планировщик
orig.EsppSchValues.Clear();
@@ -443,5 +491,23 @@ namespace PARR.API.Controllers.V1
return mapper.Map<MatchingStatusResponse>(statusMatching);
}
/// <summary>
/// Создать конфиг распределения
/// </summary>
/// <param name="distributionConfigRequest"></param>
/// <param name="jobGroupId"></param>
/// <returns></returns>
private JobGroupDistributionConfig CreateDistributionConfig(DistributionConfigRequest distributionConfigRequest, Guid jobGroupId)
{
return new JobGroupDistributionConfig
{
GroupId = jobGroupId,
DistributionPeriodId = distributionConfigRequest.DistributionPeriodId,
IsExcludeWeekends = distributionConfigRequest.IsExcludeWeekends,
IsGroupingByWorkGroup = distributionConfigRequest.IsGroupingByWorkGroup
};
}
}
}