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

fix(api): Task - получение статусов задач, доработка отчетов workload

Browse Source
This commit is contained in:
Mikhail Trubnikov
2026-05-15 16:09:49 +10:00
parent 87db7c5fd6
commit 911e6febcd
22 changed files with 334 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
PARR.API/Controllers/V1/GeneratorTemplateController.cs
View File

@@ -1,95 +0,0 @@
namespace PARR.API.Controllers.V1
{
//[Authorize(Roles = ParrRoles.Administrator.Role)]
//public class GeneratorTemplateController : BaseApiController
//{
// private readonly IValidator<GeneratorTemplateRequest> validator;
// private readonly IRabbitService mqService;
// private readonly IUriService uriService;
// private readonly MqSettings mqSettings;
// private readonly IClientService clientService;
// public GeneratorTemplateController(
// IValidator<GeneratorTemplateRequest> validator,
// IRabbitService mqService,
// IUriService uriService,
// MqSettings mqSettings,
// IClientService clientService
// )
// {
// this.validator = validator;
// this.mqService = mqService;
// this.uriService = uriService;
// this.mqSettings = mqSettings;
// this.clientService = clientService;
// }
// /// !!!!!!!!!! Это старый контроллер, удалить !!!!!!!!!!
// /// <summary>
// /// Запрос на генерацию шаблонов
// /// </summary>
// /// <returns></returns>
// [HttpPost(ApiRoutes.GeneratorTemplate.Create)]
// public async Task<IActionResult> Create([FromBody] GeneratorTemplateRequest request)
// {
// var resultValidate = await validator.ValidateAsync(request);
// if (!resultValidate.IsValid)
// return BadRequest(new Response(resultValidate.Errors));
// var result = true;
// request.Ek.ForEach(ek =>
// {
// //todo: проверить в ForEach(async status - отрабатывает ли нормально async, возможно надо переделать в обычный foreach
// request.Status.ForEach(async status =>
// {
// var obj = new GeneratorTemplateMq
// {
// Action = request.Action,
// ApplicationId = request.ApplicationId,
// Ek = ek,
// WorkId = request.WorkId,
// StatusEk = status,
// IsActiveTemplate = request.IsActiveTemplate,
// IsActiveSchedule = request.IsActiveSchedule,
// HistoryInitiator = new HistoryInitiator { InitiatorIp = clientService.GetClientIp()?.ToString(), InitiatorParrComponentId = ParrComponentsEnum.Api }
// };
// //var msg = JsonSerializer.Serialize(obj);
// //var _result = await mqService.SendAsync(mqSettings.GenerateTemplates, new[] { msg });
// var _result = await mqService.SendAsync(mqSettings.GenerateTemplates, new List<object> { obj });
// if (_result.IsSuccess == false)
// result = false;
// });
// });
// //var obj = new GeneratorTemplateMq
// //{
// // Action = request.Action,
// // ApplicationId = request.ApplicationId,
// // Ek = request.Ek,
// // WorkId = request.WorkId,
// // StatusEk = request.Status,
// // IsActiveTemplate = request.IsActiveTemplate,
// // IsActiveSchedule = request.IsActiveSchedule
// //};
// //var msg = JsonSerializer.Serialize(obj);
// //var result = mqService.Send(mqSettings.GenerateTemplates, new[] { msg });
// //if (!result.IsSuccess)
// if (!result)
// return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Ошибка при отправке данных." } }));
// var createdUri = uriService.GetAllUri(ApiRoutes.Template.GetAll);
// return Created(createdUri, new Response<string?>(null, true, new List<ErrorModel>(), "Отправлен запрос на генерацию шаблонов."));
// }
//}
}

212
PARR.API/Controllers/V1/JobAutoControlController.cs
View File

