diff --git a/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportService.cs b/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportService.cs index 2fe5b180..9cdc30af 100644 --- a/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportService.cs @@ -108,7 +108,7 @@ namespace AsbCloudInfrastructure.Services.ProcessMap .SetVal(interval.MechDrillingHours); row = FillIntervalModeData(sheet, "Ротор", interval.Rotor, columnMode, row); - row = FillIntervalModeData(sheet, "Слайд", interval.Rotor, columnMode, row); + row = FillIntervalModeData(sheet, "Слайд", interval.Slide, columnMode, row); return row; } diff --git a/AsbCloudWebApi/Controllers/ProcessMapController.cs b/AsbCloudWebApi/Controllers/ProcessMapController.cs index f5c955aa..f5cb19a7 100644 --- a/AsbCloudWebApi/Controllers/ProcessMapController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMapController.cs @@ -1,5 +1,7 @@ using AsbCloudApp.Data.ProcessMap; using AsbCloudApp.Services; +using AsbCloudDb.Model; +using AsbCloudInfrastructure.Services.ProcessMap; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using System; @@ -21,13 +23,20 @@ namespace AsbCloudWebApi.Controllers { private readonly ITelemetryService telemetryService; private readonly IProcessMapReportService processMapReportService; + private readonly IProcessMapService processMapService; - public ProcessMapController(IWellService wellService, IProcessMapRepository repository, IProcessMapReportService processMapReportService, + public ProcessMapController( + IWellService wellService, + IProcessMapRepository repository, + IProcessMapReportService processMapReportService, + IProcessMapService processMapService, ITelemetryService telemetryService) : base(wellService, repository) { this.telemetryService = telemetryService; this.processMapReportService = processMapReportService; + this.processMapService = processMapService; + } /// @@ -103,6 +112,26 @@ namespace AsbCloudWebApi.Controllers return NoContent(); } + /// + /// Выгрузка режимной карты по бурению скважины + /// + /// + /// + /// + [HttpGet] + [Route("getDrillProcessMap/{wellId}")] + [ProducesResponseType(typeof(IEnumerable), (int)System.Net.HttpStatusCode.OK)] + public async Task GetDrillProcessMap(int wellId, CancellationToken token) + { + var data = await processMapService.GetProcessMapAsync(wellId, token); + if (data != null) + { + return Ok(data); + } + else + return NoContent(); + } + /// /// Добавить запись ///