From b7bb7ef31f03f886d4e951532cd29a5d53e5a591 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: Mon, 25 Dec 2023 16:16:06 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BD=D0=B0=D0=BB=D0=B8=D1=87=D0=B8=D1=8F=20=D1=82?= =?UTF-8?q?=D0=B5=D0=BB=D0=B5=D0=BC=D0=B5=D1=82=D1=80=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. При получении наработки, возвращается пустой список если у скважины нет телеметрии. Попутно удалил неиспользуемую зависимость 2. При получении РТК отчёт, возвращается пустой список если у скважины нет телеметрии --- .../Report/ProcessMapReportWellDrillingService.cs | 2 +- .../Services/Subsystems/SubsystemService.cs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/AsbCloudInfrastructure/Services/ProcessMaps/Report/ProcessMapReportWellDrillingService.cs b/AsbCloudInfrastructure/Services/ProcessMaps/Report/ProcessMapReportWellDrillingService.cs index 0561e9ee..eb63d709 100644 --- a/AsbCloudInfrastructure/Services/ProcessMaps/Report/ProcessMapReportWellDrillingService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMaps/Report/ProcessMapReportWellDrillingService.cs @@ -40,7 +40,7 @@ public class ProcessMapReportWellDrillingService : IProcessMapReportWellDrilling ?? throw new ArgumentInvalidException(nameof(idWell), $"Скважина с Id: {idWell} не найдена"); if (!well.IdTelemetry.HasValue) - throw new ArgumentInvalidException(nameof(idWell), $"Скважина с Id: {idWell} не имеет телеметрии"); + return Enumerable.Empty(); var processMapPlanWellDrillings = await processMapPlanWellDrillingRepository.GetByIdWellAsync(idWell, token); diff --git a/AsbCloudInfrastructure/Services/Subsystems/SubsystemService.cs b/AsbCloudInfrastructure/Services/Subsystems/SubsystemService.cs index 209fc65f..34626f78 100644 --- a/AsbCloudInfrastructure/Services/Subsystems/SubsystemService.cs +++ b/AsbCloudInfrastructure/Services/Subsystems/SubsystemService.cs @@ -25,19 +25,16 @@ internal class SubsystemService : ISubsystemService private readonly IWellService wellService; private readonly IDetectedOperationService detectedOperationService; - private readonly ITelemetryDataSaubService telemetryDataSaubService; private IDictionary subsystems = new Dictionary(); public SubsystemService(ICrudRepository subsystemRepository, IWellService wellService, - IDetectedOperationService detectedOperationService, - ITelemetryDataSaubService telemetryDataSaubService) + IDetectedOperationService detectedOperationService) { this.wellService = wellService; this.subsystemRepository = subsystemRepository; this.detectedOperationService = detectedOperationService; - this.telemetryDataSaubService = telemetryDataSaubService; } public async Task> GetStatAsync(SubsystemRequest request, CancellationToken token) @@ -45,10 +42,13 @@ internal class SubsystemService : ISubsystemService var well = await wellService.GetOrDefaultAsync(request.IdWell, token) ?? throw new ArgumentInvalidException(nameof(request.IdWell), $"Well Id: {request.IdWell} does not exist"); + if(!well.IdTelemetry.HasValue) + return Enumerable.Empty(); + var detectedOperationSummaryRequest = new DetectedOperationRequest { IdWell = request.IdWell, - IdsTelemetries = new[] { well.IdTelemetry!.Value }, + IdsTelemetries = new[] { well.IdTelemetry.Value }, IdsCategories = WellOperationCategory.MechanicalDrillingSubIds, GeDateStart = request.GeDate,