From 49678c4973dbb3bcabebd8ef9487c1b8717e0df3 Mon Sep 17 00:00:00 2001 From: ngfrolov Date: Thu, 19 Jan 2023 11:43:37 +0500 Subject: [PATCH] fix TelemetryWirelineRunOut. make wellinfo optional for POST request. --- AsbCloudApp/Data/SAUB/TelemetryWirelineRunOutDto.cs | 12 ++++++++++-- .../ITelemetryWirelineRunOutRepository.cs | 2 +- .../Repository/TelemetryWirelineRunOutRepository.cs | 4 ++-- .../SAUB/TelemetryWirelineRunOutController.cs | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/AsbCloudApp/Data/SAUB/TelemetryWirelineRunOutDto.cs b/AsbCloudApp/Data/SAUB/TelemetryWirelineRunOutDto.cs index fb75c933..de9baccb 100644 --- a/AsbCloudApp/Data/SAUB/TelemetryWirelineRunOutDto.cs +++ b/AsbCloudApp/Data/SAUB/TelemetryWirelineRunOutDto.cs @@ -3,10 +3,11 @@ namespace AsbCloudApp.Data.SAUB { #nullable enable + /// - /// DTO телеметрии наработки талевого каната + /// DTO телеметрии наработки талевого каната от панели бурильщика /// - public class TelemetryWirelineRunOutDto + public class TelemetryWirelineRunOutBaseDto { /// /// отметка времени @@ -32,6 +33,13 @@ namespace AsbCloudApp.Data.SAUB /// Наработка талевого каната до сигнализации о необходимости замены, т*км /// public float ReplaceWarnSp { get; set; } + } + + /// + /// DTO телеметрии наработки талевого каната + /// + public class TelemetryWirelineRunOutDto : TelemetryWirelineRunOutBaseDto + { /// /// Информация по скважине diff --git a/AsbCloudApp/Repositories/ITelemetryWirelineRunOutRepository.cs b/AsbCloudApp/Repositories/ITelemetryWirelineRunOutRepository.cs index 24d3fb4d..c22c86ad 100644 --- a/AsbCloudApp/Repositories/ITelemetryWirelineRunOutRepository.cs +++ b/AsbCloudApp/Repositories/ITelemetryWirelineRunOutRepository.cs @@ -19,7 +19,7 @@ namespace AsbCloudApp.Repositories /// /// /// - Task AddOrUpdateAsync(string uid, TelemetryWirelineRunOutDto dto, CancellationToken token); + Task AddOrUpdateAsync(string uid, TelemetryWirelineRunOutBaseDto dto, CancellationToken token); /// /// Выдает данные по скважине diff --git a/AsbCloudInfrastructure/Repository/TelemetryWirelineRunOutRepository.cs b/AsbCloudInfrastructure/Repository/TelemetryWirelineRunOutRepository.cs index 325bb2b4..679bc019 100644 --- a/AsbCloudInfrastructure/Repository/TelemetryWirelineRunOutRepository.cs +++ b/AsbCloudInfrastructure/Repository/TelemetryWirelineRunOutRepository.cs @@ -29,7 +29,7 @@ namespace AsbCloudInfrastructure.Repository } /// - public async Task AddOrUpdateAsync(string uid, TelemetryWirelineRunOutDto dto, CancellationToken token) + public async Task AddOrUpdateAsync(string uid, TelemetryWirelineRunOutBaseDto dto, CancellationToken token) { var idTelemetry = telemetryService.GetOrCreateTelemetryIdByUid(uid); var timezoneOffset = telemetryService.GetTimezone(idTelemetry).Hours; @@ -93,7 +93,7 @@ namespace AsbCloudInfrastructure.Repository return result; } - private static TelemetryWirelineRunOut Convert(int idTelemetry, TelemetryWirelineRunOutDto dto, double timezoneOffset) + private static TelemetryWirelineRunOut Convert(int idTelemetry, TelemetryWirelineRunOutBaseDto dto, double timezoneOffset) { var entity = dto.Adapt(); entity.IdTelemetry = idTelemetry; diff --git a/AsbCloudWebApi/Controllers/SAUB/TelemetryWirelineRunOutController.cs b/AsbCloudWebApi/Controllers/SAUB/TelemetryWirelineRunOutController.cs index 6af02db7..878d634b 100644 --- a/AsbCloudWebApi/Controllers/SAUB/TelemetryWirelineRunOutController.cs +++ b/AsbCloudWebApi/Controllers/SAUB/TelemetryWirelineRunOutController.cs @@ -48,7 +48,7 @@ namespace AsbCloudWebApi.Controllers.SAUB [HttpPost] [Route("{uid}")] [AllowAnonymous] - public IActionResult PostData(string uid, [FromBody] TelemetryWirelineRunOutDto dto, CancellationToken token) + public IActionResult PostData(string uid, [FromBody] TelemetryWirelineRunOutBaseDto dto, CancellationToken token) { if (dto is null) return BadRequest("Dto shouldn't be null");