From 72e6c8931b4c0a5a29bc6bb290d90b28c759e05b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=82=D0=B5=D0=BF=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=94?= =?UTF-8?q?=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9?= Date: Tue, 23 Jan 2024 09:14:09 +0500 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=B0=20=D0=B8=D0=B7=20?= =?UTF-8?q?API=20=D0=BF=D0=BE=D0=B4=D1=81=D0=B8=D1=81=D1=82=D0=B5=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Удалён метод получения статистики наработки по активным скважинам. /api/Subsystem/statByActiveWell --- AsbCloudApp/Services/ISubsystemService.cs | 12 +----------- .../Services/Subsystems/SubsystemService.cs | 10 ---------- .../Subsystems/SubsystemController.cs | 18 ------------------ 3 files changed, 1 insertion(+), 39 deletions(-) diff --git a/AsbCloudApp/Services/ISubsystemService.cs b/AsbCloudApp/Services/ISubsystemService.cs index 458529c5..737cca4f 100644 --- a/AsbCloudApp/Services/ISubsystemService.cs +++ b/AsbCloudApp/Services/ISubsystemService.cs @@ -19,17 +19,7 @@ public interface ISubsystemService /// /// Task> GetStatAsync(SubsystemRequest request, CancellationToken token); - - /// - /// Получение статистики по наработке подсистем по активным скважинам - /// - /// - /// - /// - /// - /// - Task> GetStatByActiveWells(int idCompany, DateTime? gtDate, DateTime? ltDate, CancellationToken token); - + /// /// Получение статистики по наработке подсистем по активным скважинам /// diff --git a/AsbCloudInfrastructure/Services/Subsystems/SubsystemService.cs b/AsbCloudInfrastructure/Services/Subsystems/SubsystemService.cs index c5b38405..fd27efdf 100644 --- a/AsbCloudInfrastructure/Services/Subsystems/SubsystemService.cs +++ b/AsbCloudInfrastructure/Services/Subsystems/SubsystemService.cs @@ -71,16 +71,6 @@ internal class SubsystemService : ISubsystemService return stat; } - public async Task> GetStatByActiveWells(int idCompany, - DateTime? gtDate, - DateTime? ltDate, - CancellationToken token) - { - var activeWells = await wellService.GetAsync(new() { IdCompany = idCompany, IdState = 1 }, token); - var result = await GetStatAsync(activeWells, gtDate, ltDate, token); - return result; - } - public async Task> GetStatByActiveWells(IEnumerable wellIds, CancellationToken token) { var activeWells = await wellService.GetAsync(new() { Ids = wellIds, IdState = 1 }, token); diff --git a/AsbCloudWebApi/Controllers/Subsystems/SubsystemController.cs b/AsbCloudWebApi/Controllers/Subsystems/SubsystemController.cs index 86673090..183073c7 100644 --- a/AsbCloudWebApi/Controllers/Subsystems/SubsystemController.cs +++ b/AsbCloudWebApi/Controllers/Subsystems/SubsystemController.cs @@ -61,24 +61,6 @@ namespace AsbCloudWebApi.Controllers.Subsystems return Ok(dateRange); } - /// - /// получить статистику по активным скважинам - /// - /// Больше или равно дате - /// Меньше или равно дате - /// Токен - /// - [HttpGet("statByActiveWell")] - [ProducesResponseType(typeof(IEnumerable), (int)System.Net.HttpStatusCode.OK)] - public async Task GetStatByWellAsync(DateTime? gtDate, DateTime? ltDate, CancellationToken token) - { - var idCompany = User.GetCompanyId(); - if (!idCompany.HasValue) - return Forbid(); - var subsystemResult = await subsystemService.GetStatByActiveWells(idCompany.Value, gtDate, ltDate, token); - return Ok(subsystemResult); - } - private async Task UserHasAccessToWellAsync(int idWell, CancellationToken token) { var idCompany = User.GetCompanyId();