forked from ddrilling/AsbCloudServer
редактирование метода в контроллере
изменение интерфейса наработки подсистем
This commit is contained in:
parent
3aa01ebe47
commit
562bf5b348
@ -46,7 +46,16 @@ namespace AsbCloudApp.Services.Subsystems
|
|||||||
/// <param name="request"></param>
|
/// <param name="request"></param>
|
||||||
/// <param name="token"></param>
|
/// <param name="token"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
Task<DatesRangeDto?> GetDateRangeOperationTimeAsync(SubsystemOperationTimeRequest request, CancellationToken token);
|
Task<DatesRangeDto?> GetDateRangeOperationTimeAsync(SubsystemOperationTimeRequest request, CancellationToken token);
|
||||||
|
/// <summary>
|
||||||
|
/// Получение статистики по наработке подсистем по активным скважинам
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="idCompany"></param>
|
||||||
|
/// <param name="gtDate"></param>
|
||||||
|
/// <param name="ltDate"></param>
|
||||||
|
/// <param name="token"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
Task<IEnumerable<SubsystemActiveWellStatDto>?> GetStatByActiveWell(int idCompany, DateTime? gtDate, DateTime? ltDate, CancellationToken token);
|
||||||
}
|
}
|
||||||
#nullable disable
|
#nullable disable
|
||||||
}
|
}
|
||||||
|
@ -187,7 +187,7 @@ namespace AsbCloudInfrastructure.Services.Subsystems
|
|||||||
|
|
||||||
|
|
||||||
private async Task<IEnumerable<WellDto>> GetSubsystemOperationTimeAll(int idCompany, CancellationToken token)
|
private async Task<IEnumerable<WellDto>> GetSubsystemOperationTimeAll(int idCompany, CancellationToken token)
|
||||||
{
|
{
|
||||||
var listWell = await wellService.GetWellsByCompanyAsync(idCompany, token);
|
var listWell = await wellService.GetWellsByCompanyAsync(idCompany, token);
|
||||||
var active = listWell.Where(w => w.IdState == 1);
|
var active = listWell.Where(w => w.IdState == 1);
|
||||||
return active;
|
return active;
|
||||||
|
@ -52,10 +52,15 @@ namespace AsbCloudWebApi.Controllers.Subsystems
|
|||||||
[HttpGet("statByActiveWell")]
|
[HttpGet("statByActiveWell")]
|
||||||
[ProducesResponseType(typeof(IEnumerable<SubsystemStatDto>), (int)System.Net.HttpStatusCode.OK)]
|
[ProducesResponseType(typeof(IEnumerable<SubsystemStatDto>), (int)System.Net.HttpStatusCode.OK)]
|
||||||
public async Task<IActionResult> GetStatByWellAsync([FromQuery] DateTime? GtDate, DateTime? LtDate, CancellationToken token = default)
|
public async Task<IActionResult> GetStatByWellAsync([FromQuery] DateTime? GtDate, DateTime? LtDate, CancellationToken token = default)
|
||||||
{
|
{
|
||||||
|
var idCompany = User.GetCompanyId();
|
||||||
|
if (idCompany.HasValue)
|
||||||
|
{
|
||||||
|
var subsystemResult = await subsystemOperationTimeService.GetStatByActiveWell(idCompany.Value, GtDate, LtDate, token);
|
||||||
|
return Ok(subsystemResult);
|
||||||
|
}
|
||||||
|
return Forbid();
|
||||||
|
|
||||||
var subsystemResult = await subsystemOperationTimeService.GetStatAsync(request, token);
|
|
||||||
return Ok(subsystemResult);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
Loading…
Reference in New Issue
Block a user