From 91dd386ffcefafbcbec27aaab94c484626b3983b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A4=D1=80=D0=BE=D0=BB=D0=BE=D0=B2?= Date: Mon, 4 Jul 2022 17:50:16 +0500 Subject: [PATCH] nit improvements --- AsbCloudDb/EFExtentions.cs | 2 +- .../Services/DailyReport/DailyReportService.cs | 2 +- .../DetectOperations/OperationDetectionBackgroundService.cs | 6 +++--- AsbCloudWebApi/Controllers/DailyReportController.cs | 1 + AsbCloudWebApi/Controllers/DrillFlowChartController.cs | 2 -- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/AsbCloudDb/EFExtentions.cs b/AsbCloudDb/EFExtentions.cs index fdf22fbc..291ad287 100644 --- a/AsbCloudDb/EFExtentions.cs +++ b/AsbCloudDb/EFExtentions.cs @@ -12,7 +12,7 @@ namespace AsbCloudDb { public static class EFExtentions { - private static System.Text.Json.JsonSerializerOptions jsonSerializerOptions = new() + private static readonly System.Text.Json.JsonSerializerOptions jsonSerializerOptions = new() { AllowTrailingCommas = true, WriteIndented = true, diff --git a/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs b/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs index 09c06643..c967e3f5 100644 --- a/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs +++ b/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs @@ -122,7 +122,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport private async Task MakeDefaultDailyReportAsync(int idWell, DateTime date, CancellationToken token) { var well = await wellService.GetOrDefaultAsync(idWell, token); - var offsetHours = wellService.GetTimezone(idWell).Hours; + var dto = new DailyReportDto() { ReportDate = date, diff --git a/AsbCloudInfrastructure/Services/DetectOperations/OperationDetectionBackgroundService.cs b/AsbCloudInfrastructure/Services/DetectOperations/OperationDetectionBackgroundService.cs index 7c2f73af..0cb008c4 100644 --- a/AsbCloudInfrastructure/Services/DetectOperations/OperationDetectionBackgroundService.cs +++ b/AsbCloudInfrastructure/Services/DetectOperations/OperationDetectionBackgroundService.cs @@ -68,7 +68,7 @@ namespace AsbCloudInfrastructure.Services.DetectOperations await base.StopAsync(token).ConfigureAwait(false); } - private async Task DetectedAllTelemetriesAsync(IAsbCloudDbContext db, CancellationToken token) + private static async Task DetectedAllTelemetriesAsync(IAsbCloudDbContext db, CancellationToken token) { var lastDetectedDates = await db.DetectedOperations .GroupBy(o => o.IdTelemetry) @@ -91,7 +91,7 @@ namespace AsbCloudInfrastructure.Services.DetectOperations (outer, inner) => new { IdTelemetry = outer, - LastDate = inner.SingleOrDefault()?.LastDate, + inner.SingleOrDefault()?.LastDate, }); var affected = 0; foreach (var item in JounedlastDetectedDates) @@ -108,7 +108,7 @@ namespace AsbCloudInfrastructure.Services.DetectOperations return affected; } - private async Task> DetectOperationsAsync(int idTelemetry, DateTimeOffset begin, IAsbCloudDbContext db, CancellationToken token) + private static async Task> DetectOperationsAsync(int idTelemetry, DateTimeOffset begin, IAsbCloudDbContext db, CancellationToken token) { var query = db.TelemetryDataSaub .AsNoTracking() diff --git a/AsbCloudWebApi/Controllers/DailyReportController.cs b/AsbCloudWebApi/Controllers/DailyReportController.cs index 7cfb03de..87b61db1 100644 --- a/AsbCloudWebApi/Controllers/DailyReportController.cs +++ b/AsbCloudWebApi/Controllers/DailyReportController.cs @@ -97,6 +97,7 @@ namespace AsbCloudWebApi.Controllers /// Сформировать и скачать рапорт в формате excel /// /// + /// /// /// [HttpGet("{date}/excel")] diff --git a/AsbCloudWebApi/Controllers/DrillFlowChartController.cs b/AsbCloudWebApi/Controllers/DrillFlowChartController.cs index 6737b9dc..cc4d4b52 100644 --- a/AsbCloudWebApi/Controllers/DrillFlowChartController.cs +++ b/AsbCloudWebApi/Controllers/DrillFlowChartController.cs @@ -18,14 +18,12 @@ namespace AsbCloudWebApi.Controllers public class DrillFlowChartController : CrudWellRelatedController { private readonly ITelemetryService telemetryService; - private readonly IWellService wellService; public DrillFlowChartController(IWellService wellService, IDrillFlowChartService service, ITelemetryService telemetryService) : base(wellService, service) { this.telemetryService = telemetryService; - this.wellService = wellService; } ///