From 03813b940348e54f1a85047a077c7d0a76b83fe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A4=D1=80=D0=BE=D0=BB=D0=BE=D0=B2?= Date: Thu, 14 Oct 2021 11:46:17 +0500 Subject: [PATCH] DrillFlowChartController. Edit routes --- .../Controllers/DrillFlowChartController.cs | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/AsbCloudWebApi/Controllers/DrillFlowChartController.cs b/AsbCloudWebApi/Controllers/DrillFlowChartController.cs index 2f203e75..ec241b9d 100644 --- a/AsbCloudWebApi/Controllers/DrillFlowChartController.cs +++ b/AsbCloudWebApi/Controllers/DrillFlowChartController.cs @@ -11,7 +11,6 @@ namespace AsbCloudWebApi.Controllers /// /// Контроллер для корридоров бурения на панели /// - [Route("api/well/{idWell}/drillFlowChart/")] [ApiController] public class DrillFlowChartController : ControllerBase { @@ -35,8 +34,9 @@ namespace AsbCloudWebApi.Controllers /// Токен отмены задачи /// Список параметров для корридоров бурения [HttpGet] + [Route("api/well/{idWell}/drillFlowChart")] [ProducesResponseType(typeof(IEnumerable), (int) System.Net.HttpStatusCode.OK)] - public async Task GetAllAsync(int idWell, DateTime updateFrom, + public async Task GetAsync(int idWell, DateTime updateFrom = default, CancellationToken token = default) { var idCompany = User.GetCompanyId(); @@ -50,7 +50,7 @@ namespace AsbCloudWebApi.Controllers return Ok(dto); } - + /// /// Возвращает все значения для корридоров бурения по uid панели /// @@ -58,9 +58,10 @@ namespace AsbCloudWebApi.Controllers /// Дата, с которой следует искать новые параметры /// Токен отмены задачи /// Список параметров для корридоров бурения - [HttpGet("{uid}")] + [HttpGet] + [Route("api/telemetry/{uid}/drillFlowChart")] [ProducesResponseType(typeof(IEnumerable), (int) System.Net.HttpStatusCode.OK)] - public async Task GetAllAsync(string uid, DateTime updateFrom, CancellationToken token = default) + public async Task GetByTelemetryAsync(string uid, DateTime updateFrom = default, CancellationToken token = default) { var idCompany = User.GetCompanyId(); @@ -84,6 +85,7 @@ namespace AsbCloudWebApi.Controllers /// Токен отмены задачи /// [HttpPost] + [Route("api/well/{idWell}/drillFlowChart")] [ProducesResponseType(typeof(int), (int) System.Net.HttpStatusCode.OK)] public async Task InsertAsync(int idWell, DrillFlowChartDto drillFlowChartDto, CancellationToken token = default) @@ -106,7 +108,8 @@ namespace AsbCloudWebApi.Controllers /// Массив объектов параметров корридоров бурения /// Токен отмены задачи /// - [HttpPost("range")] + [HttpPost] + [Route("api/well/{idWell}/drillFlowChart/range")] [ProducesResponseType(typeof(int), (int) System.Net.HttpStatusCode.OK)] public async Task InsertRangeAsync(int idWell, IEnumerable drillFlowChartParams, CancellationToken token = default) @@ -131,6 +134,7 @@ namespace AsbCloudWebApi.Controllers /// Токен отмены задачи /// [HttpPut] + [Route("api/well/{idWell}/drillFlowChart")] [ProducesResponseType(typeof(int), (int) System.Net.HttpStatusCode.OK)] public async Task EditAsync(int idWell, DrillFlowChartDto drillFlowChart, CancellationToken token = default) @@ -155,6 +159,7 @@ namespace AsbCloudWebApi.Controllers /// Токен отмены задачи /// [HttpDelete] + [Route("api/well/{idWell}/drillFlowChart")] [ProducesResponseType(typeof(int), (int) System.Net.HttpStatusCode.OK)] public async Task DeleteAsync(int idWell, int drillFlowChartParamsId, CancellationToken token = default)