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

feat(all): ! Критические изменения логики работы всех сервисорв, База Данных имееет неокончательную версию. Template, Scheduler переведены на работу с Unit+Job+JobGroup вместо Host+ApplicationsInWork

Browse Source
This commit is contained in:
Mikhail Kuznetsov
2025-06-25 14:17:34 +10:00
parent 1b867585d8
commit 03c7852378
54 changed files with 5176 additions and 989 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,132 +40,132 @@ namespace PARR.API.Controllers.V1.Statistics
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);
/// <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));
}
// 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);
///// <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));
}
// 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>();
}
//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);
// var daysList = workLoadService.GetDatesForPeriod(requestQuery);
IQueryable<DAL.Models.Template> query = templateService.Get()
.Include(t => t.Host);
// IQueryable<DAL.Models.Template> query = templateService.Get()
// .Include(t => t.Host);
query = workLoadService.FilterTemplatesQuery(query, requestQuery);
// query = workLoadService.FilterTemplatesQuery(query, requestQuery);
if (workGroupId.HasValue)
query = query.Where(t => t.Host!.WorkGroupId == workGroupId.Value);
// 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));
// 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 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();
// 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<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);
// 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 (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));
}
// 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 appInWorks = await appInWorksQuery.Select(t => t.ApplicationsInWork)
// .Distinct()
// .ToListAsync();
var workGroups = await workGroupsQuery.Distinct().ToListAsync();
// var workGroups = await workGroupsQuery.Distinct().ToListAsync();
var response = new List<StatWorkWorkLoadResponse>();
// 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();
// 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
});
});
});
// 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();
// // убираем не нужные значения так как запрос в 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();
// response = response.OrderBy(t => t.Job.ShortDescription).ThenBy(t => t.Job.Application?.Name).ThenBy(t => t.WorkGroup.Name).ToList();
return response;
}
// return response;
//}
}
}