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

feat(api, core): Workload - отчет по РГ - список работ.

Browse Source
This commit is contained in:
Mikhail Trubnikov
2026-06-03 15:17:36 +10:00
parent 66d1fe7b0d
commit 1f4d338422
8 changed files with 71 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,162 +0,0 @@
using AutoMapper;
using PARR.API.Controllers.V1.Base;
using PARR.API.Services.Interfaces;
using PARR.Core.Repositories.Interfaces;
namespace PARR.API.Controllers.V1.Statistics
{
/// <summary>
/// Статистика загрузки регламентными работами по Видам работ(ApplicationInWorks)
/// </summary>
public class StatWorkWorkLoadController : BaseApiController
{
private readonly ITemplateRepository templateService;
//private readonly IWorkLoadService workLoadService;
private readonly IMapper mapper;
private readonly ILogger<StatWorkWorkLoadController> logger;
//private readonly IWorkGroupService workGroupService;
public StatWorkWorkLoadController(
ITemplateRepository templateService,
//IWorkLoadService workLoadService,
IMapper mapper,
ILogger<StatWorkWorkLoadController> logger
//IWorkGroupService workGroupService
)
{
this.templateService = templateService;
//this.workLoadService = workLoadService;
this.mapper = mapper;
this.logger = logger;
//this.workGroupService = workGroupService;
}
///// <summary>
///// Статистика загрузки регламентными работами по Видам работ(ApplicationInWorks)
///// </summary>
///// <param name="workGroupId"></param>
///// <param name="requestQuery"></param>
///// <returns></returns>
//[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.JobsRequests);
// return Ok(new Response<List<StatWorkWorkLoadResponse>>(response, true));
//}
//private async Task<List<StatWorkWorkLoadResponse>> GetStatisticsAsync(Guid? workGroupId, WorkloadBaseQuery requestQuery, List<StatWorkWorkLoadJobRequest>? jobsRequests = null)
//{
// //защита от дурака, чтоб не выгрузить всю БД
// if (workGroupId == null && (jobsRequests == null || jobsRequests.Count() == 0))
// {
// logger.LogWarning($"Пытались выполнить запрос получения статситики с нулевыми параметрами {nameof(workGroupId)}, {nameof(jobsRequests)}. Controller {nameof(StatWorkWorkLoadController)}");
// return new List<StatWorkWorkLoadResponse>();
// }
// var daysList = workLoadService.GetDatesForPeriod(requestQuery);
// IQueryable<DAL.Models.Template> query = templateService.Get()
// .Include(t => t.Host);
// query = workLoadService.FilterTemplatesQuery(query, requestQuery);
// if (workGroupId.HasValue)
// query = query.Where(t => t.Host!.WorkGroupId == workGroupId.Value);
// if (jobsRequests != null && jobsRequests.Count() > 0)
// //query = query.Where(t => jobsRequests.Any(x => x.JobId == t.ApplicationInWorkId && x.WorkGroupId == t.Host!.WorkGroupId.Value)); /*&& x.WorkGroupId == t.Host!.WorkGroupId.Value*/
// query = query.Where(t => jobsRequests.Select(t => t.JobId).Any(x => x == t.ApplicationInWorkId) && jobsRequests.Select(t => t.WorkGroupId).Any(x => x == t.Host!.WorkGroupId.Value));
// //var groupedQuery = query.GroupBy(t => new { t.NextRun.DateTime.Date, t.ApplicationInWorkId, t.Host.WorkGroupId })
// var groupedQuery = query.GroupBy(t => new { t.NextRun.AddHours(requestQuery.TimeZoneOffsetHours).DateTime.Date, t.ApplicationInWorkId, t.Host.WorkGroupId })
// .Select(t => new
// {
// ApplicationInWorkId = t.Key.ApplicationInWorkId,
// WorkGroupId = t.Key.WorkGroupId,
// Date = t.Key.Date,
// TemplateCount = t.Count()
// });
// var queryResult = await groupedQuery.ToListAsync();
// // получаем только работы по которым есть шаблоны (активированные/деакт) и за любой период
// IQueryable<DAL.Models.Template> appInWorksQuery = templateService.Get()
// .Include(t => t.Host)
// .Include(t => t.ApplicationsInWork).ThenInclude(t => t.Application).ThenInclude(t => t.ApplicationType);
// IQueryable<WorkGroup> workGroupsQuery = workGroupService.Get()
// .Include(t => t.ResponseArea);
// if (workGroupId.HasValue)
// {
// appInWorksQuery = appInWorksQuery.Where(t => t.Host.WorkGroupId == workGroupId);
// workGroupsQuery = workGroupsQuery.Where(t => t.Id == workGroupId.Value);
// }
// if (jobsRequests != null && jobsRequests.Count() > 0)
// {
// //appInWorksQuery = appInWorksQuery.Where(t => jobsRequests.Any(x => x.JobId == t.ApplicationInWorkId));
// appInWorksQuery = appInWorksQuery.Where(t => jobsRequests.Select(j => j.JobId).Any(x => x == t.ApplicationInWorkId));
// workGroupsQuery = workGroupsQuery.Where(t => jobsRequests.Select(w => w.WorkGroupId).Any(x => x == t.Id));
// }
// var appInWorks = await appInWorksQuery.Select(t => t.ApplicationsInWork)
// .Distinct()
// .ToListAsync();
// var workGroups = await workGroupsQuery.Distinct().ToListAsync();
// var response = new List<StatWorkWorkLoadResponse>();
// appInWorks.ForEach(appInWork =>
// {
// workGroups.ForEach(workGroup =>
// {
// var workLoads = daysList.Select(t => new StatWorkLoadDataResponse
// {
// Date = t,
// TemplateCount = queryResult.FirstOrDefault(x => x.ApplicationInWorkId == appInWork.Id && DateOnly.FromDateTime(x.Date) == t && x.WorkGroupId == workGroup.Id)?.TemplateCount ?? 0
// }).OrderBy(t => t.Date).ToList();
// response.Add(new StatWorkWorkLoadResponse
// {
// Job = mapper.Map<ApplicationInWorkBaseResponse>(appInWork),
// WorkGroup = mapper.Map<WorkGroupResponse>(workGroup),
// WorkLoad = workLoads
// });
// });
// });
// // убираем не нужные значения так как запрос в SQL (query) был с несколькими Any
// if (jobsRequests != null && jobsRequests.Count() > 0)
// response = response.Where(t => jobsRequests.Any(x => x.WorkGroupId == t.WorkGroup.Id && x.JobId == t.Job.Id)).ToList();
// response = response.OrderBy(t => t.Job.ShortDescription).ThenBy(t => t.Job.Application?.Name).ThenBy(t => t.WorkGroup.Name).ToList();
// return response;
//}
}
}

