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

feat(dal, api): в таблицу Units добавлено поле LastLogon. Переделана авторизация для хостов (ЭК), теперь берется ip из связанных Units. Переделаны запросы авторизации в кеш. Переделан запрос и модель в influxdb. Обновлена статистика по юнитам и полям.

Browse Source
This commit is contained in:
Mikhail Trubnikov
2025-08-26 14:04:49 +10:00
parent a6385ea39a
commit c7bc8f60ef
19 changed files with 3994 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
PARR.API/Controllers/V1/Statistics/StatAuthController.cs
View File

@@ -41,11 +41,17 @@ namespace PARR.API.Controllers.V1.Statistics
var result = await influxDbService.QueryAsync(async handler =>
{
//var query = $"from(bucket: \"{influxDbSettings.Logons!.Bucket}\") " +
// $"|> range(start: {startAt}) " +
// $"|> filter(fn: (r) => r._measurement == \"logon\") " +
// $"|> drop(columns: [\"HostId\", \"UserId\"]) " +
// $"|> aggregateWindow(every: 5m, fn: count)";
var query = $"from(bucket: \"{influxDbSettings.Logons!.Bucket}\") " +
$"|> range(start: {startAt}) " +
$"|> filter(fn: (r) => r._measurement == \"logon\") " +
$"|> drop(columns: [\"HostId\", \"UserId\"]) " +
$"|> aggregateWindow(every: 5m, fn: count)";
$"|> range(start: {startAt}) " +
$"|> filter(fn: (r) => r._measurement == \"logon\") " +
$"|> drop(columns: [\"UnitId\", \"UserId\"]) " +
$"|> aggregateWindow(every: 5m, fn: count)";
var tables = await handler.QueryAsync(query, influxDbSettings.Organization);

54
PARR.API/Controllers/V1/Statistics/StatHostController.cs → PARR.API/Controllers/V1/Statistics/StatUnitController.cs
View File

@@ -8,65 +8,65 @@ using PARR.API.Contracts.V1.Responses.Statistics;
using PARR.API.Controllers.V1.Base;
using PARR.BLL.Services.Interfaces;
using PARR.Constants;
using PARR.DAL.Services.Interfaces;
using PARR.DAL.Services.Interfaces.Unit;
namespace PARR.API.Controllers.V1.Statistics
{
/// <summary>
/// Статистика по хостам
/// Статистика по юнитам (ЭК)
/// </summary>
[Authorize(Roles = ParrRoles.Administrator.Role)]
public class StatHostController : BaseApiController
public class StatUnitController : BaseApiController
{
private readonly IHostService hostService;
private readonly IUnitService unitService;
private readonly ICalendarService calendarService;
public StatHostController(
IHostService hostService,
public StatUnitController(
IUnitService unitService,
ICalendarService calendarService
)
{
this.hostService = hostService;
this.unitService = unitService;
this.calendarService = calendarService;
}
/// <summary>
/// Статистика синхронизации хостов с АИХИТ за последние сутки
/// Статистика синхронизации юнитов (ЭК) с АИХИТ за последние сутки
/// </summary>
/// <returns></returns>
[HttpGet(ApiRoutes.StatHost.Get)]
[HttpGet(ApiRoutes.StatUnit.Get)]
public async Task<IActionResult> Get()
{
var queryDate = DateTimeOffset.UtcNow.AddDays(-1);
var response = new StatHostResponse
var response = new StatUnitResponse
{
AllHosts = await hostService.Get().CountAsync(),
CreatedLastDay = await hostService.Get().CountAsync(t => t.DateCreated >= queryDate),
UpdatedLastDay = await hostService.Get().CountAsync(t => t.DateModified.HasValue && t.DateModified.Value >= queryDate)
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)
UpdatedLastDay = await unitService.Get()
.Include(t => t.UnitValues)
.Where(t => t.UnitValues.Any(v => v.DateModified.HasValue && v.DateModified.Value >= queryDate))
.CountAsync()
};
return Ok(new Response<StatHostResponse>(response, true));
return Ok(new Response<StatUnitResponse>(response, true));
}
/// <summary>
/// Получить статистику за период
/// Получить статистику созданных юнитов (ЭК) за период
/// </summary>
/// <param name="timeZoneQuery"></param>
/// <param name="startPeriodDays"></param>
/// <returns></returns>
[HttpGet(ApiRoutes.StatHost.GetForPeriod)]
[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 query = hostService.Get()
var query = unitService.Get()
.Where(t =>
t.DateCreated.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date >= startPeriod.Date
&& t.DateCreated.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date <= endPeriod.Date
@@ -75,46 +75,46 @@ namespace PARR.API.Controllers.V1.Statistics
.Select(t => new
{
Date = t.Key,
HostCount = t.Count()
UnitCount = t.Count()
});
var result = await query.ToListAsync();
var daysList = calendarService.GetDatesForPeriod(startPeriod, endPeriod);
var response = new List<StatHostPeriodResponse>();
var response = new List<StatUnitPeriodResponse>();
daysList.ForEach(date =>
{
response.Add(new StatHostPeriodResponse
response.Add(new StatUnitPeriodResponse
{
Date = date,
CreatedHostsCount = result.FirstOrDefault(t => DateOnly.FromDateTime(t.Date) == date)?.HostCount ?? 0
CreatedUnitsCount = result.FirstOrDefault(t => DateOnly.FromDateTime(t.Date) == date)?.UnitCount ?? 0
});
});
response = response.OrderBy(t => t.Date).ToList();
return Ok(new Response<List<StatHostPeriodResponse>>(response, true));
return Ok(new Response<List<StatUnitPeriodResponse>>(response, true));
}
/// <summary>
/// Количество хостов в шаблонах
/// Количество юнитов (ЭК) в шаблонах
/// </summary>
/// <returns></returns>
[HttpGet(ApiRoutes.StatHost.GetWithTemplates)]
[HttpGet(ApiRoutes.StatUnit.GetWithTemplates)]
public async Task<IActionResult> GetWithTemplates()
{
//считаем именно хосты в шаблонах, т е один хост может быть в нескольких шаблонах
var response = new StatHostTemplateResponse
var response = new StatUnitTemplateResponse
{
AllUnits = await unitService.Get().CountAsync(),
HostsInTemplates = await unitService.Get().Include(t => t.Templates).CountAsync(t => t.Templates.Any())
UnitsInTemplates = await unitService.Get().Include(t => t.Templates).CountAsync(t => t.Templates.Any())
};
return Ok(new Response<StatHostTemplateResponse>(response, true));
return Ok(new Response<StatUnitTemplateResponse>(response, true));
}
}
}

35
PARR.API/Controllers/V1/Statistics/StatApplicationController.cs → PARR.API/Controllers/V1/Statistics/StatUnitFieldValuesController.cs
View File

@@ -9,41 +9,48 @@ using PARR.API.Controllers.V1.Base;
using PARR.BLL.Services.Interfaces;
using PARR.Constants;
using PARR.DAL.Services.Interfaces;
using PARR.DAL.Services.Interfaces.Unit;
namespace PARR.API.Controllers.V1.Statistics
{
/// <summary>
/// Статистика по приложениям
/// Статистика по значениям unit.FieldValues полученных из АИХИТ
/// </summary>
[Authorize(Roles = ParrRoles.Administrator.Role)]
public class StatApplicationController : BaseApiController
public class StatUnitFieldValuesController : BaseApiController
{
private readonly IApplicationService applicationService;
private readonly IUnitFieldValueService unitFieldValueService;
private readonly ICalendarService calendarService;
public StatApplicationController(IApplicationService applicationService, ICalendarService calendarService)
public StatUnitFieldValuesController(
IApplicationService applicationService,
IUnitFieldValueService unitFieldValueService,
ICalendarService calendarService
)
{
this.applicationService = applicationService;
this.unitFieldValueService = unitFieldValueService;
this.calendarService = calendarService;
}
/// <summary>
/// Статистика синхронизации приложений с АИХИТ за последние сутки
/// Статистика синхронизации полей юнитов (ЭК) с АИХИТ за последние сутки
/// </summary>
/// <returns></returns>
[HttpGet(ApiRoutes.StatApplication.Get)]
[HttpGet(ApiRoutes.StatUnitFieldValues.Get)]
public async Task<IActionResult> Get()
{
var queryDate = DateTimeOffset.UtcNow.AddDays(-1);
var response = new StatApplicationResponse
var response = new StatUnitFieldValuesResponse
{
AllApplications = await applicationService.Get().CountAsync(),
CreatedLastDay = await applicationService.Get().CountAsync(t => t.DateCreated >= queryDate),
UpdatedLastDay = await applicationService.Get().CountAsync(t => t.DateModified.HasValue && t.DateModified.Value >= queryDate),
AllValues = await unitFieldValueService.Get().CountAsync(),
CreatedLastDay = await unitFieldValueService.Get().CountAsync(t => t.DateCreated >= queryDate),
//UpdatedLastDay = await applicationService.Get().CountAsync(t => t.DateModified.HasValue && t.DateModified.Value >= queryDate),
};
return Ok(new Response<StatApplicationResponse>(response, true));
return Ok(new Response<StatUnitFieldValuesResponse>(response, true));
}
@@ -53,13 +60,13 @@ namespace PARR.API.Controllers.V1.Statistics
/// <param name="timeZoneQuery"></param>
/// <param name="startPeriodDays"></param>
/// <returns></returns>
[HttpGet(ApiRoutes.StatApplication.GetForPeriod)]
[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 query = applicationService.Get()
var query = unitFieldValueService.Get()
.Where(t =>
t.DateCreated.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date >= startPeriod.Date
&& t.DateCreated.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date <= endPeriod.Date
@@ -68,7 +75,7 @@ namespace PARR.API.Controllers.V1.Statistics
.Select(t => new
{
Date = t.Key,
ApplicationCount = t.Count()
Count = t.Count()
});
var result = await query.ToListAsync();
@@ -82,7 +89,7 @@ namespace PARR.API.Controllers.V1.Statistics
response.Add(new StatApplicationPeriodResponse
{
Date = date,
CreatedApplicationsCount = result.FirstOrDefault(t => DateOnly.FromDateTime(t.Date) == date)?.ApplicationCount ?? 0
CreatedApplicationsCount = result.FirstOrDefault(t => DateOnly.FromDateTime(t.Date) == date)?.Count ?? 0
});
});

46
PARR.API/Controllers/V1/HostController.cs → PARR.API/Controllers/V1/UnitController.cs
View File

@@ -12,58 +12,36 @@ using PARR.BLL.Helpers;
using PARR.Constants;
using PARR.DAL.DomainModels;
using PARR.DAL.Models.Unit;
using PARR.DAL.Services.Interfaces;
using PARR.DAL.Services.Interfaces.Unit;
namespace PARR.API.Controllers.V1
{
[Authorize(Roles = ParrRoles.Administrator.Role)]
public class HostController : BaseApiController
public class UnitController : BaseApiController
{
private readonly IMapper mapper;
private readonly IHostService hostService;
private readonly IUnitService unitService;
public HostController(
public UnitController(
IMapper mapper,
IHostService hostService,
IUnitService unitService
)
{
this.mapper = mapper;
this.hostService = hostService;
this.unitService = unitService;
}
/// <summary>
/// Получить список хостов постранично
/// Получить список ЭК постранично
/// </summary>
/// <param name="paginationQuery"></param>
/// <returns></returns>
[HttpGet(ApiRoutes.Host.GetAll)]
[HttpGet(ApiRoutes.Unit.GetAll)]
public async Task<IActionResult> GetAll([FromQuery] PaginationQuery paginationQuery, [FromQuery] HostQuery request)
{
var paginationFilter = mapper.Map<PaginationFilter>(paginationQuery);
//IQueryable<DAL.Models.Host> query = hostService.Get()
// .Include(t=>t.WorkGroup).ThenInclude(t=>t!.ResponseArea)
// .Include(s => s.EkStatus)
// .Include(s => s.ResponseArea)
// .Include(t => t.ApplicationsInHosts).ThenInclude(t => t.Application).ThenInclude(t => t!.ApplicationType)
// .OrderBy(t => t.Ek);
//if (!string.IsNullOrEmpty(request.Mask))
// query = query.Where(t => EF.Functions.Like(t.Ek.ToLower(), SqlHelpers.RegexToLike(request.Mask)));
//var hosts = await hostService.GetPage(query, paginationFilter).ToListAsync();
//if (!hosts.Any())
// return NoContent();
//var hostResponse = mapper.Map<List<HostWithApplicationsResponse>>(hosts);
//var paginationResponse = new PagedResponse<HostWithApplicationsResponse>(hostResponse, true).GetPaginatedProps(paginationFilter, query);
IQueryable<Unit> query = unitService.Get()
.OrderBy(t => t.Name);
@@ -90,25 +68,13 @@ namespace PARR.API.Controllers.V1
/// <summary>
/// Получить хост по id
/// Получить ЭК по id
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpGet(ApiRoutes.Host.Get)]
[HttpGet(ApiRoutes.Unit.Get)]
public async Task<IActionResult> GetById([FromRoute] Guid id)
{
//var host = await hostService.Get()
// .Include(t => t.WorkGroup).ThenInclude(t => t!.ResponseArea)
// .Include(s => s.EkStatus)
// .Include(s => s.ResponseArea)
// .Include(t => t.ApplicationsInHosts).ThenInclude(t => t.Application).ThenInclude(t => t!.ApplicationType)
// .FirstOrDefaultAsync(t => t.Id == id);
//if (host == null)
// return NotFound();
//var response = mapper.Map<HostWithApplicationsResponse>(host);
var unit = await unitService.Get()
.Include(t => t.UnitValues)
.ThenInclude(uv => uv.Value)