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

feat(api): статистика отображается в часовом поясе клиента

Browse Source
This commit is contained in:
Mikhail Trubnikov
2026-03-05 10:19:54 +10:00
parent 7c9d9b34e5
commit b2b5516326
30 changed files with 1333 additions and 2011 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,9 +6,10 @@ using PARR.API.Contracts.V1.Requests.BaseRequests;
using PARR.API.Contracts.V1.Responses.Base;
using PARR.API.Contracts.V1.Responses.Statistics;
using PARR.API.Controllers.V1.Base;
using PARR.BLL.Services.Interfaces;
using PARR.API.Helpers;
using PARR.Constants;
using PARR.DAL.Contracts;
using PARR.DAL.NextRunServices;
using PARR.DAL.Services.Interfaces;
namespace PARR.API.Controllers.V1.Statistics
@@ -20,15 +21,15 @@ namespace PARR.API.Controllers.V1.Statistics
public class StatTemplateController : BaseApiController
{
private readonly ITemplateService templateService;
private readonly ICalendarService calendarService;
private readonly INextRunService nextRunService;
public StatTemplateController(
ITemplateService templateService,
ICalendarService calendarService
INextRunService nextRunService
)
{
this.templateService = templateService;
this.calendarService = calendarService;
this.nextRunService = nextRunService;
}
/// <summary>
@@ -40,12 +41,12 @@ namespace PARR.API.Controllers.V1.Statistics
{
var response = new StatTemplateResponse
{
ActivateScheduleCount = await templateService.Get().CountAsync(t => t.IsActiveSchedule),
ActivateTemplateCount = await templateService.Get().CountAsync(t => t.IsActiveTemplate),
TemplateAgentCount = await templateService.Get().Include(t => t.Job).ThenInclude(t=>t.Group).CountAsync(t => t.Job!.Group!.IsAgent),
TemplateCount = await templateService.Get().CountAsync(),
SyncEsppScheduleCount = await templateService.Get().Include(t => t.RobotConfigurations).CountAsync(t => t.RobotConfigurations.Any(c => c.RobotCode == (int)RobotsEnum.ScheduleOrder && c.TaskStatusCode == (int)TaskStatusEnum.Ok)),
SyncEsppTemplatesCount = await templateService.Get().Include(t => t.RobotConfigurations).CountAsync(t => t.RobotConfigurations.Any(c => c.RobotCode == (int)RobotsEnum.TemplateOrder && c.TaskStatusCode == (int)TaskStatusEnum.Ok))
ActivateScheduleCount = await templateService.Get().AsNoTracking().CountAsync(t => t.IsActiveSchedule),
ActivateTemplateCount = await templateService.Get().AsNoTracking().CountAsync(t => t.IsActiveTemplate),
TemplateAgentCount = await templateService.Get().AsNoTracking().CountAsync(t => t.Job!.Group!.IsAgent),
TemplateCount = await templateService.Get().AsNoTracking().CountAsync(),
SyncEsppScheduleCount = await templateService.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))
};
return Ok(new Response<StatTemplateResponse>(response, true));
@@ -61,33 +62,31 @@ namespace PARR.API.Controllers.V1.Statistics
[HttpGet(ApiRoutes.StatTemplate.GetForPeriod)]
public async Task<IActionResult> GetForPeriod([FromQuery] TimeZoneOffsetClient timeZoneQuery, [FromQuery] int startPeriodDays = 3)
{
var endPeriod = calendarService.GetDateWithTimeZoneOffset(DateTimeOffset.UtcNow, timeZoneQuery.TimeZoneOffsetHours);
var startPeriod = endPeriod.AddDays(-startPeriodDays);
// Формируем период
var userEnd = DateOnly.FromDateTime(DateTimeOffset.UtcNow.ToOffset(timeZoneQuery.TimeZoneOffset).DateTime);
var userStart = userEnd.AddDays(-startPeriodDays);
var query = templateService.Get()
.Where(t =>
t.DateCreated.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date >= startPeriod.Date
&& t.DateCreated.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date <= endPeriod.Date
).GroupBy(t => t.DateCreated.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date)
.Select(t => new
{
Date = t.Key,
CreatedObjs = t.Count()
});
var (utcStart, utcEnd) = TimeZoneDateHelper.GetUtcDateRange(
userStart,
userEnd.AddDays(1),
timeZoneQuery.TimeZoneOffset);
var result = await query.ToListAsync();
var allRecords = await templateService.Get()
.AsNoTracking()
.FilterByDateRangeUtc(t => t.DateCreated, utcStart, utcEnd)
.Select(t => new { t.Id, t.DateCreated })
.ToListAsync();
var daysList = calendarService.GetDatesForPeriod(startPeriod, endPeriod);
var resultDict = allRecords.GroupByUserDate(t => t.DateCreated, timeZoneQuery.TimeZoneOffset);
var response = new List<StatTemplatePeriodResponse>();
daysList.ForEach(date => response.Add(new StatTemplatePeriodResponse
var daysList = await nextRunService.GetWorkDaysAsync(userStart, userEnd, false);
var response = daysList.Select(date => new StatTemplatePeriodResponse
{
Date = date,
CreatedTemplatesCount = result.FirstOrDefault(t => DateOnly.FromDateTime(t.Date) == date)?.CreatedObjs ?? 0
}));
response = response.OrderBy(t => t.Date).ToList();
CreatedTemplatesCount = resultDict.TryGetValue(date, out var cnt) ? cnt : 0
}).OrderBy(t => t.Date).ToList();
return Ok(new Response<List<StatTemplatePeriodResponse>>(response, true));
}