feat(api): статистика по нагрузке РР. Добавлены запросы для получения статистики по списку ИД объектов

This commit is contained in:
Mikhail Trubnikov
2024-08-26 16:08:09 +10:00
parent 082d0819f3
commit 80325acfad
7 changed files with 196 additions and 38 deletions

View File

@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using PARR.API.Contracts.V1;
using PARR.API.Contracts.V1.Requests;
using PARR.API.Contracts.V1.Requests.Queries;
using PARR.API.Contracts.V1.Responses;
using PARR.API.Contracts.V1.Responses.Base;
@@ -10,7 +11,6 @@ using PARR.API.Contracts.V1.Responses.Statistics;
using PARR.API.Controllers.V1.Base;
using PARR.API.Services.Interfaces;
using PARR.Constants;
using PARR.DAL.Models;
using PARR.DAL.Services.Interfaces;
namespace PARR.API.Controllers.V1.Statistics
@@ -46,14 +46,38 @@ namespace PARR.API.Controllers.V1.Statistics
/// <returns></returns>
[HttpGet(ApiRoutes.StatResponseAreaWorkLoad.GetAll)]
public async Task<IActionResult> GetAll([FromQuery] WorkloadBaseQuery requestQuery)
{
var response = await GetStatisticsAsync(requestQuery);
return Ok(new Response<List<StatResponseAreaWorkLoadResponse>>(response, true));
}
/// <summary>
/// Статистика загрузки РР по списку ЗО
/// </summary>
/// <returns></returns>
[HttpPost(ApiRoutes.StatResponseAreaWorkLoad.GetByResponseAreas)]
public async Task<IActionResult> GetByResponseAreas([FromBody] StatResponseAreaWorkloadRequest request)
{
var response = await GetStatisticsAsync(request.Filter, request.ResponseAreas);
return Ok(new Response<List<StatResponseAreaWorkLoadResponse>>(response, true));
}
private async Task<List<StatResponseAreaWorkLoadResponse>> GetStatisticsAsync(WorkloadBaseQuery requestQuery, List<int>? responseAreas = null)
{
var daysList = workLoadService.GetDatesForPeriod(requestQuery);
IQueryable<Template> query = templateService.Get()
IQueryable<DAL.Models.Template> query = templateService.Get()
.Include(t => t.Host).ThenInclude(t => t.WorkGroup);
query = workLoadService.FilterTemplatesQuery(query, requestQuery);
if (responseAreas != null && responseAreas.Count() > 0)
query = query.Where(t => responseAreas.Any(x => x == t.Host.WorkGroup.ResponseAreaCode));
var groupedQuery = query.GroupBy(t => new { t.NextRun.DateTime.Date, t.Host!.WorkGroup!.ResponseAreaCode })
.Select(t => new
@@ -66,10 +90,15 @@ namespace PARR.API.Controllers.V1.Statistics
var queryResult = await groupedQuery.ToListAsync();
var allResponseArea = await responseAreaService.Get().ToListAsync();
var responseAreaQuery = responseAreaService.Get();
if (!allResponseArea.Any())
return NoContent();
if (responseAreas != null && responseAreas.Count() > 0)
responseAreaQuery = responseAreaQuery.Where(t => responseAreas.Any(x => x == t.Code));
var allResponseArea = await responseAreaQuery.ToListAsync();
//if (!allResponseArea.Any())
// return NoContent();
var response = new List<StatResponseAreaWorkLoadResponse>();
@@ -91,7 +120,7 @@ namespace PARR.API.Controllers.V1.Statistics
response = response.OrderBy(t => t.ResponseArea.Code).ToList();
return Ok(new Response<List<StatResponseAreaWorkLoadResponse>>(response, true));
return response;
}
}