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
2024-08-26 16:08:09 +10:00
parent 082d0819f3
commit 80325acfad
7 changed files with 196 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
PARR.API/Controllers/V1/Statistics/StatResponseAreaWorkLoadController.cs
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;
}
}

78
PARR.API/Controllers/V1/Statistics/StatWorkGroupWorkLoadController.cs
View File

@@ -2,13 +2,13 @@
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;
using PARR.API.Contracts.V1.Responses.Statistics;
using PARR.API.Controllers.V1.Base;
using PARR.API.Services.Interfaces;
using PARR.DAL.Models;
using PARR.DAL.Services.Interfaces;
namespace PARR.API.Controllers.V1.Statistics
@@ -22,18 +22,21 @@ namespace PARR.API.Controllers.V1.Statistics
private readonly IWorkLoadService workLoadService;
private readonly IWorkGroupService workGroupService;
private readonly IMapper mapper;
private readonly ILogger<StatWorkGroupWorkLoadController> logger;
public StatWorkGroupWorkLoadController(
ITemplateService templateService,
IWorkLoadService workLoadService,
IWorkGroupService workGroupService,
IMapper mapper
IMapper mapper,
ILogger<StatWorkGroupWorkLoadController> logger
)
{
this.templateService = templateService;
this.workLoadService = workLoadService;
this.workGroupService = workGroupService;
this.mapper = mapper;
this.logger = logger;
}
@@ -46,31 +49,71 @@ namespace PARR.API.Controllers.V1.Statistics
[HttpGet(ApiRoutes.StatWorkGroupWorkLoad.Get)]
public async Task<IActionResult> Get([FromRoute] int responseAreaCode, [FromQuery] WorkloadBaseQuery requestQuery)
{
var response = await GetStatisticsAsync(responseAreaCode, requestQuery);
return Ok(new Response<List<StatWorkGroupWorkLoadResponse>>(response, true));
}
/// <summary>
/// Статистика загрузки РГ по списку РГ
/// </summary>
/// <returns></returns>
[HttpPost(ApiRoutes.StatWorkGroupWorkLoad.GetByWorkGroups)]
public async Task<IActionResult> GetByWorkGroups([FromBody] StatWorkGroupsWorkLoadRequest request)
{
var response = await GetStatisticsAsync(null, request.Filter, request.WorkGroups);
return Ok(new Response<List<StatWorkGroupWorkLoadResponse>>(response, true));
}
private async Task<List<StatWorkGroupWorkLoadResponse>> GetStatisticsAsync(int? responseAreaCode, WorkloadBaseQuery requestQuery, List<Guid>? workGroups = null)
{
//защита от дурака, чтоб не выгрузить всю БД
if (responseAreaCode == null && (workGroups == null || workGroups.Count() == 0))
{
logger.LogWarning($"Пытались выполнить запрос получения статситики с нулевыми параметрами {nameof(responseAreaCode)}, {nameof(workGroups)}. Controller {nameof(StatWorkGroupWorkLoadController)}");
return new List<StatWorkGroupWorkLoadResponse>();
}
var daysList = workLoadService.GetDatesForPeriod(requestQuery);
IQueryable<Template> query = templateService.Get()
IQueryable<DAL.Models.Template> query = templateService.Get()
.Include(t => t.Host);
query = workLoadService.FilterTemplatesQuery(query, requestQuery).Where(t => t.Host!.WorkGroup!.ResponseAreaCode == responseAreaCode);
query = workLoadService.FilterTemplatesQuery(query, requestQuery);
if (responseAreaCode.HasValue)
query = query.Where(t => t.Host!.WorkGroup!.ResponseAreaCode == responseAreaCode.Value);
if (workGroups != null && workGroups.Count() > 0)
query = query.Where(t => workGroups.Any(x => x == t.Host!.WorkGroupId.Value));
var groupedQuery = query.GroupBy(t => new { t.NextRun.DateTime.Date, t.Host!.WorkGroupId })
.Select(t => new
{
WorkGroupId = t.Key.WorkGroupId,
Date = t.Key.Date,
TemplateCount = t.Count()
});
.Select(t => new
{
WorkGroupId = t.Key.WorkGroupId,
Date = t.Key.Date,
TemplateCount = t.Count()
});
var queryResult = await groupedQuery.ToListAsync();
//if (!queryResult.Any())
// return NoContent();
IQueryable<DAL.Models.WorkGroup> workGroupsQuery = workGroupService.Get()
.Include(t => t.ResponseArea);
if (responseAreaCode.HasValue)
workGroupsQuery = workGroupsQuery.Where(t => t.ResponseAreaCode == responseAreaCode);
if (workGroups != null && workGroups.Count() > 0)
workGroupsQuery = workGroupsQuery.Where(t => workGroups.Any(x => x == t.Id));
var allWorkGroups = await workGroupService.Get()
.Include(t => t.ResponseArea)
.Where(t => t.ResponseAreaCode == responseAreaCode)
.ToListAsync();
var allWorkGroups = await workGroupsQuery.ToListAsync();
var response = new List<StatWorkGroupWorkLoadResponse>();
@@ -91,7 +134,8 @@ namespace PARR.API.Controllers.V1.Statistics
response = response.OrderBy(t => t.WorkGroup.Name).ToList();
return Ok(new Response<List<StatWorkGroupWorkLoadResponse>>(response, true));
return response;
}
}
}

79
PARR.API/Controllers/V1/Statistics/StatWorkWorkLoadController.cs
View File

