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

feat(api,core,domain): Статистика по роботам, кол-во работающих роботов в час

Browse Source
This commit is contained in:
Mikhail Trubnikov
2026-06-15 11:00:53 +10:00
parent 19cb6b50bf
commit 21e00ce42e
9 changed files with 223 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
PARR.API/Contracts/V1/Responses/Statistics/StatRobotTaskPeriodResponse.cs
View File

@@ -23,5 +23,10 @@
/// Ошибок
/// </summary>
public int Errors { get; set; }
/// <summary>
/// Среднее кол-во роботов работающих в течении часа
/// </summary>
public double AvgRobots { get; set; }
}
}

29
PARR.API/Controllers/V1/Statistics/StatRobotTaskController.cs
View File

@@ -8,7 +8,9 @@ using PARR.API.Contracts.V1.Responses.Base;
using PARR.API.Contracts.V1.Responses.Statistics;
using PARR.API.Controllers.V1.Base;
using PARR.Core.Repositories.Interfaces;
using PARR.Core.Services.RobotSnapshotServices;
using PARR.Domain.Common.Roles;
using PARR.Domain.DTOs.RobotSnapshotDTO;
using PARR.Domain.Enums;
namespace PARR.API.Controllers.V1.Statistics
@@ -24,13 +26,15 @@ namespace PARR.API.Controllers.V1.Statistics
private readonly ITaskStatusRepository taskStatusService;
private readonly IRobotHistoryRepository robotHistoryService;
private readonly IMapper mapper;
private readonly IRobotSnapshotService _robotSnapshotService;
public StatRobotTaskController(
IRobotRepository robotService,
IRobotConfigurationRepository robotConfigurationService,
ITaskStatusRepository taskStatusService,
IRobotHistoryRepository robotHistoryService,
IMapper mapper
IMapper mapper,
IRobotSnapshotService robotSnapshotService
)
{
this.robotService = robotService;
@@ -38,6 +42,7 @@ namespace PARR.API.Controllers.V1.Statistics
this.taskStatusService = taskStatusService;
this.robotHistoryService = robotHistoryService;
this.mapper = mapper;
_robotSnapshotService = robotSnapshotService;
}
/// <summary>
@@ -87,11 +92,11 @@ namespace PARR.API.Controllers.V1.Statistics
[HttpGet(ApiRoutes.StatRobotTask.GetPeriodStatistics)]
public async Task<IActionResult> GetPeriodStatistics([FromRoute] RobotsEnum robot)
{
var offset = TimeSpan.FromHours(0);
int minusHour = 24;
var queryDate = DateTimeOffset.UtcNow.AddHours(-minusHour);
queryDate = new DateTimeOffset(queryDate.Year, queryDate.Month, queryDate.Day, queryDate.Hour, 0, 0, new TimeSpan(0));
//queryDate = queryDate.Date + new TimeSpan(queryDate.Hour, 0, 0);
//queryDate=queryDate.ToOffset(TimeSpan.Zero);
queryDate = new DateTimeOffset(queryDate.Year, queryDate.Month, queryDate.Day, queryDate.Hour, 0, 0, offset);
var query = robotHistoryService.Get()
@@ -110,16 +115,24 @@ namespace PARR.API.Controllers.V1.Statistics
var statistics = await query.ToListAsync();
//if (!statistics.Any())
// return NoContent();
var periodList = GetPeriodList(queryDate, DateTimeOffset.UtcNow);
if (!periodList.Any())
return NoContent();
// Статистика по роботам (кол-во роботов)
var robotStats = await _robotSnapshotService.GetHourlyAnalyticsByRobotTypeAsync(new RobotAnalyticsRobotTypeQuery
{
DateStart = queryDate,
DateEnd = DateTimeOffset.UtcNow,
Offset = offset,
RobotType = robot
});
periodList.ForEach(item =>
{
var robotCount = robotStats.FirstOrDefault(t => t.Hour.Date == item.Date.Date && t.Hour.Hour == item.Date.Hour);
var statItem = statistics.FirstOrDefault(t => t.Date.Date == item.Date.Date && t.Date.Hour == item.Date.Hour);
if (statItem != null)
{
@@ -127,6 +140,7 @@ namespace PARR.API.Controllers.V1.Statistics
item.Creating = statItem.Creating;
item.Updating = statItem.Updating;
item.Ok = statItem.Ok;
item.AvgRobots = robotCount?.AvgRobots ?? 0;
}
});
@@ -150,6 +164,7 @@ namespace PARR.API.Controllers.V1.Statistics
Errors = 0,
Ok = 0,
Updating = 0,
AvgRobots = 0,
Date = new DateTimeOffset(periodDate.Date.Year, periodDate.Date.Month, periodDate.Date.Day, periodDate.Hour, 0, 0, new TimeSpan(0)),
});

24
PARR.API/Controllers/V1/TestController.cs
View File

@@ -173,14 +173,24 @@ namespace PARR.API.Controllers.V1
[HttpGet(ApiRoutes.Test.TestHandler)]
public async Task<IActionResult> Test()
{
var data = await _robotSnapshotService.GetHourlyAnalyticsAsync(new RobotAnalyticsQuery
{
DateStart = DateTimeOffset.UtcNow.AddHours(-1),
DateEnd = DateTimeOffset.UtcNow,
Offset = TimeSpan.FromMinutes(600)
});
//var data = await _robotSnapshotService.GetHourlyAnalyticsAsync(new RobotAnalyticsQuery
//{
// DateStart = DateTimeOffset.UtcNow.AddHours(-1),
// DateEnd = DateTimeOffset.UtcNow,
// Offset = TimeSpan.FromMinutes(600)
//});
return Ok(data);
//var data = await _robotSnapshotService.GetHourlyAnalyticsByRobotTypeAsync(new RobotAnalyticsRobotTypeQuery
//{
// DateStart = DateTimeOffset.UtcNow.AddHours(-12),
// DateEnd = DateTimeOffset.UtcNow,
// Offset = TimeSpan.FromMinutes(600),
// RobotType = PARR.Domain.Enums.RobotsEnum.TemplateOrder
//});
//return Ok(data);
return Ok();
}