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

103
PARR.API/Controllers/V1/Statistics/StatUnitFieldValuesController.cs
View File

@@ -6,8 +6,8 @@ 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.Constants;
using PARR.DAL.NextRunServices;
using PARR.DAL.Services.Interfaces;
using PARR.DAL.Services.Interfaces.Unit;
@@ -21,32 +21,44 @@ namespace PARR.API.Controllers.V1.Statistics
{
private readonly IApplicationService applicationService;
private readonly IUnitFieldValueService unitFieldValueService;
private readonly ICalendarService calendarService;
private readonly INextRunService nextRunService;
//private readonly ICalendarService calendarService;
public StatUnitFieldValuesController(
IApplicationService applicationService,
IUnitFieldValueService unitFieldValueService,
ICalendarService calendarService
//ICalendarService calendarService
INextRunService nextRunService
)
{
this.applicationService = applicationService;
this.unitFieldValueService = unitFieldValueService;
this.calendarService = calendarService;
this.nextRunService = nextRunService;
//this.calendarService = calendarService;
}
/// <summary>
/// Статистика синхронизации полей юнитов (ЭК) с АИХИТ за последние сутки
/// Статистика синхронизации полей юнитов (ЭК) с АИХИТ за сегодня
/// </summary>
/// <returns></returns>
[HttpGet(ApiRoutes.StatUnitFieldValues.Get)]
public async Task<IActionResult> Get()
public async Task<IActionResult> Get([FromQuery] TimeZoneOffsetClient timeZoneQuery)
{
var queryDate = DateTimeOffset.UtcNow.AddDays(-1);
// Формируем начало "сегодня" в часовом поясе пользователя
var userNow = DateTimeOffset.UtcNow.ToOffset(timeZoneQuery.TimeZoneOffset);
var userTodayStart = new DateTimeOffset(
userNow.Year, userNow.Month, userNow.Day,
0, 0, 0,
timeZoneQuery.TimeZoneOffset);
// Конвертируем в UTC для запроса к БД
var todayStartUtc = userTodayStart.UtcDateTime;
var response = new StatUnitFieldValuesResponse
{
AllValues = await unitFieldValueService.Get().CountAsync(),
CreatedLastDay = await unitFieldValueService.Get().CountAsync(t => t.DateCreated >= queryDate),
AllValues = await unitFieldValueService.Get().AsNoTracking().CountAsync(),
CreatedLastDay = await unitFieldValueService.Get().AsNoTracking().CountAsync(t => t.DateCreated.UtcDateTime >= todayStartUtc),
//UpdatedLastDay = await applicationService.Get().CountAsync(t => t.DateModified.HasValue && t.DateModified.Value >= queryDate),
};
@@ -63,37 +75,62 @@ namespace PARR.API.Controllers.V1.Statistics
[HttpGet(ApiRoutes.StatUnitFieldValues.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 userEndPeriod = DateTimeOffset.UtcNow.Add(timeZoneQuery.TimeZoneOffset);
var userStartPeriod = userEndPeriod.AddDays(-startPeriodDays);
var query = unitFieldValueService.Get()
var utcEndPeriod = userEndPeriod.UtcDateTime;
var utcStartPeriod = userStartPeriod.UtcDateTime;
var allRecords = await unitFieldValueService.Get()
.AsNoTracking()
.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,
Count = t.Count()
});
//t.DateCreated.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date >= startPeriod.Date
//&& t.DateCreated.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date <= endPeriod.Date
utcStartPeriod <= t.DateCreated.UtcDateTime && t.DateCreated.UtcDateTime < utcEndPeriod
).Select(t => new { t.Id, t.DateCreated })
.ToListAsync();
var result = await query.ToListAsync();
var resultDict = allRecords.GroupBy(t => DateOnly.FromDateTime(t.DateCreated.ToOffset(timeZoneQuery.TimeZoneOffset).DateTime))
.ToDictionary(t => t.Key, t => t.Count());
var daysList = calendarService.GetDatesForPeriod(startPeriod, endPeriod);
//var endPeriod = calendarService.GetDateWithTimeZoneOffset(DateTimeOffset.UtcNow, timeZoneQuery.TimeZoneOffsetHours);
//var startPeriod = endPeriod.AddDays(-startPeriodDays);
var response = new List<StatApplicationPeriodResponse>();
//var query = unitFieldValueService.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,
// Count = t.Count()
// });
daysList.ForEach(date =>
//var result = await query.ToListAsync();
//var daysList = calendarService.GetDatesForPeriod(startPeriod, endPeriod);
var daysList = await nextRunService.GetWorkDaysAsync(DateOnly.FromDateTime(userStartPeriod.DateTime), DateOnly.FromDateTime(userEndPeriod.DateTime), false);
//var response = new List<StatApplicationPeriodResponse>();
//daysList.ForEach(date =>
//{
// response.Add(new StatApplicationPeriodResponse
// {
// Date = date,
// CreatedApplicationsCount = result.FirstOrDefault(t => DateOnly.FromDateTime(t.Date) == date)?.Count ?? 0
// });
//});
//response = response.OrderBy(t => t.Date).ToList();
var response = daysList.Select(date => new StatApplicationPeriodResponse
{
response.Add(new StatApplicationPeriodResponse
{
Date = date,
CreatedApplicationsCount = result.FirstOrDefault(t => DateOnly.FromDateTime(t.Date) == date)?.Count ?? 0
});
});
response = response.OrderBy(t => t.Date).ToList();
Date = date,
CreatedApplicationsCount = resultDict.TryGetValue(date, out var cnt) ? cnt : 0
}).OrderBy(t => t.Date).ToList();
return Ok(new Response<List<StatApplicationPeriodResponse>>(response, true));
}