on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

1. Добавлен api метод GetDrillProcessMap в ProcessMapController, который отдает данные для построения режимной карты по бурению

Browse Source 
2. Фикс бага по ренедеру данных слайда
This commit is contained in:
Olga Nemt 2023-02-08 10:42:54 +05:00
parent d70cf25c0a
commit d83555fd46
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportService.cs
View File

@ -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;
}

31
AsbCloudWebApi/Controllers/ProcessMapController.cs
View File

@ -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>