@@ -1,212 +0,0 @@
using Microsoft.AspNetCore.Authorization;
using PARR.API.Controllers.V1.Base;
using PARR.Domain.Common.Roles;
namespace PARR.API.Controllers.V1
{
/// <summary>
/// Управление автоматическим созданием/деактивацией/активацией РР
/// </summary>
[Authorize(Roles = ParrRoles.Administrator.Role)]
public class JobAutoControlController : BaseApiController
{
//private readonly IJobAutoControlService jobAutoControlService;
//private readonly IApplicationsInWorkService applicationsInWorkService;
//private readonly IMapper mapper;
//private readonly IValidator<JobAutoControlRequest> validator;
//private readonly IUriService uriService;
//public JobAutoControlController(
// IJobAutoControlService jobAutoControlService,
// IApplicationsInWorkService applicationsInWorkService,
// IMapper mapper,
// IValidator<JobAutoControlRequest> validator,
// IUriService uriService
// )
//{
// this.jobAutoControlService = jobAutoControlService;
// this.applicationsInWorkService = applicationsInWorkService;
// this.mapper = mapper;
// this.validator = validator;
// this.uriService = uriService;
//}
///// <summary>
///// Получить настройки автоматического управления РР
///// </summary>
///// <param name="applicationInWorkId"></param>
///// <returns></returns>
//[HttpGet(ApiRoutes.JobAutoControl.Get)]
//public async Task<IActionResult> Get([FromRoute] Guid applicationInWorkId)
//{
// var obj = await jobAutoControlService.Get()
// .Include(t => t.ApplicationsInWork).ThenInclude(t => t.WorkGroups).ThenInclude(t => t.WorkGroup)
// .Include(t => t.JobEkMasks)
// .Include(t => t.JobAutoControlInEkStatuses).ThenInclude(t => t.EkStatus)
// .FirstOrDefaultAsync(t => t.ApplicationInWorkId == applicationInWorkId);
// if (obj == null)
// {
// // проверим, есть ли вообще такой AppInWork
// var appInWork = await applicationsInWorkService.GetAsync(applicationInWorkId);
// if (appInWork == null)
// return NotFound();
// return NoContent();
// }
// var response = mapper.Map<JobAutoControlResponse>(obj);
// return Ok(new Response<JobAutoControlResponse>(response, true));
//}
///// <summary>
///// Создать настройки автоматического управления РР
///// </summary>
///// <param name="applicationInWorkId"></param>
///// <param name="request"></param>
///// <returns></returns>
//[HttpPost(ApiRoutes.JobAutoControl.Create)]
//public async Task<IActionResult> Create([FromRoute] Guid applicationInWorkId, [FromBody] JobAutoControlRequest request)
//{
// var exist = await jobAutoControlService.Get().FirstOrDefaultAsync(t => t.ApplicationInWorkId == applicationInWorkId);
// if (exist != null)
// return BadRequest(new Response(false, new List<ErrorModel> {
// new ErrorModel { FieldName = nameof(applicationInWorkId), Message = $"Запись с {nameof(applicationInWorkId)}: {applicationInWorkId} уже существует." }
// }));
// var resultValidate = await validator.ValidateAsync(request);
// if (!resultValidate.IsValid)
// return BadRequest(new Response(resultValidate.Errors));
// var newObj = new DAL.Models.JobAutoControl
// {
// Id = Guid.NewGuid(),
// ApplicationInWorkId = applicationInWorkId,
// CreateNew = request.CreateNew,
// Deactivate = request.Deactivate,
// Activate = request.Activate,
// OnTemplateIsActive = request.OnTemplateIsActive,
// OnScheduleIsActive = request.OnScheduleIsActive,
// OffTemplateIsActive = request.OffTemplateIsActive,
// OffScheduleIsActive = request.OffScheduleIsActive
// };
// // убираем пробелы и дубли
// request.EkMasks.Where(t => t.Trim() != string.Empty).Distinct().ToList().ForEach(mask => newObj.JobEkMasks.Add(new JobEkMask
// {
// Id = Guid.NewGuid(),
// DateCreated = DateTimeOffset.UtcNow,
// Name = mask.Trim(),
// JobAutoControlId = newObj.Id
// }));
// request.EnabledEkStatuses.ForEach(status => newObj.JobAutoControlInEkStatuses.Add(new JobAutoControlInEkStatus
// {
// EkStatusCode = (int)status,
// JobAutoControlId = newObj.Id
// }));
// if (!await jobAutoControlService.CreateAsync(newObj) || !await jobAutoControlService.CommitAsync())
// return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = "Ошибка при создани записи." } }));
// var locationUri = uriService.GetUri(ApiRoutes.JobAutoControl.Get, ApiRoutes.JobAutoControl.appInWorkId, applicationInWorkId);
// var createdObj = await jobAutoControlService.Get()
// .Include(t => t.ApplicationsInWork).ThenInclude(t => t.WorkGroups).ThenInclude(t => t.WorkGroup)
// .Include(t => t.JobEkMasks)
// .Include(t => t.JobAutoControlInEkStatuses).ThenInclude(t => t.EkStatus)
// .FirstOrDefaultAsync(t => t.ApplicationInWorkId == applicationInWorkId);
// return Created(locationUri, new Response<JobAutoControlResponse>(mapper.Map<JobAutoControlResponse>(createdObj), true));
//}
///// <summary>
///// Обновить настройки автоматического управления РР
///// </summary>
///// <param name="applicationInWorkId"></param>
///// <param name="request"></param>
///// <returns></returns>
//[HttpPut(ApiRoutes.JobAutoControl.Update)]
//public async Task<IActionResult> Update([FromRoute] Guid applicationInWorkId, [FromBody] JobAutoControlRequest request)
//{
// var resultValidate = await validator.ValidateAsync(request);
// if (!resultValidate.IsValid)
// return BadRequest(new Response(resultValidate.Errors));
// var orig = await jobAutoControlService.Get()
// .Include(t => t.JobEkMasks)
// .Include(t => t.JobAutoControlInEkStatuses)
// .FirstOrDefaultAsync(t => t.ApplicationInWorkId == applicationInWorkId);
// if (orig == null)
// return BadRequest(new Response(false, new List<ErrorModel> {
// new ErrorModel { FieldName = nameof(applicationInWorkId), Message = $"Запись с {nameof(applicationInWorkId)}: {applicationInWorkId} не существует." }
// }));
// orig.DateModified = DateTimeOffset.UtcNow;
// orig.CreateNew = request.CreateNew;
// orig.Deactivate = request.Deactivate;
// orig.Activate = request.Activate;
// orig.OnTemplateIsActive = request.OnTemplateIsActive;
// orig.OnScheduleIsActive = request.OnScheduleIsActive;
// orig.OffTemplateIsActive = request.OffTemplateIsActive;
// orig.OffScheduleIsActive = request.OffScheduleIsActive;
// orig.JobEkMasks.Clear();
// // убираем пробелы и дубли
// request.EkMasks.Where(t => t.Trim() != string.Empty).Distinct().ToList().ForEach(mask => orig.JobEkMasks.Add(new JobEkMask
// {
// //Id = Guid.NewGuid(), // не пойму почему не нужно это поле. с ним ошибка.
// DateCreated = DateTimeOffset.UtcNow,
// Name = mask.Trim(),
// JobAutoControlId = orig.Id
// }));
// orig.JobAutoControlInEkStatuses.Clear();
// request.EnabledEkStatuses.ForEach(status => orig.JobAutoControlInEkStatuses.Add(new JobAutoControlInEkStatus
// {
// EkStatusCode = (int)status,
// JobAutoControlId = orig.Id
// }));
// if (!await jobAutoControlService.CommitAsync())
// return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = "Ошибка при изменении записи." } }));
// var updatedObj = await jobAutoControlService.Get()
// .Include(t => t.ApplicationsInWork).ThenInclude(t => t.WorkGroups).ThenInclude(t => t.WorkGroup)
// .Include(t => t.JobEkMasks)
// .Include(t => t.JobAutoControlInEkStatuses).ThenInclude(t => t.EkStatus)
// .FirstOrDefaultAsync(t => t.ApplicationInWorkId == applicationInWorkId);
// return Ok(new Response<JobAutoControlResponse>(mapper.Map<JobAutoControlResponse>(updatedObj), true));
//}
///// <summary>
///// Удалить настройки автоматического управления РР
///// </summary>
///// <param name="applicationInWorkId"></param>
///// <returns></returns>
//[HttpDelete(ApiRoutes.JobAutoControl.Delete)]
//public async Task<IActionResult> Delete([FromRoute] Guid applicationInWorkId)
//{
// var obj = await jobAutoControlService.Get().FirstOrDefaultAsync(t => t.ApplicationInWorkId == applicationInWorkId);
// if (obj == null)
// return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Ошибка при удалении настроект. Не найден настройки с {nameof(applicationInWorkId)}: {applicationInWorkId}" } }));
// if (!jobAutoControlService.Delete(obj) || !await jobAutoControlService.CommitAsync())
// return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Ошибка при удалении настроек." } }));
// return NoContent();
//}
}
}

