From ac0e96a158537a67d38ac3161bde4c1b4ac45143 Mon Sep 17 00:00:00 2001 From: ngfrolov Date: Tue, 23 May 2023 13:41:27 +0500 Subject: [PATCH] ProcessMapReportService. Replace Pressure by PressureDelta. --- AsbCloudApp/Data/SAUB/TelemetryDataSaubStatDto.cs | 5 +++++ .../Services/ProcessMap/ProcessMapReportService.cs | 2 +- .../Services/SAUB/TelemetryDataSaubService.cs | 1 + AsbCloudWebApi/wwwroot/index.html | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/AsbCloudApp/Data/SAUB/TelemetryDataSaubStatDto.cs b/AsbCloudApp/Data/SAUB/TelemetryDataSaubStatDto.cs index 8c7b3198..d08df130 100644 --- a/AsbCloudApp/Data/SAUB/TelemetryDataSaubStatDto.cs +++ b/AsbCloudApp/Data/SAUB/TelemetryDataSaubStatDto.cs @@ -41,6 +41,11 @@ namespace AsbCloudApp.Data.SAUB /// действующее задание давления /// public float PressureSp { get; set; } + + /// + /// действующее задание перепада давления + /// + public float PressureSpDelta { get; set; } /// /// Давление при холостом ходе. diff --git a/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportService.cs b/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportService.cs index 359ec1ab..05414217 100644 --- a/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportService.cs @@ -347,7 +347,7 @@ namespace AsbCloudInfrastructure.Services.ProcessMap MechDrillingHours = (telemetryLast.DateMax - telemetryFirst.DateMin).TotalHours; BlockSpeed = new(t => t.BlockSpeedSp, t => t.BlockSpeed, null, 1, IdMode); - Pressure = new(t => t.PressureSp, t => t.Pressure, t=>t.PressureDeltaLimitMax, 2, IdMode); + Pressure = new(t => t.PressureSpDelta, t => t.PressureDelta, t=>t.PressureDeltaLimitMax, 2, IdMode); RotorTorque = new(t => t.RotorTorqueSp, t => t.RotorTorque, t=>t.RotorTorqueLimitMax, 3, IdMode); AxialLoad = new(t => t.AxialLoadSp, t => t.AxialLoad, t=>t.AxialLoadLimitMax, 4, IdMode); diff --git a/AsbCloudInfrastructure/Services/SAUB/TelemetryDataSaubService.cs b/AsbCloudInfrastructure/Services/SAUB/TelemetryDataSaubService.cs index 596c0b52..9aaf26bf 100644 --- a/AsbCloudInfrastructure/Services/SAUB/TelemetryDataSaubService.cs +++ b/AsbCloudInfrastructure/Services/SAUB/TelemetryDataSaubService.cs @@ -67,6 +67,7 @@ namespace AsbCloudInfrastructure.Services.SAUB PressureIdle = g.Average(t => t.PressureIdle!.Value), PressureDeltaLimitMax = g.Average(t => t.PressureDeltaLimitMax!.Value), PressureDelta = g.Average(t => t.Pressure!.Value - t.PressureIdle!.Value), + PressureSpDelta = g.Average(t => t.PressureSp!.Value - t.PressureIdle!.Value), AxialLoad = g.Average(t => t.AxialLoad!.Value), AxialLoadSp = g.Average(t => t.AxialLoadSp!.Value), diff --git a/AsbCloudWebApi/wwwroot/index.html b/AsbCloudWebApi/wwwroot/index.html index f7e7b034..55a0c527 100644 --- a/AsbCloudWebApi/wwwroot/index.html +++ b/AsbCloudWebApi/wwwroot/index.html @@ -1 +1 @@ -DDrilling
\ No newline at end of file +DDrilling
\ No newline at end of file