From 38fab5b6f0a1211ba13686fa989cddc8f044d5c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9E=D0=BB=D1=8F=20=D0=91=D0=B8=D0=B7=D1=8E=D0=BA=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0?= Date: Fri, 19 Jan 2024 17:19:26 +0500 Subject: [PATCH 1/2] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=BE?= =?UTF-8?q?=20=D1=81=D0=B2=D0=BE=D0=B9=D1=81=D1=82=D0=B2=D0=BE=20Date?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsbCloudApp/Data/SAUB/TelemetryDataSpinDto.cs | 9 --------- 1 file changed, 9 deletions(-) diff --git a/AsbCloudApp/Data/SAUB/TelemetryDataSpinDto.cs b/AsbCloudApp/Data/SAUB/TelemetryDataSpinDto.cs index 46b9cf28..e4a5ed3e 100644 --- a/AsbCloudApp/Data/SAUB/TelemetryDataSpinDto.cs +++ b/AsbCloudApp/Data/SAUB/TelemetryDataSpinDto.cs @@ -17,15 +17,6 @@ namespace AsbCloudApp.Data.SAUB /// public DateTime DateTime { get; set; } - /// - /// Дата - /// - public DateTime Date - { - get { return DateTime; } - set { DateTime = value; } - } - /// /// Ограничение числа оборотов вправо /// From 7379b6e33d837a27485b37d285a07555602ef679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9E=D0=BB=D1=8F=20=D0=91=D0=B8=D0=B7=D1=8E=D0=BA=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0?= Date: Fri, 19 Jan 2024 20:18:11 +0500 Subject: [PATCH 2/2] =?UTF-8?q?=D0=9F=D1=80=D0=B8=D0=B2=D0=B5=D0=B4=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D0=B2=D0=BE=D0=B9=D1=81=D1=82=D0=B2?= =?UTF-8?q?=20TelemetryDataSaubDto=20=D0=B2=20=D1=81=D0=BE=D0=BE=D1=82?= =?UTF-8?q?=D0=B2=D0=B5=D1=82=D1=81=D1=82=D0=B2=D0=B8=D0=B5=20=D1=81=D0=BE?= =?UTF-8?q?=20=D1=81=D0=B2=D0=BE=D0=B9=D1=81=D1=82=D0=B2=D0=B0=D0=BC=D0=B8?= =?UTF-8?q?=20TelemetryDataSaub?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsbCloudApp/Data/SAUB/TelemetryDataSaubDto.cs | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/AsbCloudApp/Data/SAUB/TelemetryDataSaubDto.cs b/AsbCloudApp/Data/SAUB/TelemetryDataSaubDto.cs index 56433c36..c2a7944b 100644 --- a/AsbCloudApp/Data/SAUB/TelemetryDataSaubDto.cs +++ b/AsbCloudApp/Data/SAUB/TelemetryDataSaubDto.cs @@ -1,4 +1,5 @@ using System; +using System.ComponentModel.DataAnnotations; namespace AsbCloudApp.Data.SAUB { @@ -23,7 +24,8 @@ namespace AsbCloudApp.Data.SAUB /// 6 - "ПОДЪЕМ С ПРОРАБОТКОЙ" /// 10 - "БЛОКИРОВКА" /// - public short? Mode { get; set; } + [Required] + public short Mode { get; set; } /// /// telemetry id @@ -38,17 +40,17 @@ namespace AsbCloudApp.Data.SAUB /// /// Глубина забоя, м /// - public float? WellDepth { get; set; } + public float WellDepth { get; set; } /// /// Глубина долота, м /// - public float? BitDepth { get; set; } + public float BitDepth { get; set; } /// /// Талевый блок. Положение, м /// - public float? BlockPosition { get; set; } + public float BlockPosition { get; set; } /// /// Талевый блок. Мин положение, м @@ -88,7 +90,7 @@ namespace AsbCloudApp.Data.SAUB /// /// Давление, атм /// - public float? Pressure { get; set; } + public float Pressure { get; set; } /// /// Давление при холостом ходе, атм @@ -123,7 +125,7 @@ namespace AsbCloudApp.Data.SAUB /// /// осевая нагрузка, т /// - public float? AxialLoad { get; set; } + public float AxialLoad { get; set; } /// /// задание осевой нагрузки, т @@ -138,7 +140,7 @@ namespace AsbCloudApp.Data.SAUB /// /// Вес на крюке, т /// - public float? HookWeight { get; set; } + public float HookWeight { get; set; } /// /// Вес на крюке на х.х., т @@ -158,7 +160,7 @@ namespace AsbCloudApp.Data.SAUB /// /// момент ротора, кН*м /// - public float? RotorTorque { get; set; } + public float RotorTorque { get; set; } /// /// момент ротора на х.х., кН*м @@ -178,7 +180,7 @@ namespace AsbCloudApp.Data.SAUB /// /// скорость ротора, об/мин /// - public float? RotorSpeed { get; set; } + public float RotorSpeed { get; set; } /// /// расход, л/с