5
PARR.API/Controllers/V1/ShortcodeApplyController.cs
View File

@@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using PARR.API.Contracts.V1;
using PARR.API.Contracts.V1.Requests;
@@ -7,9 +8,11 @@ using PARR.API.Contracts.V1.Responses.Base;
using PARR.API.Controllers.V1.Base;
using PARR.Core.Repositories.Interfaces;
using PARR.Core.Services.Shortcodes;
using PARR.Domain.Common.Roles;
namespace PARR.API.Controllers.V1
{
[Authorize(Roles = ParrRoles.Administrator.Role)]
public class ShortcodeApplyController : BaseApiController
{
private readonly ILogger<ShortcodeController> logger;

1
PARR.API/Controllers/V1/Statistics/StatWorkloadController.cs
View File

@@ -1,7 +1,6 @@
using AutoMapper;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using NodaTime;
using PARR.API.Contracts.V1;
using PARR.API.Contracts.V1.Requests.BaseRequests;
using PARR.API.Contracts.V1.Requests.Queries;

5
PARR.API/Controllers/V1/SyncTaskController.cs
View File

@@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using PARR.API.Contracts.V1;
using PARR.API.Contracts.V1.Requests;
using PARR.API.Contracts.V1.Responses.Base;
@@ -8,11 +9,13 @@ using PARR.API.Settings;
using PARR.Core.Common.Interfaces.RabbitServices;
using PARR.Core.Services.MatchingStatusService;
using PARR.Domain.Common.Rabbit.Messages;
using PARR.Domain.Common.Roles;
using PARR.Domain.Entities.Base.History;
using PARR.Domain.Enums;
namespace PARR.API.Controllers.V1
{
[Authorize(Roles = ParrRoles.Administrator.Role)]
public class SyncTaskController : BaseApiController
{
private readonly ILogger<SyncTaskController> logger;

51
PARR.API/Controllers/V1/TaskController.cs Normal file
View File

@@ -0,0 +1,51 @@
using AutoMapper;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
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.Core.Services.TaskServices.Interfaces;
using PARR.Domain.Common.Roles;
using PARR.Domain.Enums;
namespace PARR.API.Controllers.V1
{
/// <summary>
/// Контроллер по управлению Task (задания, очереди)
/// </summary>
[Authorize(Roles = ParrRoles.Administrator.Role)]
public class TaskController : BaseApiController
{
private readonly ITaskManagementService taskManagementService;
private readonly IMapper mapper;
public TaskController(
ITaskManagementService taskManagementService,
IMapper mapper
)
{
this.taskManagementService = taskManagementService;
this.mapper = mapper;
}
/// <summary>
/// Получить список активных задач (задания, очереди)
/// </summary>
/// <returns></returns>
[HttpGet(ApiRoutes.Tasks.GetActiveTasks)]
public async Task<IActionResult> GetActiveTasks([FromQuery] TaskTypeEnum? typeCode)
{
var activeTasks = await taskManagementService.GetActiveTasksAsync(typeCode);
if (activeTasks.Count == 0)
return NoContent();
var response = mapper.Map<List<ActiveTaskResponse>>(activeTasks);
return Ok(new Response<List<ActiveTaskResponse>>(response, true));
}
}
}

5
PARR.API/Controllers/V1/TaskStatusController.cs
View File

@@ -11,6 +11,9 @@ using PARR.Domain.Common.Roles;
namespace PARR.API.Controllers.V1
{
/// <summary>
/// Статусы заданий роботам
/// </summary>
[Authorize(Roles = ParrRoles.EsppRobot.RoleOrAdmin)]
public class TaskStatusController : BaseApiController
{
@@ -27,7 +30,7 @@ namespace PARR.API.Controllers.V1
}
/// <summary>
/// Получить список статусов заданий
/// Получить список статусов заданий роботам
/// </summary>
/// <returns></returns>
[HttpGet(ApiRoutes.TaskStatus.GetAll)]