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

Merge branch 'feature/ban_adding_data' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into feature/ban_adding_data

Browse Source
This commit is contained in:
ngfrolov 2023-09-13 10:32:28 +05:00
commit dd9ffc57b3
Signed by: ng.frolov
GPG Key ID: E99907A0357B29A7
3 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
AsbCloudApp/Services/IProcessMapService.cs
View File

@ -17,14 +17,5 @@ namespace AsbCloudApp.Services
/// <param name="token"></param> /// <param name="token"></param>
/// <returns></returns> /// <returns></returns>
Task<IEnumerable<ProcessMapReportDto>> GetProcessMapReportAsync(int idWell, CancellationToken token); Task<IEnumerable<ProcessMapReportDto>> GetProcessMapReportAsync(int idWell, CancellationToken token);
/// <summary>
/// Удаление записи РТК
/// </summary>
/// <param name="id"></param>
/// <param name="idWell"></param>
/// <param name="token"></param>
/// <returns></returns>
Task<int> DeleteAsync(int id, int idWell, CancellationToken token);
} }
} }

10
AsbCloudInfrastructure/Services/ProcessMap/ProcessMapService.cs
View File

@ -54,16 +54,6 @@ namespace AsbCloudInfrastructure.Services.ProcessMap
return result; return result;
} }
public async Task<int> DeleteAsync(int id, int idWell, CancellationToken token)
{
var processMap = await processMapPlanRepository.GetOrDefaultAsync(id, token);
if (processMap?.IdWell != idWell)
throw new ArgumentInvalidException("Запись РТК принадлежит другой скважине", nameof(idWell));
return await processMapPlanRepository.DeleteAsync(id, token);
}
private IEnumerable<ProcessMapReportDto> CalcByIntervals(IEnumerable<ProcessMapPlanDto> processMapPlan, TelemetryDataSaubStatDto[] telemetryDataStat) private IEnumerable<ProcessMapReportDto> CalcByIntervals(IEnumerable<ProcessMapPlanDto> processMapPlan, TelemetryDataSaubStatDto[] telemetryDataStat)
{ {
var processMapIntervals = CalcDepthIntervals(processMapPlan); var processMapIntervals = CalcDepthIntervals(processMapPlan);

10
AsbCloudWebApi/Controllers/ProcessMapController.cs
View File

@ -250,16 +250,6 @@ namespace AsbCloudWebApi.Controllers
var fileName = $"РТК-план по скважине {well.Caption} куст {well.Cluster}.xlsx"; var fileName = $"РТК-план по скважине {well.Caption} куст {well.Cluster}.xlsx";
return File(stream, "application/octet-stream", fileName); return File(stream, "application/octet-stream", fileName);
} }
[HttpDelete("{id}/{idWell}")]
[ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
public async Task<ActionResult<int>> DeleteAsync(int id, int idWell, CancellationToken cancellationToken)
{
if (!await CanUserEditProcessMapAsync(idWell, cancellationToken))
return Forbid();
return await processMapService.DeleteAsync(id, idWell, cancellationToken);
}
private async Task<bool> CanUserEditProcessMapAsync(int idWell, CancellationToken token) private async Task<bool> CanUserEditProcessMapAsync(int idWell, CancellationToken token)
{ {