diff --git a/AsbCloudApp/Data/ProcessMap/ProcessMapDto.cs b/AsbCloudApp/Data/ProcessMap/ProcessMapPlanDto.cs similarity index 96% rename from AsbCloudApp/Data/ProcessMap/ProcessMapDto.cs rename to AsbCloudApp/Data/ProcessMap/ProcessMapPlanDto.cs index 94989d70..ce64f1a3 100644 --- a/AsbCloudApp/Data/ProcessMap/ProcessMapDto.cs +++ b/AsbCloudApp/Data/ProcessMap/ProcessMapPlanDto.cs @@ -1,13 +1,12 @@ using System; using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; namespace AsbCloudApp.Data.ProcessMap { /// /// РТК /// - public class ProcessMapDto : IId, IWellRelated + public class ProcessMapPlanDto : IId, IWellRelated { /// public int Id { get; set; } diff --git a/AsbCloudApp/Data/ProcessMap/ProcessMapReportDto.cs b/AsbCloudApp/Data/ProcessMap/ProcessMapReportDto.cs index 7d9b9c03..9e753c01 100644 --- a/AsbCloudApp/Data/ProcessMap/ProcessMapReportDto.cs +++ b/AsbCloudApp/Data/ProcessMap/ProcessMapReportDto.cs @@ -13,16 +13,34 @@ namespace AsbCloudApp.Data.ProcessMap public int IdWell { get; set; } /// - /// Глубина по стволу, м + /// название секции скважины + /// + public int IdWellSectionType { get; set; } + + /// + /// название секции скважины + /// + public string WellSectionTypeName { get; set; } = null!; + + /// + /// Глубина по стволу от, м /// /// на начало интервала /// /// public double DepthStart { get; set; } + /// + /// Глубина по стволу до, м + /// + /// на конец интервала + /// + /// + public double DepthEnd { get; set; } + /// /// Дата/ время - /// + /// /// на начало интервала /// /// @@ -34,14 +52,9 @@ namespace AsbCloudApp.Data.ProcessMap public double MechDrillingHours { get; set; } /// - /// название секции скважины + /// Режим бурения (Ротор/слайд/ручной) /// - public int IdWellSectionType { get; set; } - - /// - /// название секции скважины - /// - public string WellSectionTypeName { get; set; } = null!; + public string DrillingMode { get; set; } = null!; /// /// Проходка, м diff --git a/AsbCloudApp/Data/ProcessMap/ProcessMapReportParamsDto.cs b/AsbCloudApp/Data/ProcessMap/ProcessMapReportParamsDto.cs index 6557283f..da002d5c 100644 --- a/AsbCloudApp/Data/ProcessMap/ProcessMapReportParamsDto.cs +++ b/AsbCloudApp/Data/ProcessMap/ProcessMapReportParamsDto.cs @@ -34,6 +34,6 @@ namespace AsbCloudApp.Data.ProcessMap /// /// Процент бурения по уставке, % /// - public double? PercDrillingSetpoint { get; set; } + public double? PercDrillingBySetpoint { get; set; } } } diff --git a/AsbCloudApp/Repositories/IProcessMapRepository.cs b/AsbCloudApp/Repositories/IProcessMapRepository.cs index 3a1da4d5..c0f347e2 100644 --- a/AsbCloudApp/Repositories/IProcessMapRepository.cs +++ b/AsbCloudApp/Repositories/IProcessMapRepository.cs @@ -11,7 +11,7 @@ namespace AsbCloudApp.Repositories /// /// /// - public interface IProcessMapRepository : IRepositoryWellRelated + public interface IProcessMapRepository : IRepositoryWellRelated { /// /// . @@ -20,7 +20,7 @@ namespace AsbCloudApp.Repositories /// /// /// - Task> GetAllAsync(int idWell, + Task> GetAllAsync(int idWell, DateTime? updateFrom, CancellationToken token = default); /// @@ -29,6 +29,6 @@ namespace AsbCloudApp.Repositories /// /// /// - Task> GetProcessMapAsync(IEnumerable requests, CancellationToken token); + Task> GetProcessMapAsync(IEnumerable requests, CancellationToken token); } } \ No newline at end of file diff --git a/AsbCloudApp/Repositories/IWellCompositeRepository.cs b/AsbCloudApp/Repositories/IWellCompositeRepository.cs index 06413176..c54c7e27 100644 --- a/AsbCloudApp/Repositories/IWellCompositeRepository.cs +++ b/AsbCloudApp/Repositories/IWellCompositeRepository.cs @@ -34,6 +34,6 @@ namespace AsbCloudApp.Repositories /// /// /// - Task> GetCompositeProcessMap(int idWell, CancellationToken token); + Task> GetCompositeProcessMap(int idWell, CancellationToken token); } } diff --git a/AsbCloudInfrastructure/Repository/ProcessMapRepository.cs b/AsbCloudInfrastructure/Repository/ProcessMapRepository.cs index 35d51724..dc0539c7 100644 --- a/AsbCloudInfrastructure/Repository/ProcessMapRepository.cs +++ b/AsbCloudInfrastructure/Repository/ProcessMapRepository.cs @@ -18,7 +18,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Repository { #nullable enable - public class ProcessMapRepository : CrudWellRelatedRepositoryBase, + public class ProcessMapRepository : CrudWellRelatedRepositoryBase, IProcessMapRepository { private readonly IWellService wellService; @@ -32,7 +32,7 @@ namespace AsbCloudInfrastructure.Repository this.wellService = wellService; } - public async Task> GetAllAsync(int idWell, + public async Task> GetAllAsync(int idWell, DateTime? updateFrom, CancellationToken token) { var requests = new[] @@ -53,7 +53,7 @@ namespace AsbCloudInfrastructure.Repository return dtos; } - public async Task> GetProcessMapAsync(IEnumerable requests, CancellationToken token) + public async Task> GetProcessMapAsync(IEnumerable requests, CancellationToken token) { var entities = await BuildQuery(requests) .ToListAsync(token) @@ -62,7 +62,7 @@ namespace AsbCloudInfrastructure.Repository return dtos; } - public override async Task InsertAsync(ProcessMapDto dto, + public override async Task InsertAsync(ProcessMapPlanDto dto, CancellationToken token) { dto.LastUpdate = DateTime.UtcNow; @@ -70,7 +70,7 @@ namespace AsbCloudInfrastructure.Repository return result; } - public override async Task UpdateAsync(ProcessMapDto dto, + public override async Task UpdateAsync(ProcessMapPlanDto dto, CancellationToken token) { dto.LastUpdate = DateTime.UtcNow; @@ -105,9 +105,9 @@ namespace AsbCloudInfrastructure.Repository } return query; } - protected override ProcessMapDto Convert(ProcessMap entity) + protected override ProcessMapPlanDto Convert(ProcessMap entity) { - var dto = entity.Adapt(); + var dto = entity.Adapt(); dto.LastUpdate = entity.LastUpdate.ToRemoteDateTime(entity.Well.Timezone.Hours); dto.AxialLoad = new PlanLimitDto { @@ -137,7 +137,7 @@ namespace AsbCloudInfrastructure.Repository return dto; } - protected override ProcessMap Convert(ProcessMapDto dto) + protected override ProcessMap Convert(ProcessMapPlanDto dto) { var entity = dto.Adapt(); entity.AxialLoadPlan = dto.AxialLoad.Plan; diff --git a/AsbCloudInfrastructure/Repository/WellCompositeRepository.cs b/AsbCloudInfrastructure/Repository/WellCompositeRepository.cs index 5fd50aaf..0ec8d6b9 100644 --- a/AsbCloudInfrastructure/Repository/WellCompositeRepository.cs +++ b/AsbCloudInfrastructure/Repository/WellCompositeRepository.cs @@ -50,7 +50,7 @@ namespace AsbCloudInfrastructure.Repository } /// - public async Task> GetCompositeProcessMap(int idWell, CancellationToken token) + public async Task> GetCompositeProcessMap(int idWell, CancellationToken token) { var dtos = await GetAsync(idWell, token); diff --git a/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportService.cs b/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportService.cs index cacb341d..430da7b4 100644 --- a/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapReportService.cs @@ -168,7 +168,7 @@ namespace AsbCloudInfrastructure.Services.ProcessMap .SetVal(dataParam.Limit); sheet.Cell(row, column + columnOffsetPercent) - .SetVal(dataParam.PercDrillingSetpoint); + .SetVal(dataParam.PercDrillingBySetpoint); } private static void FillIntervalModeDataSpeed(IXLWorksheet sheet, ProcessMapReportParamsDto dataParam, int column, int row) @@ -192,7 +192,7 @@ namespace AsbCloudInfrastructure.Services.ProcessMap .SetVal(dataParam.Limit); sheet.Cell(row, column + columnOffsetPercent) - .SetVal(dataParam.PercDrillingSetpoint); + .SetVal(dataParam.PercDrillingBySetpoint); } private static Stream GetExcelTemplateStream() diff --git a/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapService.cs b/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapService.cs index a8228d7e..5688e0ff 100644 --- a/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapService.cs @@ -96,7 +96,7 @@ namespace AsbCloudInfrastructure.Services.ProcessMap private static IEnumerable HandleSection( IEnumerable sectionOperations, - IEnumerable sectionProcessMap, + IEnumerable sectionProcessMap, IEnumerable telemetryDataStat, IEnumerable limitingParameters, IEnumerable subsystemsOperationTime) @@ -116,7 +116,7 @@ namespace AsbCloudInfrastructure.Services.ProcessMap private static ProcessMapReportDto MakeProcessMapReportDto( (double min, double max) depthInterval, IEnumerable sectionOperations, - IEnumerable sectionProcessMap, + IEnumerable sectionProcessMap, IEnumerable telemetryDataStat, IEnumerable limitingParameters, IEnumerable subsystemsOperationTime) diff --git a/AsbCloudInfrastructure/Services/WellInfoService.cs b/AsbCloudInfrastructure/Services/WellInfoService.cs index d627dc4e..79d59003 100644 --- a/AsbCloudInfrastructure/Services/WellInfoService.cs +++ b/AsbCloudInfrastructure/Services/WellInfoService.cs @@ -105,7 +105,7 @@ namespace AsbCloudInfrastructure.Services int? idSection = wellLastFactSection?.Id; - ProcessMapDto? welllProcessMap; + ProcessMapPlanDto? welllProcessMap; if (idSection is not null) { welllProcessMap = wellProcessMaps.FirstOrDefault(p => p.IdWellSectionType == idSection); diff --git a/AsbCloudWebApi/Controllers/ProcessMapController.cs b/AsbCloudWebApi/Controllers/ProcessMapController.cs index 2837af73..9f5617a2 100644 --- a/AsbCloudWebApi/Controllers/ProcessMapController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMapController.cs @@ -18,7 +18,7 @@ namespace AsbCloudWebApi.Controllers [ApiController] [Route("api/[controller]")] [Authorize] - public class ProcessMapController : CrudWellRelatedController + public class ProcessMapController : CrudWellRelatedController { private readonly ITelemetryService telemetryService; private readonly IProcessMapReportService processMapReportService; @@ -49,14 +49,14 @@ namespace AsbCloudWebApi.Controllers [Obsolete("use GetByUidAsync(..) instead")] [Route("/api/telemetry/{uid}/drillFlowChart")] [AllowAnonymous] - [ProducesResponseType(typeof(IEnumerable), (int)System.Net.HttpStatusCode.OK)] + [ProducesResponseType(typeof(IEnumerable), (int)System.Net.HttpStatusCode.OK)] public IActionResult GetByTelemetry(string uid, DateTime updateFrom, CancellationToken token) { var idWell = telemetryService.GetIdWellByTelemetryUid(uid); if (idWell is null) return BadRequest($"Wrong uid {uid}"); - var dto = Enumerable.Empty(); + var dto = Enumerable.Empty(); return Ok(dto); } @@ -70,7 +70,7 @@ namespace AsbCloudWebApi.Controllers [HttpGet] [Route("/api/telemetry/{uid}/processMap")] [AllowAnonymous] - [ProducesResponseType(typeof(IEnumerable), (int)System.Net.HttpStatusCode.OK)] + [ProducesResponseType(typeof(IEnumerable), (int)System.Net.HttpStatusCode.OK)] public async Task GetByUidAsync(string uid, DateTime updateFrom, CancellationToken token) { var idWell = telemetryService.GetIdWellByTelemetryUid(uid); @@ -133,7 +133,7 @@ namespace AsbCloudWebApi.Controllers /// /// [HttpPost] - public override async Task> InsertAsync([FromBody] ProcessMapDto value, CancellationToken token) + public override async Task> InsertAsync([FromBody] ProcessMapPlanDto value, CancellationToken token) { value.IdUser = User.GetUserId() ?? -1; return await base.InsertAsync(value, token); @@ -146,7 +146,7 @@ namespace AsbCloudWebApi.Controllers /// /// 1 - успешно отредактировано, 0 - нет [HttpPut] - public override async Task> UpdateAsync([FromBody] ProcessMapDto value, CancellationToken token) + public override async Task> UpdateAsync([FromBody] ProcessMapPlanDto value, CancellationToken token) { value.IdUser = User.GetUserId() ?? -1; return await base.UpdateAsync(value, token); diff --git a/AsbCloudWebApi/Controllers/WellCompositeController.cs b/AsbCloudWebApi/Controllers/WellCompositeController.cs index 66a0d65b..0bfe40c1 100644 --- a/AsbCloudWebApi/Controllers/WellCompositeController.cs +++ b/AsbCloudWebApi/Controllers/WellCompositeController.cs @@ -73,7 +73,7 @@ namespace AsbCloudWebApi.Controllers /// [HttpGet("getCompositeProcessMap")] [Permission] - [ProducesResponseType(typeof(IEnumerable), (int)System.Net.HttpStatusCode.OK)] + [ProducesResponseType(typeof(IEnumerable), (int)System.Net.HttpStatusCode.OK)] public async Task GetCompositeProcessMap(int idWell, CancellationToken token = default) { if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))