From 878dfb3daaa83557db753d31966d03769cf34b04 Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Wed, 10 Apr 2024 12:19:32 +0500 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=20=D0=BB=D0=B8?= =?UTF-8?q?=D1=88=D0=BD=D0=B8=D0=B9=20=D0=BA=D0=BE=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExcelServices/ExcelTemplateService.cs | 39 ------------------- .../Services/WellService.cs | 2 +- .../Controllers/WellOperationController.cs | 14 +------ AsbCloudWebApi/appsettings.json | 6 +-- 4 files changed, 6 insertions(+), 55 deletions(-) delete mode 100644 AsbCloudInfrastructure/Services/ExcelServices/ExcelTemplateService.cs diff --git a/AsbCloudInfrastructure/Services/ExcelServices/ExcelTemplateService.cs b/AsbCloudInfrastructure/Services/ExcelServices/ExcelTemplateService.cs deleted file mode 100644 index 75aa1f20..00000000 --- a/AsbCloudInfrastructure/Services/ExcelServices/ExcelTemplateService.cs +++ /dev/null @@ -1,39 +0,0 @@ -using AsbCloudApp.Data.WellOperation; -using AsbCloudApp.Repositories; -using AsbCloudApp.Requests; -using AsbCloudApp.Requests.ExportOptions; -using AsbCloudApp.Services; -using AsbCloudInfrastructure.Repository; -using AsbCloudInfrastructure.Services.ExcelServices.Templates; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; - -namespace AsbCloudInfrastructure.Services.ExcelServices -{ - public class ExcelTemplateService : ExcelExportService - where TTemplate : class, ITemplateParameters, new() - { - private readonly IWellOperationCategoryRepository wellOperationCategoryRepository; - - public ExcelTemplateService(IWellOperationCategoryRepository wellOperationCategoryRepository, - IWellService wellService) - { - this.wellOperationCategoryRepository = wellOperationCategoryRepository; - } - - protected override async Task BuildFileNameAsync(WellOperationExportRequest options, CancellationToken token) - { - return "WellOperationFactTemplate"; - } - - protected override async Task> GetDtosAsync(WellOperationExportRequest options, CancellationToken token) - { - var dtos = wellOperationCategoryRepository.Get(false); - return dtos; - } - } -} diff --git a/AsbCloudInfrastructure/Services/WellService.cs b/AsbCloudInfrastructure/Services/WellService.cs index 795d944b..6ed241a0 100644 --- a/AsbCloudInfrastructure/Services/WellService.cs +++ b/AsbCloudInfrastructure/Services/WellService.cs @@ -71,7 +71,7 @@ namespace AsbCloudInfrastructure.Services return DateTimeOffset.MinValue; var datesRange = telemetryService.GetDatesRange(well.IdTelemetry.Value); - return datesRange.To; + return datesRange.To.DateTime; } /// diff --git a/AsbCloudWebApi/Controllers/WellOperationController.cs b/AsbCloudWebApi/Controllers/WellOperationController.cs index c8648dba..00c72656 100644 --- a/AsbCloudWebApi/Controllers/WellOperationController.cs +++ b/AsbCloudWebApi/Controllers/WellOperationController.cs @@ -51,7 +51,6 @@ public class WellOperationController : ControllerBase IUserRepository userRepository, WellOperationParserFactory wellOperationParserFactory, WellOperationExportServiceFactory wellOperationExportServiceFactory) - //IExportService templateService { this.wellOperationRepository = wellOperationRepository; this.wellOperationCategoryRepository = wellOperationCategoryRepository; @@ -59,8 +58,6 @@ public class WellOperationController : ControllerBase this.userRepository = userRepository; this.wellOperationParserFactory = wellOperationParserFactory; this.wellOperationExportServiceFactory = wellOperationExportServiceFactory; - //this.templateService = templateService; - } /// @@ -324,19 +321,12 @@ public class WellOperationController : ControllerBase [HttpGet("template")] [AllowAnonymous] [ProducesResponseType(typeof(PhysicalFileResult), StatusCodes.Status200OK, "application/octet-stream")] - public async Task GetTemplate(int idType) - { + public IActionResult GetTemplate(int idType) + { var parser = wellOperationParserFactory.CreateParser(idType); var stream = parser.GetTemplateFile(); - //using var workbook = new XLWorkbook(stream); - //AddDtosToWorkbook(workbook, dtos); - return File(stream, "application/octet-stream", templateNames[idType]); - - //var exportOptions = new WellRelatedExportRequest(5); - //var (fileName, file) = await templateService.ExportAsync(exportOptions, CancellationToken.None); - //return File(file, "application/octet-stream", fileName); } private async Task CanUserAccessToWellAsync(int idWell, CancellationToken token) diff --git a/AsbCloudWebApi/appsettings.json b/AsbCloudWebApi/appsettings.json index 5294ebe7..72d50f57 100644 --- a/AsbCloudWebApi/appsettings.json +++ b/AsbCloudWebApi/appsettings.json @@ -7,10 +7,10 @@ } }, "ConnectionStrings": { - "DefaultConnection": "Host=localhost;Database=postgres2;Username=postgres;Password=q;Persist Security Info=True", - "DebugConnection": "Host=localhost;Database=postgres2;Username=postgres;Password=q;Persist Security Info=True;Include Error Detail=True", + "DefaultConnection": "Host=localhost;Database=postgres;Username=postgres;Password=q;Persist Security Info=True", + "DebugConnection": "Host=localhost;Database=postgres;Username=postgres;Password=q;Persist Security Info=True;Include Error Detail=True", "TestConnection": "Host=localhost;Database=test;Username=postgres;Password=q;Persist Security Info=True;Include Error Detail=True", - "LocalConnection": "Host=localhost;Database=postgres2;Username=postgres;Password=q;Persist Security Info=True" + "LocalConnection": "Host=localhost;Database=postgres;Username=postgres;Password=q;Persist Security Info=True" }, "AllowedHosts": "*", "ContentPath": "../data",