diff --git a/AsbCloudWebApi/Controllers/SAUB/TelemetryDataBaseController.cs b/AsbCloudWebApi/Controllers/SAUB/TelemetryDataBaseController.cs index 51640915..15e15f9b 100644 --- a/AsbCloudWebApi/Controllers/SAUB/TelemetryDataBaseController.cs +++ b/AsbCloudWebApi/Controllers/SAUB/TelemetryDataBaseController.cs @@ -72,7 +72,7 @@ namespace AsbCloudWebApi.Controllers.SAUB /// [HttpGet("{idWell}")] [Permission] - public virtual async Task> GetDataAsync(int idWell, DateTime begin = default, + public virtual async Task>> GetDataAsync(int idWell, DateTime begin = default, int intervalSec = 600, int approxPointsCount = 1024, CancellationToken token = default) { int? idCompany = User.GetCompanyId(); @@ -102,7 +102,7 @@ namespace AsbCloudWebApi.Controllers.SAUB [Route("{idWell}/datesRange")] [Permission] [ProducesResponseType(typeof(DatesRangeDto), (int)System.Net.HttpStatusCode.OK)] - public virtual async Task GetDataDatesRangeAsync(int idWell, + public virtual async Task> GetDataDatesRangeAsync(int idWell, CancellationToken token = default) { int? idCompany = User.GetCompanyId(); diff --git a/AsbCloudWebApi/ProtobufModel.cs b/AsbCloudWebApi/ProtobufModel.cs index d389cd37..ea432162 100644 --- a/AsbCloudWebApi/ProtobufModel.cs +++ b/AsbCloudWebApi/ProtobufModel.cs @@ -10,10 +10,11 @@ namespace AsbCloudWebApi EnshureRegisteredDataSpin(); EnshureRegisteredDataSaub(); EnshureRegisteredWITS(); + EnshureRegisteredWirelineRunOutBaseDto(); EnshureRegisteredWirelineRunOutDto(); } - private static void EnshureRegisteredWirelineRunOutDto() + private static void EnshureRegisteredWirelineRunOutBaseDto() { var type = typeof(TelemetryWirelineRunOutBaseDto); if (RuntimeTypeModel.Default.IsDefined(type)) @@ -26,6 +27,19 @@ namespace AsbCloudWebApi .Add(5, nameof(TelemetryWirelineRunOutBaseDto.ReplaceWarnSp)); } + private static void EnshureRegisteredWirelineRunOutDto() + { + var type = typeof(TelemetryWirelineRunOutDto); + if (RuntimeTypeModel.Default.IsDefined(type)) + return; + RuntimeTypeModel.Default.Add(type, false) + .Add(1, nameof(TelemetryWirelineRunOutDto.DateTime)) + .Add(2, nameof(TelemetryWirelineRunOutDto.Hauling)) + .Add(3, nameof(TelemetryWirelineRunOutDto.HaulingWarnSp)) + .Add(4, nameof(TelemetryWirelineRunOutDto.Replace)) + .Add(5, nameof(TelemetryWirelineRunOutDto.ReplaceWarnSp)); + } + private static void EnshureRegisteredWITS() { EnshureRegisteredRecord1();