18
PARR.API/Controllers/V1/Statistics/StatWorkloadController.cs
View File

@@ -15,6 +15,7 @@ using PARR.Domain.Common.Roles;
using PARR.Domain.Entities.Base.History;
using PARR.Domain.Enums;
using PARR.Domain.Exceptions;
using static PARR.API.Contracts.V1.ApiRoutes;
namespace PARR.API.Controllers.V1.Statistics
{
@@ -60,6 +61,23 @@ namespace PARR.API.Controllers.V1.Statistics
}
/// <summary>
/// Отчет о загруженности по РГ - работы
/// </summary>
/// <param name="workGroup"></param>
/// <param name="offset"></param>
/// <param name="request"></param>
/// <returns></returns>
[HttpGet(ApiRoutes.Workload.WorkGroupJob)]
public async Task<IActionResult> GetWorkGroupJobReport([FromRoute] string workGroup, [FromQuery] TimeZoneOffsetClient offset, [FromQuery] WorkloadBaseQuery request)
{
if (string.IsNullOrWhiteSpace(workGroup))
throw new AppValidationException("Не указано значение рабочей группы");
return await GetReportAsync(WorkloadReportType.WorkGroupJob, request.DurationDays, offset.TimeZoneOffset, workGroup);
}
/// <summary>
/// Отчет о загруженности по всем ЗО
/// </summary>