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

Merge branch 'dev' of http://gitlab.dvgd.oao.rzd/devptk/parr/parr_api into dev

Browse Source
This commit is contained in:
Mikhail Kuznetsov
2026-07-20 09:54:38 +10:00
parent cdcb4fd9bc bbb14ee4ea
commit 98245e73e6
3 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
PARR.API/Contracts/V1/ApiRoutes.cs
View File

@@ -226,6 +226,7 @@ namespace PARR.API.Contracts.V1
{ {
public const string Get = BaseStat + "/templates/"; public const string Get = BaseStat + "/templates/";
public const string GetForPeriod = BaseStat + "/templates/period"; public const string GetForPeriod = BaseStat + "/templates/period";
public const string GetTemplatesWithoutScheduleAndTaskCount = BaseStat + "/templates/without-schedule";
} }
public static class StatStatusTypeTemplates public static class StatStatusTypeTemplates

5
PARR.API/Contracts/V1/Responses/Statistics/StatTemplatesWithoutScheduleResponse.cs Normal file
View File

@@ -0,0 +1,5 @@
namespace PARR.API.Contracts.V1.Responses.Statistics
{
public record StatTemplatesWithoutScheduleResponse(int Count);
}

49
PARR.API/Controllers/V1/Statistics/StatTemplateController.cs
View File

@@ -10,6 +10,7 @@ using PARR.API.Helpers;
using PARR.Core.Repositories.Interfaces; using PARR.Core.Repositories.Interfaces;
using PARR.Core.Services.NextRunServices; using PARR.Core.Services.NextRunServices;
using PARR.Domain.Common.Roles; using PARR.Domain.Common.Roles;
using PARR.Domain.Entities;
using PARR.Domain.Enums; using PARR.Domain.Enums;
namespace PARR.API.Controllers.V1.Statistics namespace PARR.API.Controllers.V1.Statistics
@@ -20,16 +21,16 @@ namespace PARR.API.Controllers.V1.Statistics
[Authorize(Roles = ParrRoles.Administrator.Role)] [Authorize(Roles = ParrRoles.Administrator.Role)]
public class StatTemplateController : BaseApiController public class StatTemplateController : BaseApiController
{ {
private readonly ITemplateRepository templateService; private readonly ITemplateRepository _templateRepository;
private readonly INextRunService nextRunService; private readonly INextRunService _nextRunService;
public StatTemplateController( public StatTemplateController(
ITemplateRepository templateService, ITemplateRepository templateRepository,
INextRunService nextRunService INextRunService nextRunService
) )
{ {
this.templateService = templateService; _templateRepository = templateRepository;
this.nextRunService = nextRunService; _nextRunService = nextRunService;
} }
/// <summary> /// <summary>
@@ -41,12 +42,12 @@ namespace PARR.API.Controllers.V1.Statistics
{ {
var response = new StatTemplateResponse var response = new StatTemplateResponse
{ {
ActivateScheduleCount = await templateService.Get().AsNoTracking().CountAsync(t => t.IsActiveSchedule), ActivateScheduleCount = await _templateRepository.Get().AsNoTracking().CountAsync(t => t.IsActiveSchedule),
ActivateTemplateCount = await templateService.Get().AsNoTracking().CountAsync(t => t.IsActiveTemplate), ActivateTemplateCount = await _templateRepository.Get().AsNoTracking().CountAsync(t => t.IsActiveTemplate),
TemplateAgentCount = await templateService.Get().AsNoTracking().CountAsync(t => t.Job!.Group!.IsAgent), TemplateAgentCount = await _templateRepository.Get().AsNoTracking().CountAsync(t => t.Job!.Group!.IsAgent),
TemplateCount = await templateService.Get().AsNoTracking().CountAsync(), TemplateCount = await _templateRepository.Get().AsNoTracking().CountAsync(),
SyncEsppScheduleCount = await templateService.Get().AsNoTracking().CountAsync(t => t.RobotConfigurations.Any(c => c.RobotCode == (int)RobotsEnum.ScheduleOrder && c.TaskStatusCode == (int)TaskStatusEnum.Ok)), SyncEsppScheduleCount = await _templateRepository.Get().AsNoTracking().CountAsync(t => t.RobotConfigurations.Any(c => c.RobotCode == (int)RobotsEnum.ScheduleOrder && c.TaskStatusCode == (int)TaskStatusEnum.Ok)),
SyncEsppTemplatesCount = await templateService.Get().AsNoTracking().CountAsync(t => t.RobotConfigurations.Any(c => c.RobotCode == (int)RobotsEnum.TemplateOrder && c.TaskStatusCode == (int)TaskStatusEnum.Ok)) SyncEsppTemplatesCount = await _templateRepository.Get().AsNoTracking().CountAsync(t => t.RobotConfigurations.Any(c => c.RobotCode == (int)RobotsEnum.TemplateOrder && c.TaskStatusCode == (int)TaskStatusEnum.Ok))
}; };
return Ok(new Response<StatTemplateResponse>(response, true)); return Ok(new Response<StatTemplateResponse>(response, true));
@@ -71,7 +72,7 @@ namespace PARR.API.Controllers.V1.Statistics
userEnd.AddDays(1), userEnd.AddDays(1),
timeZoneQuery.TimeZoneOffset); timeZoneQuery.TimeZoneOffset);
var allRecords = await templateService.Get() var allRecords = await _templateRepository.Get()
.AsNoTracking() .AsNoTracking()
.FilterByDateRangeUtc(t => t.DateCreated, utcStart, utcEnd) .FilterByDateRangeUtc(t => t.DateCreated, utcStart, utcEnd)
.Select(t => new { t.Id, t.DateCreated }) .Select(t => new { t.Id, t.DateCreated })
@@ -80,7 +81,7 @@ namespace PARR.API.Controllers.V1.Statistics
var resultDict = allRecords.GroupByUserDate(t => t.DateCreated, timeZoneQuery.TimeZoneOffset); var resultDict = allRecords.GroupByUserDate(t => t.DateCreated, timeZoneQuery.TimeZoneOffset);
var daysList = await nextRunService.GetWorkDaysAsync(userStart, userEnd, false); var daysList = await _nextRunService.GetWorkDaysAsync(userStart, userEnd, false);
var response = daysList.Select(date => new StatTemplatePeriodResponse var response = daysList.Select(date => new StatTemplatePeriodResponse
{ {
@@ -92,5 +93,27 @@ namespace PARR.API.Controllers.V1.Statistics
} }
/// <summary>
/// Получить кол-во шаблонов у которых ИД расписания null и нет задания на создание расписания
/// </summary>
/// <returns></returns>
[HttpGet(ApiRoutes.StatTemplate.GetTemplatesWithoutScheduleAndTaskCount)]
public async Task<IActionResult> GetTemplatesWithoutScheduleAndTaskCount()
{
var count = await _templateRepository.Get()
.CountAsync(t =>
t.ScheduleEsppId == null
&& !t.RobotConfigurations.Any(x =>
x.RobotCode == (int)RobotsEnum.ScheduleOrder
&& x.TaskStatusCode == (int)TaskStatusEnum.Creating
)
);
var resposne = new StatTemplatesWithoutScheduleResponse(count);
return Ok(new Response<StatTemplatesWithoutScheduleResponse>(resposne, true));
}
} }
} }