Merge branch 'report' into dev
This commit is contained in:
@@ -1,8 +1,15 @@
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using PARR.API.Contracts.V1;
|
||||
using PARR.API.Contracts.V1.Responses.Base;
|
||||
using PARR.API.Controllers.V1.Base;
|
||||
using PARR.API.Services.Interfaces;
|
||||
using PARR.API.Settings;
|
||||
using PARR.Core.Services.Task.Interfaces;
|
||||
using PARR.Core.Services.Task.Providers;
|
||||
using PARR.Domain.Common.Roles;
|
||||
using PARR.Domain.Entities.Base.History;
|
||||
using PARR.Domain.Enums;
|
||||
|
||||
namespace PARR.API.Controllers.V1.Statistics
|
||||
{
|
||||
@@ -12,9 +19,25 @@ namespace PARR.API.Controllers.V1.Statistics
|
||||
[Authorize(Roles = ParrRoles.EsppRobot.RoleOrAdmin)]
|
||||
public class StatWorkloadController : BaseApiController
|
||||
{
|
||||
public StatWorkloadController()
|
||||
{
|
||||
private readonly ITaskManagementService taskManagementService;
|
||||
private readonly IClientService clientService;
|
||||
//private readonly MqSettings mqSettings;
|
||||
private readonly ILogger<StatWorkloadController> logger;
|
||||
private readonly ITaskMqSettingsProvider taskMqSettingsProvider;
|
||||
|
||||
public StatWorkloadController(
|
||||
ITaskManagementService taskManagementService,
|
||||
IClientService clientService,
|
||||
//MqSettings mqSettings,
|
||||
ILogger<StatWorkloadController> logger,
|
||||
ITaskMqSettingsProvider taskMqSettingsProvider
|
||||
)
|
||||
{
|
||||
this.taskManagementService = taskManagementService;
|
||||
this.clientService = clientService;
|
||||
//this.mqSettings = mqSettings;
|
||||
this.logger = logger;
|
||||
this.taskMqSettingsProvider = taskMqSettingsProvider;
|
||||
}
|
||||
|
||||
|
||||
@@ -25,8 +48,34 @@ namespace PARR.API.Controllers.V1.Statistics
|
||||
[HttpPost(ApiRoutes.Workload.Build)]
|
||||
public async Task<IActionResult> Build()
|
||||
{
|
||||
var initiator = new HistoryInitiator
|
||||
{
|
||||
InitiatorIp = clientService.GetClientIp()?.ToString(),
|
||||
InitiatorParrComponentId = ParrComponentsEnum.Api,
|
||||
InitiatorComment = "Отправлен запрос из API на формирование отчета о загруженности"
|
||||
};
|
||||
|
||||
return Ok();
|
||||
//todo: избавиться от try/catch
|
||||
|
||||
try
|
||||
{
|
||||
//mqSettings.Tasks.TryGetValue(TaskTypeEnum.Workload, out var queueSettings);
|
||||
|
||||
//if (queueSettings == null)
|
||||
//{
|
||||
// logger.LogError("Не удалось получить настройки очереди для TaskType: {TaskType}", TaskTypeEnum.Workload);
|
||||
// throw new InvalidOperationException($"Не удалось получить настройки очереди для TaskTypeEnum.Workload");
|
||||
//}
|
||||
var queueSettings = taskMqSettingsProvider.GetSettings(TaskTypeEnum.Workload);
|
||||
|
||||
var taskId = await taskManagementService.CreateTaskAsync<object?>(TaskTypeEnum.Workload, default, initiator, queueSettings);
|
||||
|
||||
return Ok(new Response<string?>(null, true, null!, $"Создана задача {taskId} на формирование отчета"));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = ex.Message } }));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user