From e39a701738152f93947e1a3eecdc710d7e34a525 Mon Sep 17 00:00:00 2001 From: "ai.astrakhantsev" Date: Wed, 22 Feb 2023 11:35:35 +0500 Subject: [PATCH] #9156004 DrillParamsDto, FileCategoryDto, FileInfoDto, FileMarkDto, IId, IMapPoint, IWellRelated, JobState, LimitingParameterDataDto, LimitingParameterDto --- AsbCloudApp/Data/DrillParamsDto.cs | 14 ++++++++------ AsbCloudApp/Data/FileCategoryDto.cs | 2 -- AsbCloudApp/Data/FileInfoDto.cs | 1 - AsbCloudApp/Data/FileMarkDto.cs | 1 - AsbCloudApp/Data/IId.cs | 1 - AsbCloudApp/Data/IMapPoint.cs | 1 - AsbCloudApp/Data/IWellRelated.cs | 1 - AsbCloudApp/Data/JobDto.cs | 5 +---- AsbCloudApp/Data/LimitingParameterDataDto.cs | 2 -- AsbCloudApp/Data/LimitingParameterDto.cs | 2 -- 10 files changed, 9 insertions(+), 21 deletions(-) diff --git a/AsbCloudApp/Data/DrillParamsDto.cs b/AsbCloudApp/Data/DrillParamsDto.cs index d79f2451..b8111410 100644 --- a/AsbCloudApp/Data/DrillParamsDto.cs +++ b/AsbCloudApp/Data/DrillParamsDto.cs @@ -1,3 +1,5 @@ +using System.Linq; + namespace AsbCloudApp.Data { @@ -15,7 +17,7 @@ namespace AsbCloudApp.Data /// /// /// - public MinMaxDto Depth { get; set; } + public MinMaxDto Depth { get; set; } = null!; /// /// id well section type. @@ -25,26 +27,26 @@ namespace AsbCloudApp.Data /// /// axial load /// - public MinMaxExtendedViewDto AxialLoad { get; set; } + public MinMaxExtendedViewDto AxialLoad { get; set; } = null!; /// /// pressure /// - public MinMaxExtendedViewDto Pressure { get; set; } + public MinMaxExtendedViewDto Pressure { get; set; } = null!; /// /// rotor torque /// - public MinMaxExtendedViewDto RotorTorque { get; set; } + public MinMaxExtendedViewDto RotorTorque { get; set; } = null!; /// /// rotor speed /// - public MinMaxExtendedViewDto RotorSpeed { get; set; } + public MinMaxExtendedViewDto RotorSpeed { get; set; } = null!; /// /// flow /// - public MinMaxExtendedViewDto Flow { get; set; } + public MinMaxExtendedViewDto Flow { get; set; } = null!; } } \ No newline at end of file diff --git a/AsbCloudApp/Data/FileCategoryDto.cs b/AsbCloudApp/Data/FileCategoryDto.cs index 6d553dcd..2174af01 100644 --- a/AsbCloudApp/Data/FileCategoryDto.cs +++ b/AsbCloudApp/Data/FileCategoryDto.cs @@ -1,6 +1,5 @@ namespace AsbCloudApp.Data { -#nullable enable /// /// DTO категории файла /// @@ -19,5 +18,4 @@ /// public string ShortName { get; set; } = string.Empty; } -#nullable disable } diff --git a/AsbCloudApp/Data/FileInfoDto.cs b/AsbCloudApp/Data/FileInfoDto.cs index 1dde4735..05dfa1ff 100644 --- a/AsbCloudApp/Data/FileInfoDto.cs +++ b/AsbCloudApp/Data/FileInfoDto.cs @@ -4,7 +4,6 @@ using System.Linq; namespace AsbCloudApp.Data { -#nullable enable /// /// DTO информации о файле. Используется для загрузки файла. /// diff --git a/AsbCloudApp/Data/FileMarkDto.cs b/AsbCloudApp/Data/FileMarkDto.cs index a92ccfc9..57139367 100644 --- a/AsbCloudApp/Data/FileMarkDto.cs +++ b/AsbCloudApp/Data/FileMarkDto.cs @@ -2,7 +2,6 @@ using System; namespace AsbCloudApp.Data { -#nullable enable /// /// /// diff --git a/AsbCloudApp/Data/IId.cs b/AsbCloudApp/Data/IId.cs index 1e60b9b9..e5ad455e 100644 --- a/AsbCloudApp/Data/IId.cs +++ b/AsbCloudApp/Data/IId.cs @@ -1,6 +1,5 @@ namespace AsbCloudApp.Data { -#nullable enable /// /// Интерфейс данных с Id /// diff --git a/AsbCloudApp/Data/IMapPoint.cs b/AsbCloudApp/Data/IMapPoint.cs index c5a18cef..f71bd7fa 100644 --- a/AsbCloudApp/Data/IMapPoint.cs +++ b/AsbCloudApp/Data/IMapPoint.cs @@ -1,6 +1,5 @@ namespace AsbCloudApp.Data { -#nullable enable /// /// точка на карте /// diff --git a/AsbCloudApp/Data/IWellRelated.cs b/AsbCloudApp/Data/IWellRelated.cs index 7771766b..f79a03a9 100644 --- a/AsbCloudApp/Data/IWellRelated.cs +++ b/AsbCloudApp/Data/IWellRelated.cs @@ -1,6 +1,5 @@ namespace AsbCloudApp.Data { -#nullable enable /// /// Well related DTO /// diff --git a/AsbCloudApp/Data/JobDto.cs b/AsbCloudApp/Data/JobDto.cs index 2e9b336a..ea5a8e24 100644 --- a/AsbCloudApp/Data/JobDto.cs +++ b/AsbCloudApp/Data/JobDto.cs @@ -1,9 +1,7 @@ -using System; -using System.Collections; +using System.Collections; namespace AsbCloudApp.Data { -#nullable enable /// /// Состояние фоновой задачи /// @@ -52,5 +50,4 @@ namespace AsbCloudApp.Data /// public string? Error { get; set; } } -#nullable disable } diff --git a/AsbCloudApp/Data/LimitingParameterDataDto.cs b/AsbCloudApp/Data/LimitingParameterDataDto.cs index 83db213b..1bf982dc 100644 --- a/AsbCloudApp/Data/LimitingParameterDataDto.cs +++ b/AsbCloudApp/Data/LimitingParameterDataDto.cs @@ -2,7 +2,6 @@ namespace AsbCloudApp.Data { -#nullable enable /// /// Статистика по ограничивающим параметрам /// @@ -43,5 +42,4 @@ namespace AsbCloudApp.Data /// public short IdFeedRegulator { get; set; } } -#nullable disable } diff --git a/AsbCloudApp/Data/LimitingParameterDto.cs b/AsbCloudApp/Data/LimitingParameterDto.cs index a1f03219..45a3da74 100644 --- a/AsbCloudApp/Data/LimitingParameterDto.cs +++ b/AsbCloudApp/Data/LimitingParameterDto.cs @@ -2,7 +2,6 @@ namespace AsbCloudApp.Data { -#nullable enable /// /// Статистика по ограничивающим параметрам /// @@ -38,5 +37,4 @@ namespace AsbCloudApp.Data /// public int NumberInclusions { get; set; } } -#nullable disable }