From d8b131622f129ac7514a19c744a9df62a095f05d Mon Sep 17 00:00:00 2001 From: "ai.astrakhantsev" Date: Tue, 24 Jan 2023 09:59:18 +0500 Subject: [PATCH] #7987467 fix --- AsbCloudApp/Data/SAUB/TelemetryDataSaubStatDto.cs | 5 +++++ .../Services/ProcessMap/ProcessMapService.cs | 3 ++- .../Services/SAUB/TelemetryDataSaubService.cs | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/AsbCloudApp/Data/SAUB/TelemetryDataSaubStatDto.cs b/AsbCloudApp/Data/SAUB/TelemetryDataSaubStatDto.cs index 90bbd5f0..478f227c 100644 --- a/AsbCloudApp/Data/SAUB/TelemetryDataSaubStatDto.cs +++ b/AsbCloudApp/Data/SAUB/TelemetryDataSaubStatDto.cs @@ -63,6 +63,11 @@ namespace AsbCloudApp.Data.SAUB /// public float PressureDeltaLimitMax { get; set; } + /// + /// Перепад давления + /// + public float PressureDelta { get; set; } + /// /// осевая нагрузка /// diff --git a/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapService.cs b/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapService.cs index 0884896d..2b932368 100644 --- a/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapService.cs @@ -181,6 +181,7 @@ namespace AsbCloudInfrastructure.Services.ProcessMap result.PressureSp += item.PressureSp * itemWeight; result.PressureSpRotor += item.PressureSpSlide * itemWeight; result.PressureIdle += item.PressureIdle * itemWeight; + result.PressureDelta += item.PressureDelta * itemWeight; result.AxialLoad += item.AxialLoad * itemWeight; result.AxialLoadSp += item.AxialLoadSp * itemWeight; @@ -227,7 +228,7 @@ namespace AsbCloudInfrastructure.Services.ProcessMap if (telemetryDataStat is not null) { dto.PressureDiff.SetpointFact = telemetryDataStat.PressureSp; - dto.PressureDiff.Fact = telemetryDataStat.Pressure; + dto.PressureDiff.Fact = telemetryDataStat.PressureDelta; dto.PressureDiff.Limit = telemetryDataStat.PressureDeltaLimitMax; dto.AxialLoad.SetpointFact = telemetryDataStat.AxialLoadSp; diff --git a/AsbCloudInfrastructure/Services/SAUB/TelemetryDataSaubService.cs b/AsbCloudInfrastructure/Services/SAUB/TelemetryDataSaubService.cs index 8ec8cb10..ac70cb3b 100644 --- a/AsbCloudInfrastructure/Services/SAUB/TelemetryDataSaubService.cs +++ b/AsbCloudInfrastructure/Services/SAUB/TelemetryDataSaubService.cs @@ -53,6 +53,7 @@ namespace AsbCloudInfrastructure.Services.SAUB PressureSpSlide = g.Average(t => t.PressureSpSlide!.Value), PressureIdle = g.Average(t => t.PressureIdle!.Value), PressureDeltaLimitMax = g.Average(t => t.PressureDeltaLimitMax!.Value), + PressureDelta = g.Average(t => t.Pressure!.Value - t.PressureIdle!.Value), AxialLoad = g.Average(t => t.AxialLoad!.Value), AxialLoadSp = g.Average(t => t.AxialLoadSp!.Value),