diff --git a/AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryImportService.cs b/AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryImportService.cs index d319492f..802de787 100644 --- a/AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryImportService.cs +++ b/AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryImportService.cs @@ -30,16 +30,8 @@ namespace AsbCloudInfrastructure.Services.Trajectory private const int ColumnAzimuthGeo = 3; private const int ColumnAzimuthMagnetic = 4; private const int ColumnVerticalDepth = 5; - private const int ColumnAbsoluteMark = 6; - private const int ColumnNorthOrifice = 7; - private const int ColumnEastOrifice = 8; - private const int ColumnEastCartographic = 9; - private const int ColumnNorthCartographic = 10; - private const int ColumnSpatialIntensity = 11; - private const int ColumnAngleIntensity = 12; - private const int ColumnAzimuthIntensity = 13; - private const int ColumnOrificeOffset = 14; - private const int ColumnComment = 15; + private const int ColumnRadius = 6; + private const int ColumnComment = 7; public PlannedTrajectoryImportService(IWellService wellService, ITrajectoryPlanRepository plannedTrajectoryService) { @@ -107,15 +99,7 @@ namespace AsbCloudInfrastructure.Services.Trajectory row.Cell(ColumnAzimuthGeo).Value = trajectory.AzimuthGeo; row.Cell(ColumnAzimuthMagnetic).Value = trajectory.AzimuthMagnetic; row.Cell(ColumnVerticalDepth).Value = trajectory.VerticalDepth; - row.Cell(ColumnAbsoluteMark).Value = trajectory.AbsoluteMark; - row.Cell(ColumnNorthOrifice).Value = trajectory.NorthOrifice; - row.Cell(ColumnEastOrifice).Value = trajectory.EastOrifice; - row.Cell(ColumnEastCartographic).Value = trajectory.EastCartographic; - row.Cell(ColumnNorthCartographic).Value = trajectory.NorthCartographic; - row.Cell(ColumnSpatialIntensity).Value = trajectory.SpatialIntensity; - row.Cell(ColumnAngleIntensity).Value = trajectory.AngleIntensity; - row.Cell(ColumnAzimuthIntensity).Value = trajectory.AzimuthIntensity; - row.Cell(ColumnOrificeOffset).Value = trajectory.OrificeOffset; + row.Cell(ColumnRadius).Value = trajectory.Radius; row.Cell(ColumnComment).Value = trajectory.Comment; } @@ -158,7 +142,7 @@ namespace AsbCloudInfrastructure.Services.Trajectory private IEnumerable ParseSheet(IXLWorksheet sheet) { - if (sheet.RangeUsed().RangeAddress.LastAddress.ColumnNumber < 15) + if (sheet.RangeUsed().RangeAddress.LastAddress.ColumnNumber < 7) throw new FileFormatException($"Лист {sheet.Name} содержит меньшее количество столбцов."); var count = sheet.RowsUsed().Count() - headerRowsCount; @@ -194,15 +178,7 @@ namespace AsbCloudInfrastructure.Services.Trajectory var _azimuthGeo = row.Cell(ColumnAzimuthGeo).Value; var _azimuthMagnetic = row.Cell(ColumnAzimuthMagnetic).Value; var _verticalDepth = row.Cell(ColumnVerticalDepth).Value; - var _absoluteMark = row.Cell(ColumnAbsoluteMark).Value; - var _northOrifice = row.Cell(ColumnNorthOrifice).Value; - var _eastOrifice = row.Cell(ColumnEastOrifice).Value; - var _eastCartographic = row.Cell(ColumnEastCartographic).Value; - var _northCartographic = row.Cell(ColumnNorthCartographic).Value; - var _spatialIntensity = row.Cell(ColumnSpatialIntensity).Value; - var _angleIntensity = row.Cell(ColumnAngleIntensity).Value; - var _azimuthIntensity = row.Cell(ColumnAzimuthIntensity).Value; - var _orificeOffset = row.Cell(ColumnOrificeOffset).Value; + var _radius = row.Cell(ColumnRadius).Value; var _comment = row.Cell(ColumnComment).Value; var trajectoryRow = new TrajectoryGeoPlanDto(); @@ -219,15 +195,8 @@ namespace AsbCloudInfrastructure.Services.Trajectory trajectoryRow.AzimuthGeo = getDoubleValue(_azimuthGeo, "Азимут географический", row); trajectoryRow.AzimuthMagnetic = getDoubleValue(_azimuthMagnetic, "Азимут магнитный", row); trajectoryRow.VerticalDepth = getDoubleValue(_verticalDepth, "Глубина вертикальная", row); - trajectoryRow.AbsoluteMark = getDoubleValue(_absoluteMark, "Абсолютная отметка", row); - trajectoryRow.NorthOrifice = getDoubleValue(_northOrifice, "Север относительно устья", row); - trajectoryRow.EastOrifice = getDoubleValue(_eastOrifice, "Восток относительно устья", row); - trajectoryRow.EastCartographic = getDoubleValue(_eastCartographic, "Восток картографический", row); - trajectoryRow.NorthCartographic = getDoubleValue(_northCartographic, "Север картографический", row); - trajectoryRow.SpatialIntensity = getDoubleValue(_spatialIntensity, "Простр. интенсивность", row); - trajectoryRow.AngleIntensity = getDoubleValue(_angleIntensity, "Интенсивность по углу", row); - trajectoryRow.AzimuthIntensity = getDoubleValue(_azimuthIntensity, "Интенсивность по азимуту", row); - trajectoryRow.OrificeOffset = getDoubleValue(_orificeOffset, "Смещение от устья", row); + trajectoryRow.Radius = getDoubleValue(_radius, "Радиус цели", row); + if (_comment is not null) trajectoryRow.Comment = _comment.ToString(); return trajectoryRow; diff --git a/AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryTemplate.xlsx b/AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryTemplate.xlsx index 68fd9cc2..20080ac4 100644 Binary files a/AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryTemplate.xlsx and b/AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryTemplate.xlsx differ