diff --git a/AsbCloudInfrastructure/AsbCloudInfrastructure.csproj b/AsbCloudInfrastructure/AsbCloudInfrastructure.csproj index 3e0d80ab..86ae7c27 100644 --- a/AsbCloudInfrastructure/AsbCloudInfrastructure.csproj +++ b/AsbCloudInfrastructure/AsbCloudInfrastructure.csproj @@ -2,6 +2,7 @@ net6.0 + enable diff --git a/AsbCloudInfrastructure/Background/BackgroundWorker.cs b/AsbCloudInfrastructure/Background/BackgroundWorker.cs index 9453e6a9..e50b21b8 100644 --- a/AsbCloudInfrastructure/Background/BackgroundWorker.cs +++ b/AsbCloudInfrastructure/Background/BackgroundWorker.cs @@ -94,5 +94,5 @@ namespace AsbCloudInfrastructure.Background } } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Background/WorkBase.cs b/AsbCloudInfrastructure/Background/WorkBase.cs index ce07a2fa..e8adf04c 100644 --- a/AsbCloudInfrastructure/Background/WorkBase.cs +++ b/AsbCloudInfrastructure/Background/WorkBase.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Background { -#nullable enable + /// /// Класс разовой работы. /// Разовая работа приоритетнее периодической. @@ -65,5 +65,5 @@ namespace AsbCloudInfrastructure.Background ActionAsync = actionAsync; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Background/WorkPeriodic.cs b/AsbCloudInfrastructure/Background/WorkPeriodic.cs index ae29ee78..cbd34fec 100644 --- a/AsbCloudInfrastructure/Background/WorkPeriodic.cs +++ b/AsbCloudInfrastructure/Background/WorkPeriodic.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Background { -#nullable enable + /// /// Класс периодической работы. /// @@ -32,5 +32,5 @@ namespace AsbCloudInfrastructure.Background Period = period; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Background/WorkQueue.cs b/AsbCloudInfrastructure/Background/WorkQueue.cs index 5521d373..ce77fa94 100644 --- a/AsbCloudInfrastructure/Background/WorkQueue.cs +++ b/AsbCloudInfrastructure/Background/WorkQueue.cs @@ -4,7 +4,7 @@ using System.Linq; namespace AsbCloudInfrastructure.Background { -#nullable enable + /// /// /// Очередь работ @@ -103,5 +103,5 @@ namespace AsbCloudInfrastructure.Background return work; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/DateTimeExtentions.cs b/AsbCloudInfrastructure/DateTimeExtentions.cs index 9686e948..0beb0b3e 100644 --- a/AsbCloudInfrastructure/DateTimeExtentions.cs +++ b/AsbCloudInfrastructure/DateTimeExtentions.cs @@ -2,7 +2,7 @@ namespace AsbCloudInfrastructure { -#nullable enable + public static class DateTimeExtentions { /// @@ -78,5 +78,5 @@ namespace AsbCloudInfrastructure return indexOfMiddle; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/DependencyInjection.cs b/AsbCloudInfrastructure/DependencyInjection.cs index cd7d798f..eba6c794 100644 --- a/AsbCloudInfrastructure/DependencyInjection.cs +++ b/AsbCloudInfrastructure/DependencyInjection.cs @@ -28,7 +28,7 @@ using System; namespace AsbCloudInfrastructure { -#nullable enable + public static class DependencyInjection { public static IAsbCloudDbContext MakeContext(string connectionString) @@ -215,5 +215,5 @@ namespace AsbCloudInfrastructure .AddTransient(provider => new Lazy(() => implementationFactory(provider))); } -#nullable disable + } diff --git a/AsbCloudInfrastructure/MemoryCacheExtentions.cs b/AsbCloudInfrastructure/MemoryCacheExtentions.cs index eb4a591a..c616aa9a 100644 --- a/AsbCloudInfrastructure/MemoryCacheExtentions.cs +++ b/AsbCloudInfrastructure/MemoryCacheExtentions.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure { -#nullable enable + public static class MemoryCacheExtentions { private static readonly TimeSpan CacheOlescence = TimeSpan.FromMinutes(5); diff --git a/AsbCloudInfrastructure/PredicateBuilder.cs b/AsbCloudInfrastructure/PredicateBuilder.cs index ff0bf720..05ca6779 100644 --- a/AsbCloudInfrastructure/PredicateBuilder.cs +++ b/AsbCloudInfrastructure/PredicateBuilder.cs @@ -5,7 +5,7 @@ using System.Linq.Expressions; namespace AsbCloudInfrastructure { -#nullable enable + /// /// stolen from https://github.com/lotosbin/BinbinPredicateBuilder /// @@ -77,4 +77,3 @@ namespace AsbCloudInfrastructure } } } -#nullable disable \ No newline at end of file diff --git a/AsbCloudInfrastructure/ReportDataSourcePgCloud.cs b/AsbCloudInfrastructure/ReportDataSourcePgCloud.cs index 1fdc7d21..963eb8db 100644 --- a/AsbCloudInfrastructure/ReportDataSourcePgCloud.cs +++ b/AsbCloudInfrastructure/ReportDataSourcePgCloud.cs @@ -8,7 +8,7 @@ using System.Linq; namespace AsbCloudInfrastructure { -#nullable enable + public class ReportDataSourcePgCloud : IReportDataSource { private readonly IAsbCloudDbContext context; @@ -159,5 +159,5 @@ namespace AsbCloudInfrastructure public WellInfoReport GetWellInfo() => info; } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Repository/CacheBase.cs b/AsbCloudInfrastructure/Repository/CacheBase.cs index 042f2517..a66dbc37 100644 --- a/AsbCloudInfrastructure/Repository/CacheBase.cs +++ b/AsbCloudInfrastructure/Repository/CacheBase.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Repository { -#nullable enable + public class CacheBase : QueryContainer where TEntity : class, AsbCloudDb.Model.IId { @@ -58,5 +58,5 @@ namespace AsbCloudInfrastructure.Repository return cache; } } -#nullable disable + } \ No newline at end of file diff --git a/AsbCloudInfrastructure/Repository/CrudCacheRepositoryBase.cs b/AsbCloudInfrastructure/Repository/CrudCacheRepositoryBase.cs index ebea5d96..5b761e25 100644 --- a/AsbCloudInfrastructure/Repository/CrudCacheRepositoryBase.cs +++ b/AsbCloudInfrastructure/Repository/CrudCacheRepositoryBase.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Repository { -#nullable enable + /// /// CRUD /// @@ -110,5 +110,5 @@ namespace AsbCloudInfrastructure.Repository protected virtual TEntity Convert(TDto src) => src.Adapt(); } -#nullable disable + } \ No newline at end of file diff --git a/AsbCloudInfrastructure/Repository/CrudRepositoryBase.cs b/AsbCloudInfrastructure/Repository/CrudRepositoryBase.cs index 5cd4ac73..f21dd487 100644 --- a/AsbCloudInfrastructure/Repository/CrudRepositoryBase.cs +++ b/AsbCloudInfrastructure/Repository/CrudRepositoryBase.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Repository { -#nullable enable + /// /// CRUD сервис для работы с БД /// @@ -133,5 +133,5 @@ namespace AsbCloudInfrastructure.Repository protected virtual TEntity Convert(TDto src) => src.Adapt(); } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Repository/CrudWellRelatedCacheRepositoryBase.cs b/AsbCloudInfrastructure/Repository/CrudWellRelatedCacheRepositoryBase.cs index 1646cb51..c02702b5 100644 --- a/AsbCloudInfrastructure/Repository/CrudWellRelatedCacheRepositoryBase.cs +++ b/AsbCloudInfrastructure/Repository/CrudWellRelatedCacheRepositoryBase.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Repository { -#nullable enable + public class CrudWellRelatedCacheRepositoryBase : CrudCacheRepositoryBase, IRepositoryWellRelated where TDto : AsbCloudApp.Data.IId, AsbCloudApp.Data.IWellRelated where TEntity : class, IId, IWellRelated @@ -46,5 +46,5 @@ namespace AsbCloudInfrastructure.Repository return dtos; } } -#nullable disable + } \ No newline at end of file diff --git a/AsbCloudInfrastructure/Repository/CrudWellRelatedRepositoryBase.cs b/AsbCloudInfrastructure/Repository/CrudWellRelatedRepositoryBase.cs index fa88b576..6af596bc 100644 --- a/AsbCloudInfrastructure/Repository/CrudWellRelatedRepositoryBase.cs +++ b/AsbCloudInfrastructure/Repository/CrudWellRelatedRepositoryBase.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Repository { -#nullable enable + public class CrudWellRelatedRepositoryBase : CrudRepositoryBase, IRepositoryWellRelated where TDto : AsbCloudApp.Data.IId, AsbCloudApp.Data.IWellRelated where TEntity : class, IId, IWellRelated @@ -41,5 +41,5 @@ namespace AsbCloudInfrastructure.Repository return dtos; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Repository/DepositRepository.cs b/AsbCloudInfrastructure/Repository/DepositRepository.cs index fbde8713..4944f79d 100644 --- a/AsbCloudInfrastructure/Repository/DepositRepository.cs +++ b/AsbCloudInfrastructure/Repository/DepositRepository.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Repository { -#nullable enable + public class DepositRepository : IDepositRepository { private readonly IAsbCloudDbContext db; @@ -121,5 +121,5 @@ namespace AsbCloudInfrastructure.Repository return dtos; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Repository/FileRepository.cs b/AsbCloudInfrastructure/Repository/FileRepository.cs index 3c1d4607..7b078e10 100644 --- a/AsbCloudInfrastructure/Repository/FileRepository.cs +++ b/AsbCloudInfrastructure/Repository/FileRepository.cs @@ -13,7 +13,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Repository { -#nullable enable + public class FileRepository : IFileRepository { private readonly IQueryable dbSetConfigured; @@ -288,5 +288,5 @@ namespace AsbCloudInfrastructure.Repository return dto; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Repository/FileStorageRepository.cs b/AsbCloudInfrastructure/Repository/FileStorageRepository.cs index 8bd61e2f..94c932db 100644 --- a/AsbCloudInfrastructure/Repository/FileStorageRepository.cs +++ b/AsbCloudInfrastructure/Repository/FileStorageRepository.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Repository { -#nullable enable + public class FileStorageRepository : IFileStorageRepository { /// @@ -117,5 +117,5 @@ namespace AsbCloudInfrastructure.Repository Directory.CreateDirectory(directoryName); } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Repository/GtrWitsRepository.cs b/AsbCloudInfrastructure/Repository/GtrWitsRepository.cs index f3c21918..d3e395d3 100644 --- a/AsbCloudInfrastructure/Repository/GtrWitsRepository.cs +++ b/AsbCloudInfrastructure/Repository/GtrWitsRepository.cs @@ -13,7 +13,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Repository { -#nullable enable + public class GtrWitsRepository : IGtrRepository { private readonly IAsbCloudDbContext db; @@ -156,5 +156,5 @@ namespace AsbCloudInfrastructure.Repository public JsonValue Item { get; set; } = default!; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Repository/LimitingParameterRepository.cs b/AsbCloudInfrastructure/Repository/LimitingParameterRepository.cs index 9c05d743..8f3c42c1 100644 --- a/AsbCloudInfrastructure/Repository/LimitingParameterRepository.cs +++ b/AsbCloudInfrastructure/Repository/LimitingParameterRepository.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Repository { -#nullable enable + public class LimitingParameterRepository : ILimitingParameterRepository { private readonly IAsbCloudDbContext context; @@ -75,5 +75,5 @@ namespace AsbCloudInfrastructure.Repository return query; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Repository/PlannedTrajectoryRepository.cs b/AsbCloudInfrastructure/Repository/PlannedTrajectoryRepository.cs index dba77d7b..0db7022d 100644 --- a/AsbCloudInfrastructure/Repository/PlannedTrajectoryRepository.cs +++ b/AsbCloudInfrastructure/Repository/PlannedTrajectoryRepository.cs @@ -13,7 +13,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Repository { -#nullable enable + public class PlannedTrajectoryRepository : IPlannedTrajectoryRepository { private readonly IAsbCloudDbContext db; @@ -116,5 +116,5 @@ namespace AsbCloudInfrastructure.Repository return entity; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Repository/ProcessMapRepository.cs b/AsbCloudInfrastructure/Repository/ProcessMapRepository.cs index 4b6305ca..b80fe6d9 100644 --- a/AsbCloudInfrastructure/Repository/ProcessMapRepository.cs +++ b/AsbCloudInfrastructure/Repository/ProcessMapRepository.cs @@ -15,7 +15,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Repository { -#nullable enable + public class ProcessMapRepository : CrudWellRelatedRepositoryBase, IProcessMapPlanRepository { @@ -156,5 +156,5 @@ namespace AsbCloudInfrastructure.Repository return entity; } } -#nullable disable + } \ No newline at end of file diff --git a/AsbCloudInfrastructure/Repository/QueryContainer.cs b/AsbCloudInfrastructure/Repository/QueryContainer.cs index 80838c31..2cb27445 100644 --- a/AsbCloudInfrastructure/Repository/QueryContainer.cs +++ b/AsbCloudInfrastructure/Repository/QueryContainer.cs @@ -5,7 +5,7 @@ using System.Linq; namespace AsbCloudInfrastructure.Repository { -#nullable enable + public class QueryContainer where TEntity : class, IId { protected readonly IAsbCloudDbContext dbContext; @@ -26,5 +26,5 @@ namespace AsbCloudInfrastructure.Repository GetQuery = () => makeQuery(dbSet); } } -#nullable disable + } \ No newline at end of file diff --git a/AsbCloudInfrastructure/Repository/ScheduleRepository.cs b/AsbCloudInfrastructure/Repository/ScheduleRepository.cs index 856d547e..8cbb62f5 100644 --- a/AsbCloudInfrastructure/Repository/ScheduleRepository.cs +++ b/AsbCloudInfrastructure/Repository/ScheduleRepository.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Repository { -#nullable enable + public class ScheduleRepository : CrudWellRelatedRepositoryBase, IScheduleRepository { private readonly IWellService wellService; @@ -64,5 +64,5 @@ namespace AsbCloudInfrastructure.Repository return dto; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Repository/SetpointsRequestRepository.cs b/AsbCloudInfrastructure/Repository/SetpointsRequestRepository.cs index 38c00559..838ae15b 100644 --- a/AsbCloudInfrastructure/Repository/SetpointsRequestRepository.cs +++ b/AsbCloudInfrastructure/Repository/SetpointsRequestRepository.cs @@ -11,7 +11,7 @@ using System.Linq; namespace AsbCloudInfrastructure.Repository { -#nullable enable + public class SetpointsRequestRepository : CrudWellRelatedCacheRepositoryBase { private readonly IWellService wellService; @@ -62,5 +62,5 @@ namespace AsbCloudInfrastructure.Repository return result; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Repository/TelemetryWirelineRunOutRepository.cs b/AsbCloudInfrastructure/Repository/TelemetryWirelineRunOutRepository.cs index b99f5a41..410ee78c 100644 --- a/AsbCloudInfrastructure/Repository/TelemetryWirelineRunOutRepository.cs +++ b/AsbCloudInfrastructure/Repository/TelemetryWirelineRunOutRepository.cs @@ -12,7 +12,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Repository { -#nullable enable + public class TelemetryWirelineRunOutRepository : ITelemetryWirelineRunOutRepository { private readonly IAsbCloudDbContext context; @@ -105,5 +105,5 @@ namespace AsbCloudInfrastructure.Repository return dto; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Repository/UserRepository.cs b/AsbCloudInfrastructure/Repository/UserRepository.cs index cc4c5292..9df24b47 100644 --- a/AsbCloudInfrastructure/Repository/UserRepository.cs +++ b/AsbCloudInfrastructure/Repository/UserRepository.cs @@ -13,7 +13,7 @@ using Microsoft.Extensions.Caching.Memory; namespace AsbCloudInfrastructure.Repository { -#nullable enable + public class UserRepository : IUserRepository { private readonly IAsbCloudDbContext dbContext; @@ -284,5 +284,5 @@ namespace AsbCloudInfrastructure.Repository return dto; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Repository/UserRoleRepository.cs b/AsbCloudInfrastructure/Repository/UserRoleRepository.cs index 9bbe20cc..0fd26331 100644 --- a/AsbCloudInfrastructure/Repository/UserRoleRepository.cs +++ b/AsbCloudInfrastructure/Repository/UserRoleRepository.cs @@ -15,7 +15,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Repository { -#nullable enable + public class UserRoleRepository : IUserRoleRepository { private readonly IAsbCloudDbContext dbContext; @@ -295,5 +295,5 @@ namespace AsbCloudInfrastructure.Repository return entity; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Repository/WellCompositeRepository.cs b/AsbCloudInfrastructure/Repository/WellCompositeRepository.cs index f57326fa..a5234dda 100644 --- a/AsbCloudInfrastructure/Repository/WellCompositeRepository.cs +++ b/AsbCloudInfrastructure/Repository/WellCompositeRepository.cs @@ -13,7 +13,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Repository { -#nullable enable + public class WellCompositeRepository : IWellCompositeRepository { private readonly IAsbCloudDbContext db; @@ -75,5 +75,5 @@ namespace AsbCloudInfrastructure.Repository return dto; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Repository/WellFinalDocumentsRepository.cs b/AsbCloudInfrastructure/Repository/WellFinalDocumentsRepository.cs index ade0ad73..6d32cc30 100644 --- a/AsbCloudInfrastructure/Repository/WellFinalDocumentsRepository.cs +++ b/AsbCloudInfrastructure/Repository/WellFinalDocumentsRepository.cs @@ -14,7 +14,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Repository { -#nullable enable + public class WellFinalDocumentsRepository : IWellFinalDocumentsRepository { private readonly IAsbCloudDbContext context; @@ -139,5 +139,5 @@ namespace AsbCloudInfrastructure.Repository private static WellFinalDocumentDBDto Convert(WellFinalDocument entity) => entity.Adapt(); } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Repository/WellOperationRepository.cs b/AsbCloudInfrastructure/Repository/WellOperationRepository.cs index 40375259..00c87dbb 100644 --- a/AsbCloudInfrastructure/Repository/WellOperationRepository.cs +++ b/AsbCloudInfrastructure/Repository/WellOperationRepository.cs @@ -15,7 +15,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Repository { -#nullable enable + /// /// репозиторий операций по скважине /// @@ -399,5 +399,5 @@ namespace AsbCloudInfrastructure.Repository return result; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Repository/WitsRecordRepository.cs b/AsbCloudInfrastructure/Repository/WitsRecordRepository.cs index 8eaddbe1..2e0d5626 100644 --- a/AsbCloudInfrastructure/Repository/WitsRecordRepository.cs +++ b/AsbCloudInfrastructure/Repository/WitsRecordRepository.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Repository { -#nullable enable + public class WitsRecordRepository : IWitsRecordRepository where TEntity : AsbCloudDb.Model.WITS.RecordBase, ITelemetryData where TDto : AsbCloudApp.Data.ITelemetryData @@ -146,5 +146,5 @@ namespace AsbCloudInfrastructure.Repository } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/AuthService.cs b/AsbCloudInfrastructure/Services/AuthService.cs index 0991f322..169f4e70 100644 --- a/AsbCloudInfrastructure/Services/AuthService.cs +++ b/AsbCloudInfrastructure/Services/AuthService.cs @@ -15,7 +15,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -#nullable enable + namespace AsbCloudInfrastructure.Services { /// @@ -256,4 +256,3 @@ namespace AsbCloudInfrastructure.Services } } } -#nullable disable \ No newline at end of file diff --git a/AsbCloudInfrastructure/Services/DailyReport/BlockAbstract.cs b/AsbCloudInfrastructure/Services/DailyReport/BlockAbstract.cs index 5814914f..92286ee6 100644 --- a/AsbCloudInfrastructure/Services/DailyReport/BlockAbstract.cs +++ b/AsbCloudInfrastructure/Services/DailyReport/BlockAbstract.cs @@ -2,12 +2,12 @@ namespace AsbCloudInfrastructure.Services.DailyReport { -#nullable enable + abstract class BlockAbstract { public abstract CellAddress AddressBlockBegin { get; } public abstract CellAddress AddressBlockEnd { get; } public abstract void Draw(IXLWorksheet sheet); } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/DailyReport/CellAddress.cs b/AsbCloudInfrastructure/Services/DailyReport/CellAddress.cs index 92ec113f..10329a4c 100644 --- a/AsbCloudInfrastructure/Services/DailyReport/CellAddress.cs +++ b/AsbCloudInfrastructure/Services/DailyReport/CellAddress.cs @@ -5,7 +5,7 @@ using System.Text; namespace AsbCloudInfrastructure.Services.DailyReport { -#nullable enable + internal class CellAddress: IXLAddress { const int excelLettersCount = 'Z' - 'A' + 1; @@ -170,5 +170,5 @@ namespace AsbCloudInfrastructure.Services.DailyReport return false; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/BhaBlock.cs b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/BhaBlock.cs index f38e498e..9c3d1cdc 100644 --- a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/BhaBlock.cs +++ b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/BhaBlock.cs @@ -3,7 +3,7 @@ using ClosedXML.Excel; namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks { -#nullable enable + class BhaBlock : BlockAbstract { private readonly BhaDto blockDto; @@ -111,7 +111,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks .SetFormulaA1($"{FormulaBhaBlock(AddressDurationDataStart[4], AddressDurationDataFinish[4])}").Style.SetAllBorders(); } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/DimensionlessBlock.cs b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/DimensionlessBlock.cs index 28318820..18ee9fbc 100644 --- a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/DimensionlessBlock.cs +++ b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/DimensionlessBlock.cs @@ -3,7 +3,7 @@ using ClosedXML.Excel; namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks { -#nullable enable + internal class DimensionlessBlock : BlockAbstract { private readonly NoDrillingDto blockDto; @@ -114,6 +114,6 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks ._SetValue("Наращивание"); } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/HeadBlock.cs b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/HeadBlock.cs index a306413f..b7ae4dfe 100644 --- a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/HeadBlock.cs +++ b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/HeadBlock.cs @@ -3,7 +3,7 @@ using ClosedXML.Excel; namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks { -#nullable enable + class HeadBlock : BlockAbstract { private readonly HeadDto blockDto; @@ -175,7 +175,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks ._SetValue($"{blockDto.CountLaunchesMSE}"); } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/SaubBlock.cs b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/SaubBlock.cs index 2f3b0588..f6f4791f 100644 --- a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/SaubBlock.cs +++ b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/SaubBlock.cs @@ -3,7 +3,7 @@ using ClosedXML.Excel; namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks { -#nullable enable + internal class SaubBlock : BlockAbstract { private readonly SaubDto blockDto; @@ -225,6 +225,6 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks ._SetValue($"Примечание: {blockDto.DeclinesReasonsROP}"); } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/SignBlock.cs b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/SignBlock.cs index 4461b9d4..b7e5eb60 100644 --- a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/SignBlock.cs +++ b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/SignBlock.cs @@ -3,7 +3,7 @@ using ClosedXML.Excel; namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks { -#nullable enable + internal class SignBlock : BlockAbstract { private readonly SignDto blockDto; @@ -45,7 +45,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks .SetValue($"{blockDto.Supervisor}"); } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/TimeBalanceBlock.cs b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/TimeBalanceBlock.cs index 531ed96e..9fe13a72 100644 --- a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/TimeBalanceBlock.cs +++ b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/TimeBalanceBlock.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Linq; -#nullable enable + namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks { /// @@ -90,4 +90,4 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks } } } -#nullable disable + diff --git a/AsbCloudInfrastructure/Services/DailyReport/DailyReportMakerExcel.cs b/AsbCloudInfrastructure/Services/DailyReport/DailyReportMakerExcel.cs index 500c260a..56b68c30 100644 --- a/AsbCloudInfrastructure/Services/DailyReport/DailyReportMakerExcel.cs +++ b/AsbCloudInfrastructure/Services/DailyReport/DailyReportMakerExcel.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.IO; namespace AsbCloudInfrastructure.Services.DailyReport { -#nullable enable + public class DailyReportMakerExcel { private IEnumerable OperationCategories = null!; @@ -56,6 +56,6 @@ namespace AsbCloudInfrastructure.Services.DailyReport sheet.Rows().AdjustToContents(); } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs b/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs index de64103a..d52aaa0b 100644 --- a/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs +++ b/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs @@ -17,7 +17,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.DailyReport { -#nullable enable + public class DailyReportService : IDailyReportService { private readonly IAsbCloudDbContext db; @@ -244,5 +244,5 @@ namespace AsbCloudInfrastructure.Services.DailyReport }; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/DailyReport/XLExtentions.cs b/AsbCloudInfrastructure/Services/DailyReport/XLExtentions.cs index 23f902a7..30eee683 100644 --- a/AsbCloudInfrastructure/Services/DailyReport/XLExtentions.cs +++ b/AsbCloudInfrastructure/Services/DailyReport/XLExtentions.cs @@ -3,7 +3,7 @@ using System; namespace AsbCloudInfrastructure.Services.DailyReport { -#nullable enable + internal static class XLExtentions { public static IXLRange _SetValue(this IXLRange range, object value) @@ -157,5 +157,5 @@ namespace AsbCloudInfrastructure.Services.DailyReport => sheet.Range(begin.RowNumber, begin.ColumnNumber, end.RowNumber, end.ColumnNumber); } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/DetectOperations/DetectableTelemetry.cs b/AsbCloudInfrastructure/Services/DetectOperations/DetectableTelemetry.cs index 87f3defe..626b58d6 100644 --- a/AsbCloudInfrastructure/Services/DetectOperations/DetectableTelemetry.cs +++ b/AsbCloudInfrastructure/Services/DetectOperations/DetectableTelemetry.cs @@ -2,7 +2,7 @@ namespace AsbCloudInfrastructure.Services.DetectOperations { -#nullable enable + public class DetectableTelemetry { public DateTimeOffset DateTime { get; set; } @@ -14,5 +14,5 @@ namespace AsbCloudInfrastructure.Services.DetectOperations public float BitDepth { get; set; } public float RotorSpeed { get; set; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationExportService.cs b/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationExportService.cs index c261e87d..f8f0296d 100644 --- a/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationExportService.cs +++ b/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationExportService.cs @@ -12,7 +12,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.DetectOperations { -#nullable enable + internal class DetectedOperationExportService { private readonly IAsbCloudDbContext db; @@ -116,5 +116,5 @@ namespace AsbCloudInfrastructure.Services.DetectOperations sheet.Cell(rowNumber, 6).Value = operation.Value; } } -#nullable enable + } diff --git a/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs b/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs index 267c88c5..701cfd08 100644 --- a/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs +++ b/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs @@ -15,7 +15,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.DetectOperations { -#nullable enable + public class DetectedOperationService : IDetectedOperationService { private readonly IAsbCloudDbContext db; @@ -310,5 +310,5 @@ namespace AsbCloudInfrastructure.Services.DetectOperations } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorAbstract.cs b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorAbstract.cs index ab96181a..d14a5829 100644 --- a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorAbstract.cs +++ b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorAbstract.cs @@ -4,7 +4,7 @@ using System.Linq; namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors { -#nullable enable + internal abstract class DetectorAbstract { private readonly int idOperation; @@ -343,6 +343,6 @@ namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorDevelopment.cs b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorDevelopment.cs index 911e7042..e858b49b 100644 --- a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorDevelopment.cs +++ b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorDevelopment.cs @@ -2,7 +2,7 @@ namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors { -#nullable enable + /// /// Проработка перед наращиванием /// @@ -62,6 +62,6 @@ namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors => IsValidByWellDepthDoesNotChange(telemetry, begin, end); } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorFlashing.cs b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorFlashing.cs index 08439734..65040e9a 100644 --- a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorFlashing.cs +++ b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorFlashing.cs @@ -2,7 +2,7 @@ namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors { -#nullable enable + /// /// Промывка /// @@ -54,6 +54,6 @@ namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors => IsValidByWellDepthDoesNotChange(telemetry, begin, end); } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorFlashingBeforeConnection.cs b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorFlashingBeforeConnection.cs index 9788af8d..4e447e67 100644 --- a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorFlashingBeforeConnection.cs +++ b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorFlashingBeforeConnection.cs @@ -2,7 +2,7 @@ namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors { -#nullable enable + /// /// Промывка перед наращиванием /// @@ -50,6 +50,6 @@ namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors => IsValidByWellDepthDoesNotChange(telemetry, begin, end); } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorRotor.cs b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorRotor.cs index 7c3b7bb3..2d5ce962 100644 --- a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorRotor.cs +++ b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorRotor.cs @@ -3,7 +3,7 @@ using System.Linq; namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors { -#nullable enable + internal class DetectorRotor : DetectorAbstract { public DetectorRotor() @@ -57,6 +57,6 @@ namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors => CalcRop(telemetry, begin, end); } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorSlide.cs b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorSlide.cs index 920c7d67..48f6fe7b 100644 --- a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorSlide.cs +++ b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorSlide.cs @@ -2,7 +2,7 @@ namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors { -#nullable enable + internal class DetectorSlide : DetectorAbstract { public DetectorSlide() @@ -56,6 +56,6 @@ namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors => CalcRop(telemetry, begin, end); } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorSlipsTime.cs b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorSlipsTime.cs index 69752c69..f8883005 100644 --- a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorSlipsTime.cs +++ b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorSlipsTime.cs @@ -2,7 +2,7 @@ namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors { -#nullable enable + internal class DetectorSlipsTime : DetectorAbstract { public DetectorSlipsTime() @@ -35,6 +35,6 @@ namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors => IsValidByWellDepthDoesNotChange(telemetry, begin, end); } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorStaticSurveying.cs b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorStaticSurveying.cs index 65ab25d3..f999dbd5 100644 --- a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorStaticSurveying.cs +++ b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorStaticSurveying.cs @@ -4,7 +4,7 @@ using System; namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors { -#nullable enable + /// /// Статический замер телесистемы @@ -64,6 +64,6 @@ namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors => CalcDeltaMinutes(telemetry, begin, end); } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorTemplating.cs b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorTemplating.cs index 0ced3d76..dde3f12e 100644 --- a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorTemplating.cs +++ b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorTemplating.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors { -#nullable enable + internal class DetectorTemplating : DetectorAbstract { public DetectorTemplating() @@ -60,6 +60,6 @@ namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors => IsValidByWellDepthDoesNotChange(telemetry, begin, end); } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorTemplatingWhileDrilling.cs b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorTemplatingWhileDrilling.cs index 77abe33e..7d48f361 100644 --- a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorTemplatingWhileDrilling.cs +++ b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorTemplatingWhileDrilling.cs @@ -2,7 +2,7 @@ namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors { -#nullable enable + /// /// Шаблонировка при бурении /// @@ -56,6 +56,6 @@ namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors => IsValidByWellDepthDoesNotChange(telemetry, begin, end); } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/OperationDetectorResult.cs b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/OperationDetectorResult.cs index 94ee7fc7..2c7d8f09 100644 --- a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/OperationDetectorResult.cs +++ b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/OperationDetectorResult.cs @@ -2,12 +2,12 @@ namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors { -#nullable enable + class OperationDetectorResult { public int TelemetryBegin { get; set; } public int TelemetryEnd { get; set; } public DetectedOperation Operation { get; set; } = null!; } -#nullable enable + } diff --git a/AsbCloudInfrastructure/Services/DetectOperations/InterpolationLine.cs b/AsbCloudInfrastructure/Services/DetectOperations/InterpolationLine.cs index cc49c079..253fadb9 100644 --- a/AsbCloudInfrastructure/Services/DetectOperations/InterpolationLine.cs +++ b/AsbCloudInfrastructure/Services/DetectOperations/InterpolationLine.cs @@ -2,7 +2,7 @@ namespace AsbCloudInfrastructure.Services.DetectOperations { -#nullable enable + public class InterpolationLine { private readonly double xSum; @@ -53,5 +53,5 @@ namespace AsbCloudInfrastructure.Services.DetectOperations public bool IsAverageYGreaterThan(double bound) => (ySum / count) >= bound; } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/DetectOperations/OperationDetectionWorkFactory.cs b/AsbCloudInfrastructure/Services/DetectOperations/OperationDetectionWorkFactory.cs index 09b08bf3..da171f13 100644 --- a/AsbCloudInfrastructure/Services/DetectOperations/OperationDetectionWorkFactory.cs +++ b/AsbCloudInfrastructure/Services/DetectOperations/OperationDetectionWorkFactory.cs @@ -12,7 +12,7 @@ using Microsoft.Extensions.DependencyInjection; namespace AsbCloudInfrastructure.Services.DetectOperations { -#nullable enable + public static class OperationDetectionWorkFactory { private const string workId = "Operation detection"; @@ -159,5 +159,5 @@ namespace AsbCloudInfrastructure.Services.DetectOperations return detectedOperations; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/DrillingProgram/ContentListSheet.cs b/AsbCloudInfrastructure/Services/DrillingProgram/ContentListSheet.cs index e49f3443..06da4d48 100644 --- a/AsbCloudInfrastructure/Services/DrillingProgram/ContentListSheet.cs +++ b/AsbCloudInfrastructure/Services/DrillingProgram/ContentListSheet.cs @@ -6,7 +6,7 @@ using System.Linq; namespace AsbCloudInfrastructure.Services.DrillingProgram { -#nullable enable + public class ContentListSheet { private readonly List parts; @@ -37,5 +37,5 @@ namespace AsbCloudInfrastructure.Services.DrillingProgram } } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/DrillingProgram/Convert/ConvertToPdf.cs b/AsbCloudInfrastructure/Services/DrillingProgram/Convert/ConvertToPdf.cs index 94925daf..07526f5d 100644 --- a/AsbCloudInfrastructure/Services/DrillingProgram/Convert/ConvertToPdf.cs +++ b/AsbCloudInfrastructure/Services/DrillingProgram/Convert/ConvertToPdf.cs @@ -10,7 +10,7 @@ using iText.Kernel.Utils; namespace AsbCloudInfrastructure.Services.DrillingProgram.Convert { -#nullable enable + sealed internal class ConvertToPdf { internal static readonly string[] filesExtensions = { ".xlsx", ".xls", ".ods", ".odt", ".doc", ".docx", ".pdf" }; @@ -85,5 +85,5 @@ namespace AsbCloudInfrastructure.Services.DrillingProgram.Convert Directory.Delete(Path.Combine(convertedFilesDir, "pdf"), true); } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/DrillingProgram/DrillingProgramMaker.cs b/AsbCloudInfrastructure/Services/DrillingProgram/DrillingProgramMaker.cs index d159ac56..7486ec59 100644 --- a/AsbCloudInfrastructure/Services/DrillingProgram/DrillingProgramMaker.cs +++ b/AsbCloudInfrastructure/Services/DrillingProgram/DrillingProgramMaker.cs @@ -6,7 +6,7 @@ using System.Linq; namespace AsbCloudInfrastructure.Services.DrillingProgram { -#nullable enable + internal class DrillingProgramMaker { private const int maxAllowedColumns = 256; @@ -129,5 +129,5 @@ namespace AsbCloudInfrastructure.Services.DrillingProgram return rngData; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/DrillingProgram/DrillingProgramService.cs b/AsbCloudInfrastructure/Services/DrillingProgram/DrillingProgramService.cs index 78f15615..bf35438d 100644 --- a/AsbCloudInfrastructure/Services/DrillingProgram/DrillingProgramService.cs +++ b/AsbCloudInfrastructure/Services/DrillingProgram/DrillingProgramService.cs @@ -552,5 +552,5 @@ namespace AsbCloudInfrastructure.Services.DrillingProgram private static string MakeWorkId(int idWell) => $"Make drilling program for wellId {idWell}"; } -#nullable disable + } \ No newline at end of file diff --git a/AsbCloudInfrastructure/Services/DrillingProgram/ImageInfo.cs b/AsbCloudInfrastructure/Services/DrillingProgram/ImageInfo.cs index aeedd213..d6306919 100644 --- a/AsbCloudInfrastructure/Services/DrillingProgram/ImageInfo.cs +++ b/AsbCloudInfrastructure/Services/DrillingProgram/ImageInfo.cs @@ -2,7 +2,7 @@ namespace AsbCloudInfrastructure.Services.DrillingProgram { -#nullable enable + class ImageInfo { public int Id { get; set; } @@ -13,5 +13,5 @@ namespace AsbCloudInfrastructure.Services.DrillingProgram public int Left { get; set; } public int Top { get; set; } } -#nullable disable + } \ No newline at end of file diff --git a/AsbCloudInfrastructure/Services/DrillingProgram/TitleListSheet.cs b/AsbCloudInfrastructure/Services/DrillingProgram/TitleListSheet.cs index e3a9a90e..3d6482a7 100644 --- a/AsbCloudInfrastructure/Services/DrillingProgram/TitleListSheet.cs +++ b/AsbCloudInfrastructure/Services/DrillingProgram/TitleListSheet.cs @@ -6,7 +6,7 @@ using System.Linq; namespace AsbCloudInfrastructure.Services.DrillingProgram { -#nullable enable + public class TitleListSheet { private const string directionDirectorPositionName = "Руководитель направления по ТСБ"; @@ -160,5 +160,5 @@ namespace AsbCloudInfrastructure.Services.DrillingProgram private static string FormatDate(DateTime dateTime) => $"{dateTime.Day:00}.{dateTime.Month:00}.{dateTime.Year:00}"; } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/Email/BaseFactory.cs b/AsbCloudInfrastructure/Services/Email/BaseFactory.cs index 8e44725f..26c5b06b 100644 --- a/AsbCloudInfrastructure/Services/Email/BaseFactory.cs +++ b/AsbCloudInfrastructure/Services/Email/BaseFactory.cs @@ -6,7 +6,7 @@ using System.IO; namespace AsbCloudInfrastructure.Services.Email { -#nullable enable + public class BaseFactory { private readonly string platformName; @@ -61,5 +61,5 @@ namespace AsbCloudInfrastructure.Services.Email public virtual string MakeSubject(WellDto well, string action) => $"{well.Deposit}, {well.Cluster}, {well.Caption}. {action}"; } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/Email/DrillingMailBodyFactory.cs b/AsbCloudInfrastructure/Services/Email/DrillingMailBodyFactory.cs index eb0bef1a..d6a4a9da 100644 --- a/AsbCloudInfrastructure/Services/Email/DrillingMailBodyFactory.cs +++ b/AsbCloudInfrastructure/Services/Email/DrillingMailBodyFactory.cs @@ -6,7 +6,7 @@ using System.IO; namespace AsbCloudInfrastructure { -#nullable enable + class DrillingMailBodyFactory : BaseFactory { private readonly string platformName; @@ -85,5 +85,5 @@ namespace AsbCloudInfrastructure return drillingProgramHref; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/Email/EmailService.cs b/AsbCloudInfrastructure/Services/Email/EmailService.cs index 568d4098..d4d4e94f 100644 --- a/AsbCloudInfrastructure/Services/Email/EmailService.cs +++ b/AsbCloudInfrastructure/Services/Email/EmailService.cs @@ -12,7 +12,7 @@ using AsbCloudInfrastructure.Background; namespace AsbCloudInfrastructure.Services { -#nullable enable + public class EmailService : IEmailService { private readonly BackgroundWorker backgroundWorker; @@ -117,5 +117,5 @@ namespace AsbCloudInfrastructure.Services return hash; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/Email/WellFinalDocumentMailBodyFactory .cs b/AsbCloudInfrastructure/Services/Email/WellFinalDocumentMailBodyFactory .cs index 9d409c0c..751ab042 100644 --- a/AsbCloudInfrastructure/Services/Email/WellFinalDocumentMailBodyFactory .cs +++ b/AsbCloudInfrastructure/Services/Email/WellFinalDocumentMailBodyFactory .cs @@ -6,7 +6,7 @@ using System.IO; namespace AsbCloudInfrastructure { -#nullable enable + class WellFinalDocumentMailBodyFactory : BaseFactory { private readonly string platformName; @@ -30,5 +30,5 @@ namespace AsbCloudInfrastructure return body; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/FileCategoryService.cs b/AsbCloudInfrastructure/Services/FileCategoryService.cs index 4f07a34c..b4fbaf3d 100644 --- a/AsbCloudInfrastructure/Services/FileCategoryService.cs +++ b/AsbCloudInfrastructure/Services/FileCategoryService.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services { -#nullable enable + public class FileCategoryService : CrudCacheRepositoryBase, IFileCategoryService { public FileCategoryService(IAsbCloudDbContext context, IMemoryCache memoryCache) @@ -29,5 +29,5 @@ namespace AsbCloudInfrastructure.Services return dtos; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/LimitingParameterBackgroundService.cs b/AsbCloudInfrastructure/Services/LimitingParameterBackgroundService.cs index 1420ea89..fdcf0ec1 100644 --- a/AsbCloudInfrastructure/Services/LimitingParameterBackgroundService.cs +++ b/AsbCloudInfrastructure/Services/LimitingParameterBackgroundService.cs @@ -12,7 +12,7 @@ using Microsoft.Extensions.DependencyInjection; namespace AsbCloudInfrastructure.Services { -#nullable enable + internal static class LimitingParameterCalcWorkFactory { private const string workId = "Limiting parameter calc"; @@ -147,5 +147,5 @@ namespace AsbCloudInfrastructure.Services return result; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/LimitingParameterService.cs b/AsbCloudInfrastructure/Services/LimitingParameterService.cs index 848fbdf2..b3aa7710 100644 --- a/AsbCloudInfrastructure/Services/LimitingParameterService.cs +++ b/AsbCloudInfrastructure/Services/LimitingParameterService.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services { -#nullable enable + public class LimitingParameterService : ILimitingParameterService { private readonly ILimitingParameterRepository limitingParameterRepository; @@ -115,5 +115,5 @@ namespace AsbCloudInfrastructure.Services return result; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/MeasureService.cs b/AsbCloudInfrastructure/Services/MeasureService.cs index d32a7882..79dc1411 100644 --- a/AsbCloudInfrastructure/Services/MeasureService.cs +++ b/AsbCloudInfrastructure/Services/MeasureService.cs @@ -13,7 +13,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services { -#nullable enable + public class MeasureService : IMeasureService { private readonly IAsbCloudDbContext db; @@ -158,5 +158,5 @@ namespace AsbCloudInfrastructure.Services return entity; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportMakerService.cs b/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportMakerService.cs index aea0e8e6..12be61dd 100644 --- a/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportMakerService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportMakerService.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.ProcessMap { -#nullable enable + public class ProcessMapReportMakerService : IProcessMapReportMakerService { const int firstColumn = 2; @@ -205,5 +205,5 @@ namespace AsbCloudInfrastructure.Services.ProcessMap return style; } } -#nullable disable + } \ No newline at end of file diff --git a/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportService.cs b/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportService.cs index 15b1455b..359ec1ab 100644 --- a/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportService.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.ProcessMap { -#nullable enable + public partial class ProcessMapReportService : IProcessMapReportService { private readonly IWellService wellService; @@ -389,5 +389,5 @@ namespace AsbCloudInfrastructure.Services.ProcessMap _ => "Ручной", }; } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/ProcessMap/XLExtentions.cs b/AsbCloudInfrastructure/Services/ProcessMap/XLExtentions.cs index 6e0a56e3..fdf830e7 100644 --- a/AsbCloudInfrastructure/Services/ProcessMap/XLExtentions.cs +++ b/AsbCloudInfrastructure/Services/ProcessMap/XLExtentions.cs @@ -5,7 +5,7 @@ namespace AsbCloudInfrastructure.Services.ProcessMap; internal static class XLExtentions { -#nullable enable + public static IXLCell SetVal(this IXLCell cell, string value, bool adaptRowHeight = false) { cell.Value = value; @@ -48,5 +48,5 @@ internal static class XLExtentions cell.Style.NumberFormat.Format = format; return cell; } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/ReduceSamplingService.cs b/AsbCloudInfrastructure/Services/ReduceSamplingService.cs index d9c11e0d..b7581ad9 100644 --- a/AsbCloudInfrastructure/Services/ReduceSamplingService.cs +++ b/AsbCloudInfrastructure/Services/ReduceSamplingService.cs @@ -13,7 +13,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services { -#nullable enable + class JobHandle { public int Id => Job.Id; @@ -331,5 +331,5 @@ namespace AsbCloudInfrastructure.Services return new AsbCloudDbContext(options); } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/ReportService.cs b/AsbCloudInfrastructure/Services/ReportService.cs index beae8aad..26669956 100644 --- a/AsbCloudInfrastructure/Services/ReportService.cs +++ b/AsbCloudInfrastructure/Services/ReportService.cs @@ -15,7 +15,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services { -#nullable enable + public class ReportService : IReportService { private readonly IAsbCloudDbContext db; @@ -177,5 +177,5 @@ namespace AsbCloudInfrastructure.Services return generator; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/RequestTrackerService.cs b/AsbCloudInfrastructure/Services/RequestTrackerService.cs index 1c37304e..72606103 100644 --- a/AsbCloudInfrastructure/Services/RequestTrackerService.cs +++ b/AsbCloudInfrastructure/Services/RequestTrackerService.cs @@ -7,7 +7,7 @@ using System.Linq; namespace AsbCloudInfrastructure.Services { -#nullable enable + public class RequestTrackerService : IRequerstTrackerService { const int fastRequestsCount = 1000; @@ -128,5 +128,5 @@ namespace AsbCloudInfrastructure.Services } } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/SAUB/CsvSerializer.cs b/AsbCloudInfrastructure/Services/SAUB/CsvSerializer.cs index 7b089dbb..a73a1edf 100644 --- a/AsbCloudInfrastructure/Services/SAUB/CsvSerializer.cs +++ b/AsbCloudInfrastructure/Services/SAUB/CsvSerializer.cs @@ -6,7 +6,7 @@ using System.Text.RegularExpressions; namespace System.Text.Csv { -#nullable enable + public class CsvSerializer { private readonly PropertyInfo[] props; @@ -80,5 +80,5 @@ namespace System.Text.Csv return $"\"{inString}\""; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/SAUB/EventService.cs b/AsbCloudInfrastructure/Services/SAUB/EventService.cs index 71760736..eb60b691 100644 --- a/AsbCloudInfrastructure/Services/SAUB/EventService.cs +++ b/AsbCloudInfrastructure/Services/SAUB/EventService.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.SAUB { -#nullable enable + public class EventService : IEventService { private readonly IAsbCloudDbContext db; @@ -43,5 +43,5 @@ namespace AsbCloudInfrastructure.Services.SAUB memoryCache.DropBasic(); } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/SAUB/MessageService.cs b/AsbCloudInfrastructure/Services/SAUB/MessageService.cs index 3209d20c..a35e5886 100644 --- a/AsbCloudInfrastructure/Services/SAUB/MessageService.cs +++ b/AsbCloudInfrastructure/Services/SAUB/MessageService.cs @@ -13,7 +13,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -#nullable enable + namespace AsbCloudInfrastructure.Services.SAUB { public class MessageService : IMessageService @@ -155,4 +155,4 @@ namespace AsbCloudInfrastructure.Services.SAUB } } } -#nullable disable + diff --git a/AsbCloudInfrastructure/Services/SAUB/SetpointsService.cs b/AsbCloudInfrastructure/Services/SAUB/SetpointsService.cs index bd86b5fb..b0f5c824 100644 --- a/AsbCloudInfrastructure/Services/SAUB/SetpointsService.cs +++ b/AsbCloudInfrastructure/Services/SAUB/SetpointsService.cs @@ -12,7 +12,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.SAUB { -#nullable enable + public class SetpointsService : ISetpointsService { // ## Инфо от АПГ от 26.11.2021, дополнения ШОВ от 26.11.2021 @@ -113,5 +113,5 @@ namespace AsbCloudInfrastructure.Services.SAUB public IEnumerable GetSetpointsNames() => SetpointInfos.Values; } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/SAUB/TelemetryDataBaseService.cs b/AsbCloudInfrastructure/Services/SAUB/TelemetryDataBaseService.cs index 23a65555..3dea46b9 100644 --- a/AsbCloudInfrastructure/Services/SAUB/TelemetryDataBaseService.cs +++ b/AsbCloudInfrastructure/Services/SAUB/TelemetryDataBaseService.cs @@ -9,7 +9,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -#nullable enable + namespace AsbCloudInfrastructure.Services.SAUB { public abstract class TelemetryDataBaseService : ITelemetryDataService @@ -158,4 +158,3 @@ namespace AsbCloudInfrastructure.Services.SAUB } } -#nullable disable \ No newline at end of file diff --git a/AsbCloudInfrastructure/Services/SAUB/TelemetryDataCache.cs b/AsbCloudInfrastructure/Services/SAUB/TelemetryDataCache.cs index 56e214fd..f1b2186b 100644 --- a/AsbCloudInfrastructure/Services/SAUB/TelemetryDataCache.cs +++ b/AsbCloudInfrastructure/Services/SAUB/TelemetryDataCache.cs @@ -8,7 +8,7 @@ using Mapster; using System.Threading.Tasks; using Microsoft.Extensions.Configuration; -#nullable enable + namespace AsbCloudInfrastructure.Services.SAUB { public class TelemetryDataCache @@ -182,4 +182,3 @@ namespace AsbCloudInfrastructure.Services.SAUB } } } -#nullable disable \ No newline at end of file diff --git a/AsbCloudInfrastructure/Services/SAUB/TelemetryDataSaubService.cs b/AsbCloudInfrastructure/Services/SAUB/TelemetryDataSaubService.cs index af16e2a1..596c0b52 100644 --- a/AsbCloudInfrastructure/Services/SAUB/TelemetryDataSaubService.cs +++ b/AsbCloudInfrastructure/Services/SAUB/TelemetryDataSaubService.cs @@ -17,7 +17,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.SAUB { -#nullable enable + public class TelemetryDataSaubService : TelemetryDataBaseService, ITelemetryDataSaubService { private readonly ITelemetryUserService telemetryUserService; @@ -145,5 +145,5 @@ namespace AsbCloudInfrastructure.Services.SAUB return outStream; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/SAUB/TelemetryDataSpinService.cs b/AsbCloudInfrastructure/Services/SAUB/TelemetryDataSpinService.cs index 1773c0a2..78119d6b 100644 --- a/AsbCloudInfrastructure/Services/SAUB/TelemetryDataSpinService.cs +++ b/AsbCloudInfrastructure/Services/SAUB/TelemetryDataSpinService.cs @@ -5,7 +5,7 @@ using Mapster; namespace AsbCloudInfrastructure.Services.SAUB { -#nullable enable + public class TelemetryDataSpinService : TelemetryDataBaseService { public TelemetryDataSpinService( @@ -29,5 +29,5 @@ namespace AsbCloudInfrastructure.Services.SAUB return dto; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/SAUB/TelemetryService.cs b/AsbCloudInfrastructure/Services/SAUB/TelemetryService.cs index 3735541f..593bf981 100644 --- a/AsbCloudInfrastructure/Services/SAUB/TelemetryService.cs +++ b/AsbCloudInfrastructure/Services/SAUB/TelemetryService.cs @@ -14,7 +14,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.SAUB { -#nullable enable + public class TelemetryService : ITelemetryService { private readonly IAsbCloudDbContext db; @@ -343,5 +343,5 @@ namespace AsbCloudInfrastructure.Services.SAUB return affected; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/SAUB/TelemetryTracker.cs b/AsbCloudInfrastructure/Services/SAUB/TelemetryTracker.cs index 3cdf0776..e3469f1e 100644 --- a/AsbCloudInfrastructure/Services/SAUB/TelemetryTracker.cs +++ b/AsbCloudInfrastructure/Services/SAUB/TelemetryTracker.cs @@ -12,7 +12,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.SAUB { -#nullable enable + public class TelemetryTracker : ITelemetryTracker { class TrackerStat @@ -152,5 +152,5 @@ namespace AsbCloudInfrastructure.Services.SAUB public IEnumerable GetTransmittingTelemetriesUids() => telemetriesStats.Keys; } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/SAUB/TelemetryUserService.cs b/AsbCloudInfrastructure/Services/SAUB/TelemetryUserService.cs index f5740a3c..70614a88 100644 --- a/AsbCloudInfrastructure/Services/SAUB/TelemetryUserService.cs +++ b/AsbCloudInfrastructure/Services/SAUB/TelemetryUserService.cs @@ -13,7 +13,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.SAUB { -#nullable enable + public class TelemetryUserService : ITelemetryUserService { private const string CacheTag = "TelemetryUserCacheTag"; @@ -97,5 +97,5 @@ namespace AsbCloudInfrastructure.Services.SAUB return dto; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/Subsystems/DepthInterpolation.cs b/AsbCloudInfrastructure/Services/Subsystems/DepthInterpolation.cs index 2a2fa8eb..71718cce 100644 --- a/AsbCloudInfrastructure/Services/Subsystems/DepthInterpolation.cs +++ b/AsbCloudInfrastructure/Services/Subsystems/DepthInterpolation.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; namespace AsbCloudInfrastructure.Services.Subsystems.Utils { -#nullable enable + internal class DepthInterpolation { private readonly TimeSpan maxDeltaDate = TimeSpan.FromHours(12); @@ -58,5 +58,5 @@ namespace AsbCloudInfrastructure.Services.Subsystems.Utils return (float)y; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeCalcWorkFactory.cs b/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeCalcWorkFactory.cs index 7b01c3b5..78dbaed4 100644 --- a/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeCalcWorkFactory.cs +++ b/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeCalcWorkFactory.cs @@ -15,7 +15,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.Subsystems { -#nullable enable + internal static class SubsystemOperationTimeCalcWorkFactory { private const string workId = "Subsystem operation time calc"; @@ -340,5 +340,5 @@ namespace AsbCloudInfrastructure.Services.Subsystems return depthInterpolation; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs b/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs index f74100bf..64c5022e 100644 --- a/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs +++ b/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs @@ -17,7 +17,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.Subsystems { -#nullable enable + internal class SubsystemOperationTimeService : ISubsystemOperationTimeService { @@ -351,5 +351,5 @@ namespace AsbCloudInfrastructure.Services.Subsystems } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/Subsystems/SubsystemService.cs b/AsbCloudInfrastructure/Services/Subsystems/SubsystemService.cs index e73e6d84..217e9d26 100644 --- a/AsbCloudInfrastructure/Services/Subsystems/SubsystemService.cs +++ b/AsbCloudInfrastructure/Services/Subsystems/SubsystemService.cs @@ -14,7 +14,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.Subsystems { -#nullable enable + internal class SubsystemService : CrudCacheRepositoryBase, ISubsystemService { private readonly IWellService wellService; @@ -50,5 +50,5 @@ namespace AsbCloudInfrastructure.Services.Subsystems return subsystem; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryImportService.cs b/AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryImportService.cs index 859b2ad1..60a216ad 100644 --- a/AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryImportService.cs +++ b/AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryImportService.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.Trajectory { -#nullable enable + public class PlannedTrajectoryImportService : IPlannedTrajectoryImportService { /* @@ -233,6 +233,6 @@ namespace AsbCloudInfrastructure.Services.Trajectory return trajectoryRow; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/Trajectory/TrajectoryVisualizationService.cs b/AsbCloudInfrastructure/Services/Trajectory/TrajectoryVisualizationService.cs index 04b76630..8eb94b5a 100644 --- a/AsbCloudInfrastructure/Services/Trajectory/TrajectoryVisualizationService.cs +++ b/AsbCloudInfrastructure/Services/Trajectory/TrajectoryVisualizationService.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.Trajectory { -#nullable enable + public class TrajectoryVisualizationService : ITrajectoryVisualizationService { private readonly IPlannedTrajectoryRepository repository; @@ -54,5 +54,5 @@ namespace AsbCloudInfrastructure.Services.Trajectory return cartesianCoordinates; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/WellFinalDocumentsService.cs b/AsbCloudInfrastructure/Services/WellFinalDocumentsService.cs index e683532a..5f100850 100644 --- a/AsbCloudInfrastructure/Services/WellFinalDocumentsService.cs +++ b/AsbCloudInfrastructure/Services/WellFinalDocumentsService.cs @@ -12,7 +12,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services { -#nullable enable + /// /// Сервис "Дело скважины" /// @@ -151,5 +151,5 @@ namespace AsbCloudInfrastructure.Services } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/WellInfoService.cs b/AsbCloudInfrastructure/Services/WellInfoService.cs index 998a40f3..f37cb2f6 100644 --- a/AsbCloudInfrastructure/Services/WellInfoService.cs +++ b/AsbCloudInfrastructure/Services/WellInfoService.cs @@ -17,7 +17,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services { -#nullable enable + public class WellInfoService { class WellMapInfoWithComanies : WellMapInfoDto @@ -149,5 +149,5 @@ namespace AsbCloudInfrastructure.Services public static WellMapInfoDto? FirstOrDefault(Func predicate) => WellMapInfo.FirstOrDefault(predicate); } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/WellOperationService/OperationsStatService.cs b/AsbCloudInfrastructure/Services/WellOperationService/OperationsStatService.cs index 68368e63..408c895c 100644 --- a/AsbCloudInfrastructure/Services/WellOperationService/OperationsStatService.cs +++ b/AsbCloudInfrastructure/Services/WellOperationService/OperationsStatService.cs @@ -12,7 +12,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.WellOperationService { -#nullable enable + public class OperationsStatService : IOperationsStatService { private readonly IAsbCloudDbContext db; @@ -540,5 +540,5 @@ namespace AsbCloudInfrastructure.Services.WellOperationService return destination; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/WellOperationService/Race.cs b/AsbCloudInfrastructure/Services/WellOperationService/Race.cs index 182ac88d..f868db6f 100644 --- a/AsbCloudInfrastructure/Services/WellOperationService/Race.cs +++ b/AsbCloudInfrastructure/Services/WellOperationService/Race.cs @@ -5,7 +5,7 @@ using System.Linq; namespace AsbCloudInfrastructure.Services.WellOperationService { -#nullable enable + class Race { /// @@ -63,5 +63,5 @@ namespace AsbCloudInfrastructure.Services.WellOperationService /// public List Operations { get; internal set; } = new List(); } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/WellOperationService/ScheduleReportService.cs b/AsbCloudInfrastructure/Services/WellOperationService/ScheduleReportService.cs index 028b16e0..b22ce6ff 100644 --- a/AsbCloudInfrastructure/Services/WellOperationService/ScheduleReportService.cs +++ b/AsbCloudInfrastructure/Services/WellOperationService/ScheduleReportService.cs @@ -12,7 +12,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.WellOperationService { -#nullable enable + public class ScheduleReportService : IScheduleReportService { private readonly IOperationsStatService operationsStatService; @@ -336,5 +336,5 @@ namespace AsbCloudInfrastructure.Services.WellOperationService return stream; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportService.cs b/AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportService.cs index fe8c77d1..2e727acd 100644 --- a/AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportService.cs +++ b/AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportService.cs @@ -11,7 +11,7 @@ using System.Linq; namespace AsbCloudInfrastructure.Services.WellOperationService { -#nullable enable + /* * password for WellOperationImportTemplate.xlsx is ASB2020! */ @@ -332,5 +332,5 @@ namespace AsbCloudInfrastructure.Services.WellOperationService return operation; } } -#nullable disable + } diff --git a/AsbCloudInfrastructure/Services/WellService.cs b/AsbCloudInfrastructure/Services/WellService.cs index 20486a64..2d2599b8 100644 --- a/AsbCloudInfrastructure/Services/WellService.cs +++ b/AsbCloudInfrastructure/Services/WellService.cs @@ -16,7 +16,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services { -#nullable enable + public class WellService : CrudCacheRepositoryBase, IWellService { private readonly ITelemetryService telemetryService; @@ -374,5 +374,5 @@ namespace AsbCloudInfrastructure.Services return telemetryService.GetDatesRange((int)well.IdTelemetry); } } -#nullable disable + } \ No newline at end of file diff --git a/AsbCloudInfrastructure/Services/WitsInfoService.cs b/AsbCloudInfrastructure/Services/WitsInfoService.cs index f029396a..12ce6c9c 100644 --- a/AsbCloudInfrastructure/Services/WitsInfoService.cs +++ b/AsbCloudInfrastructure/Services/WitsInfoService.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; namespace AsbCloudInfrastructure.Services { -#nullable enable + public class WitsInfoService { private readonly InfoService witsInfoService; diff --git a/AsbCloudInfrastructure/Startup.cs b/AsbCloudInfrastructure/Startup.cs index 4ffdcf2f..eec7d716 100644 --- a/AsbCloudInfrastructure/Startup.cs +++ b/AsbCloudInfrastructure/Startup.cs @@ -13,7 +13,7 @@ using AsbCloudInfrastructure.Background; namespace AsbCloudInfrastructure { -#nullable enable + public class Startup { public static void BeforeRunHandler(IHost host) @@ -71,5 +71,5 @@ namespace AsbCloudInfrastructure return bytes.ToString("### ### ###"); } } -#nullable disable + }