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

71
PARR.API/Controllers/V1/Statistics/StatUnitController.cs
View File

@@ -6,8 +6,9 @@ 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.NextRunServices;
using PARR.DAL.Services.Interfaces.Unit;
namespace PARR.API.Controllers.V1.Statistics
@@ -19,34 +20,36 @@ namespace PARR.API.Controllers.V1.Statistics
public class StatUnitController : BaseApiController
{
private readonly IUnitService unitService;
private readonly ICalendarService calendarService;
private readonly INextRunService nextRunService;
public StatUnitController(
IUnitService unitService,
ICalendarService calendarService
INextRunService nextRunService
)
{
this.unitService = unitService;
this.calendarService = calendarService;
this.nextRunService = nextRunService;
}
/// <summary>
/// Статистика синхронизации юнитов (ЭК) с АИХИТ за последние сутки
/// Статистика синхронизации юнитов (ЭК) с АИХИТ за сегодня
/// </summary>
/// <returns></returns>
[HttpGet(ApiRoutes.StatUnit.Get)]
public async Task<IActionResult> Get()
public async Task<IActionResult> Get([FromQuery] TimeZoneOffsetClient timeZoneQuery)
{
var queryDate = DateTimeOffset.UtcNow.AddDays(-1);
var todayStartUtc = TimeZoneDateHelper.GetUtcSartOfDay(
DateOnly.FromDateTime(DateTimeOffset.UtcNow.ToOffset(timeZoneQuery.TimeZoneOffset).DateTime),
timeZoneQuery.TimeZoneOffset
);
var response = new StatUnitResponse
{
AllHosts = await unitService.Get().CountAsync(),
CreatedLastDay = await unitService.Get().CountAsync(t => t.DateCreated >= queryDate),
//UpdatedLastDay = await hostService.Get().CountAsync(t => t.DateModified.HasValue && t.DateModified.Value >= queryDate)
AllHosts = await unitService.Get().AsNoTracking().CountAsync(),
CreatedLastDay = await unitService.Get().AsNoTracking().CountAsync(t => t.DateCreated.UtcDateTime >= todayStartUtc),
UpdatedLastDay = await unitService.Get()
.Include(t => t.UnitValues)
.Where(t => t.UnitValues.Any(v => v.DateModified.HasValue && v.DateModified.Value >= queryDate))
.Where(t => t.UnitValues.Any(v => v.DateModified.HasValue && v.DateModified.Value.UtcDateTime >= todayStartUtc))
.AsNoTracking()
.CountAsync()
};
@@ -63,37 +66,31 @@ namespace PARR.API.Controllers.V1.Statistics
[HttpGet(ApiRoutes.StatUnit.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 = unitService.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,
UnitCount = t.Count()
});
var (utcStart, utcEnd) = TimeZoneDateHelper.GetUtcDateRange(
userStart,
userEnd.AddDays(1),
timeZoneQuery.TimeZoneOffset);
var result = await query.ToListAsync();
var allRecords = await unitService.Get()
.AsNoTracking()
.FilterByDateRangeUtc(t => t.DateCreated, utcStart, utcEnd)
.Select(t => new { t.Id, t.DateCreated })
.ToListAsync();
var daysList = calendarService.GetDatesForPeriod(startPeriod, endPeriod);
var response = new List<StatUnitPeriodResponse>();
var resultDict = allRecords.GroupByUserDate(t => t.DateCreated, timeZoneQuery.TimeZoneOffset);
daysList.ForEach(date =>
var daysList = await nextRunService.GetWorkDaysAsync(userStart, userEnd, false);
var response = daysList.Select(date => new StatUnitPeriodResponse
{
response.Add(new StatUnitPeriodResponse
{
Date = date,
CreatedUnitsCount = result.FirstOrDefault(t => DateOnly.FromDateTime(t.Date) == date)?.UnitCount ?? 0
});
});
response = response.OrderBy(t => t.Date).ToList();
Date = date,
CreatedUnitsCount = resultDict.TryGetValue(date, out var cnt) ? cnt : 0
}).OrderBy(t => t.Date).ToList();
return Ok(new Response<List<StatUnitPeriodResponse>>(response, true));
}