@@ -2,40 +2,43 @@
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;
using PARR.API.Contracts.V1.Responses.Statistics;
using PARR.API.Controllers.V1.Base;
using PARR.API.Services.Interfaces;
using PARR.DAL.Models;
using PARR.DAL.Services.Interfaces;
namespace PARR.API.Controllers.V1.Statistics
{
/// <summary>
/// Статистика загрузки регламентными работами по Видам работ(works)
/// Статистика загрузки регламентными работами по Видам работ(ApplicationInWorks)
/// </summary>
public class StatWorkWorkLoadController : BaseApiController
{
private readonly ITemplateService templateService;
private readonly IWorkLoadService workLoadService;
private readonly IMapper mapper;
private readonly ILogger<StatWorkWorkLoadController> logger;
public StatWorkWorkLoadController(
ITemplateService templateService,
IWorkLoadService workLoadService,
IMapper mapper
IMapper mapper,
ILogger<StatWorkWorkLoadController> logger
)
{
this.templateService = templateService;
this.workLoadService = workLoadService;
this.mapper = mapper;
this.logger = logger;
}
/// <summary>
/// Статистика загрузки регламентными работами по Видам работ(works)
/// Статистика загрузки регламентными работами по Видам работ(ApplicationInWorks)
/// </summary>
/// <param name="workGroupId"></param>
/// <param name="requestQuery"></param>
@@ -43,12 +46,48 @@ namespace PARR.API.Controllers.V1.Statistics
[HttpGet(ApiRoutes.StatWorkWorkLoad.Get)]
public async Task<IActionResult> Get([FromRoute] Guid workGroupId, [FromQuery] WorkloadBaseQuery requestQuery)
{
var response = await GetStatisticsAsync(workGroupId, requestQuery);
return Ok(new Response<List<StatWorkWorkLoadResponse>>(response, true));
}
/// <summary>
/// Статистика загрузки РР по списку РР
/// </summary>
/// <param name="requestBody"></param>
/// <returns></returns>
[HttpPost(ApiRoutes.StatWorkWorkLoad.GetByApplicationInWork)]
public async Task<IActionResult> GetByApplicationInWork([FromBody] StatWorkWorkLoadRequest requestBody)
{
var response = await GetStatisticsAsync(null, requestBody.Filter, requestBody.Jobs);
return Ok(new Response<List<StatWorkWorkLoadResponse>>(response, true));
}
private async Task<List<StatWorkWorkLoadResponse>> GetStatisticsAsync(Guid? workGroupId, WorkloadBaseQuery requestQuery, List<Guid>? applicationInWorks = null)
{
//защита от дурака, чтоб не выгрузить всю БД
if (workGroupId == null && (applicationInWorks == null || applicationInWorks.Count() == 0))
{
logger.LogWarning($"Пытались выполнить запрос получения статситики с нулевыми параметрами {nameof(workGroupId)}, {nameof(applicationInWorks)}. Controller {nameof(StatWorkWorkLoadController)}");
return new List<StatWorkWorkLoadResponse>();
}
var daysList = workLoadService.GetDatesForPeriod(requestQuery);
IQueryable<Template> query = templateService.Get()
IQueryable<DAL.Models.Template> query = templateService.Get()
.Include(t => t.Host);
query = workLoadService.FilterTemplatesQuery(query, requestQuery).Where(t => t.Host!.WorkGroupId == workGroupId);
query = workLoadService.FilterTemplatesQuery(query, requestQuery);//.Where(t => t.Host!.WorkGroupId == workGroupId);
if (workGroupId.HasValue)
query = query.Where(t => t.Host!.WorkGroupId == workGroupId.Value);
if (applicationInWorks != null && applicationInWorks.Count() > 0)
query = query.Where(t => applicationInWorks.Any(x => x == t.ApplicationInWorkId));
var groupedQuery = query.GroupBy(t => new { t.NextRun.DateTime.Date, t.ApplicationInWorkId })
.Select(t => new
@@ -62,17 +101,25 @@ namespace PARR.API.Controllers.V1.Statistics
// получаем только работы по которым есть шаблоны (активированные/деакт) и за любой период
var allAppInWorks = await templateService.Get()
IQueryable<DAL.Models.Template> appInWorksQuery = templateService.Get()
.Include(t => t.Host)
.Include(t => t.ApplicationsInWork).ThenInclude(t => t.Application).ThenInclude(t => t.ApplicationType)
.Where(t => t.Host.WorkGroupId == workGroupId)
.Select(t => t.ApplicationsInWork)
.Distinct()
.ToListAsync();
.Include(t => t.ApplicationsInWork).ThenInclude(t => t.Application).ThenInclude(t => t.ApplicationType);
if (workGroupId.HasValue)
appInWorksQuery = appInWorksQuery.Where(t => t.Host.WorkGroupId == workGroupId);
if (applicationInWorks != null && applicationInWorks.Count() > 0)
appInWorksQuery = appInWorksQuery.Where(t => applicationInWorks.Any(x => x == t.ApplicationInWorkId));
var appInWorks = await appInWorksQuery.Select(t => t.ApplicationsInWork)
.Distinct()
.ToListAsync();
var response = new List<StatWorkWorkLoadResponse>();
allAppInWorks.ForEach(appInWork =>
appInWorks.ForEach(appInWork =>
{
var workLoads = daysList.Select(t => new StatWorkLoadDataResponse
{
@@ -87,9 +134,11 @@ namespace PARR.API.Controllers.V1.Statistics
});
});
response = response.OrderBy(t => t.Job.ShortDescription).ThenBy(t=>t.Job.Application?.Name).ToList();
response = response.OrderBy(t => t.Job.ShortDescription).ThenBy(t => t.Job.Application?.Name).ToList();
return Ok(new Response<List<StatWorkWorkLoadResponse>>(response, true));
return response;
}
}
}