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

100
PARR.API/Controllers/V1/Statistics/StatTemplateController.cs
View File

@@ -32,66 +32,66 @@ namespace PARR.API.Controllers.V1.Statistics
this.calendarService = calendarService;
}
/// <summary>
/// Статистика по шаблонам
/// </summary>
/// <returns></returns>
[HttpGet(ApiRoutes.StatTemplate.Get)]
public async Task<IActionResult> Get()
{
var response = new StatTemplateResponse
{
ActivateScheduleCount = await templateService.Get().CountAsync(t => t.IsActiveSchedule),
ActivateTemplateCount = await templateService.Get().CountAsync(t => t.IsActiveTemplate),
TemplateAgentCount = await templateService.Get().Include(t => t.ApplicationsInWork).CountAsync(t => t.ApplicationsInWork!.IsAgent),
TemplateCount = await templateService.Get().CountAsync(),
SyncEsppScheduleCount = await templateService.Get().Include(t => t.RobotConfigurations).CountAsync(t => t.RobotConfigurations.Any(c => c.RobotCode == (int)RobotsEnum.ScheduleOrder && c.TaskStatusCode == (int)TaskStatusEnum.Ok)),
SyncEsppTemplatesCount = await templateService.Get().Include(t => t.RobotConfigurations).CountAsync(t => t.RobotConfigurations.Any(c => c.RobotCode == (int)RobotsEnum.TemplateOrder && c.TaskStatusCode == (int)TaskStatusEnum.Ok))
};
///// <summary>
///// Статистика по шаблонам
///// </summary>
///// <returns></returns>
//[HttpGet(ApiRoutes.StatTemplate.Get)]
//public async Task<IActionResult> Get()
//{
// var response = new StatTemplateResponse
// {
// ActivateScheduleCount = await templateService.Get().CountAsync(t => t.IsActiveSchedule),
// ActivateTemplateCount = await templateService.Get().CountAsync(t => t.IsActiveTemplate),
// TemplateAgentCount = await templateService.Get().Include(t => t.ApplicationsInWork).CountAsync(t => t.ApplicationsInWork!.IsAgent),
// TemplateCount = await templateService.Get().CountAsync(),
// SyncEsppScheduleCount = await templateService.Get().Include(t => t.RobotConfigurations).CountAsync(t => t.RobotConfigurations.Any(c => c.RobotCode == (int)RobotsEnum.ScheduleOrder && c.TaskStatusCode == (int)TaskStatusEnum.Ok)),
// SyncEsppTemplatesCount = await templateService.Get().Include(t => t.RobotConfigurations).CountAsync(t => t.RobotConfigurations.Any(c => c.RobotCode == (int)RobotsEnum.TemplateOrder && c.TaskStatusCode == (int)TaskStatusEnum.Ok))
// };
return Ok(new Response<StatTemplateResponse>(response, true));
}
// return Ok(new Response<StatTemplateResponse>(response, true));
//}
/// <summary>
/// Получить статистику созданных шаблонов (расписаний) в БД ПАРР
/// </summary>
/// <param name="timeZoneQuery"></param>
/// <param name="startPeriodDays"></param>
/// <returns></returns>
[HttpGet(ApiRoutes.StatTemplate.GetForPeriod)]
public async Task<IActionResult> GetForPeriod([FromQuery] TimeZoneOffsetClient timeZoneQuery, [FromQuery] int startPeriodDays = 3)
{
var endPeriod = calendarService.GetDateWithTimeZoneOffset(DateTimeOffset.UtcNow, timeZoneQuery.TimeZoneOffsetHours);
var startPeriod = endPeriod.AddDays(-startPeriodDays);
///// <summary>
///// Получить статистику созданных шаблонов (расписаний) в БД ПАРР
///// </summary>
///// <param name="timeZoneQuery"></param>
///// <param name="startPeriodDays"></param>
///// <returns></returns>
//[HttpGet(ApiRoutes.StatTemplate.GetForPeriod)]
//public async Task<IActionResult> GetForPeriod([FromQuery] TimeZoneOffsetClient timeZoneQuery, [FromQuery] int startPeriodDays = 3)
//{
// var endPeriod = calendarService.GetDateWithTimeZoneOffset(DateTimeOffset.UtcNow, timeZoneQuery.TimeZoneOffsetHours);
// var startPeriod = endPeriod.AddDays(-startPeriodDays);
var query = templateService.Get()
.Where(t =>
t.DateCreated.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date >= startPeriod.Date
&& t.DateCreated.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date <= endPeriod.Date
).GroupBy(t => t.DateCreated.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date)
.Select(t => new
{
Date = t.Key,
CreatedObjs = t.Count()
});
// var query = templateService.Get()
// .Where(t =>
// t.DateCreated.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date >= startPeriod.Date
// && t.DateCreated.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date <= endPeriod.Date
// ).GroupBy(t => t.DateCreated.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date)
// .Select(t => new
// {
// Date = t.Key,
// CreatedObjs = t.Count()
// });
var result = await query.ToListAsync();
// var result = await query.ToListAsync();
var daysList = calendarService.GetDatesForPeriod(startPeriod, endPeriod);
// var daysList = calendarService.GetDatesForPeriod(startPeriod, endPeriod);
var response = new List<StatTemplatePeriodResponse>();
// var response = new List<StatTemplatePeriodResponse>();
daysList.ForEach(date => response.Add(new StatTemplatePeriodResponse
{
Date = date,
CreatedTemplatesCount = result.FirstOrDefault(t => DateOnly.FromDateTime(t.Date) == date)?.CreatedObjs ?? 0
}));
// daysList.ForEach(date => response.Add(new StatTemplatePeriodResponse
// {
// Date = date,
// CreatedTemplatesCount = result.FirstOrDefault(t => DateOnly.FromDateTime(t.Date) == date)?.CreatedObjs ?? 0
// }));
response = response.OrderBy(t => t.Date).ToList();
// response = response.OrderBy(t => t.Date).ToList();
return Ok(new Response<List<StatTemplatePeriodResponse>>(response, true));
}
// return Ok(new Response<List<StatTemplatePeriodResponse>>(response, true));
//}
}