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

16
PARR.API/Controllers/V1/Statistics/StatTemplateDistributionController.cs
View File

@@ -37,20 +37,20 @@ namespace PARR.API.Controllers.V1.Statistics
/// <summary>
/// Статистика распределения шаблонов по JobId (ApplicationInWorkId)
/// </summary>
/// <param name="applicationInWorkId"></param>
/// <param name="JobId"></param>
/// <returns></returns>
[HttpGet(ApiRoutes.StatTemplateDistribution.Get)]
public async Task<IActionResult> Get([FromRoute] Guid applicationInWorkId)
public async Task<IActionResult> Get([FromRoute] Guid jobId)
{
// f87dbe9f-cabf-4108-9c93-12068d4b48a5
var query = templateService.Get()
.Include(t => t.Host)
.Where(t => t.ApplicationInWorkId == applicationInWorkId)
.GroupBy(t => t.Host!.WorkGroupId)
.Include(t => t.Unit)
.Where(t => t.JobId == jobId)
.GroupBy(t => t.Unit!.BaseFields!.WorkGroup)
.Select(x => new
{
WorkGroupId = x.Key,
WorkGroup = x.Key,
CountTemplates = x.Count(),
IsActivatedAllCount = x.Count(t => t.IsActiveTemplate && t.IsActiveSchedule),
IsDeactivatedAllCount = x.Count(t => !t.IsActiveTemplate || !t.IsActiveSchedule || (!t.IsActiveTemplate && !t.IsActiveSchedule)),
@@ -73,13 +73,13 @@ namespace PARR.API.Controllers.V1.Statistics
var workGroups = await workGroupService.Get()
.Include(t => t.ResponseArea)
.Where(t => statResult.Select(x => x.WorkGroupId).Any(w => w == t.Id))
.Where(t => statResult.Select(x => x.WorkGroup).Any(w => w == t.Name))
.ToListAsync();
var response = statResult.Select(stat => new StatTemplateDistributorResponse
{
WorkGroup = mapper.Map<WorkGroupResponse>(workGroups.FirstOrDefault(x => x.Id == stat.WorkGroupId)),
WorkGroup = mapper.Map<WorkGroupResponse>(workGroups.FirstOrDefault(x => x.Name == stat.WorkGroup)),//TODO Migration to job
AllCount = stat.CountTemplates,
IsActivatedAllCount = stat.IsActivatedAllCount,
IsDeactivatedAllCount = stat.IsDeactivatedAllCount,