From d83555fd46a2d1db82705c58a95df44be190226d Mon Sep 17 00:00:00 2001
From: Olga Nemt <on.nemtina@digitaldrilling.ru>
Date: Wed, 8 Feb 2023 10:42:54 +0500
Subject: [PATCH] =?UTF-8?q?1.=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20api=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20GetDrillProcess?=
 =?UTF-8?q?Map=20=D0=B2=20ProcessMapController,=20=D0=BA=D0=BE=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D1=8B=D0=B9=20=D0=BE=D1=82=D0=B4=D0=B0=D0=B5=D1=82=20?=
 =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D0=B5=20=D0=B4=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D1=81=D1=82=D1=80=D0=BE=D0=B5=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B6=D0=B8=D0=BC=D0=BD=D0=BE=D0=B9=20=D0=BA=D0=B0?=
 =?UTF-8?q?=D1=80=D1=82=D1=8B=20=D0=BF=D0=BE=20=D0=B1=D1=83=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8E=202.=20=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B1?=
 =?UTF-8?q?=D0=B0=D0=B3=D0=B0=20=D0=BF=D0=BE=20=D1=80=D0=B5=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=B4=D0=B5=D1=80=D1=83=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85?=
 =?UTF-8?q?=20=D1=81=D0=BB=D0=B0=D0=B9=D0=B4=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessMap/ProcessMapReportService.cs     |  2 +-
 .../Controllers/ProcessMapController.cs       | 31 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

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;
+
         }
 
         /// <summary>
@@ -103,6 +112,26 @@ namespace AsbCloudWebApi.Controllers
                 return NoContent();
         }
 
+        /// <summary>
+        /// Выгрузка режимной карты по бурению скважины
+        /// </summary>
+        /// <param name="wellId"></param>
+        /// <param name="token"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("getDrillProcessMap/{wellId}")]
+        [ProducesResponseType(typeof(IEnumerable<ProcessMapReportDto>), (int)System.Net.HttpStatusCode.OK)]
+        public async Task<IActionResult> GetDrillProcessMap(int wellId, CancellationToken token)
+        {
+            var data = await processMapService.GetProcessMapAsync(wellId, token);
+            if (data != null)
+            {
+                return Ok(data);
+            }
+            else
+                return NoContent();
+        }
+
         /// <summary>
         /// Добавить запись
         /// </summary>