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

Определение углов осцилляции

Browse Source
This commit is contained in:
Olga Nemt 2024-06-28 15:48:44 +05:00
parent a139ed943c
commit d1e6f0e14f
15 changed files with 194 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
AsbCloudApp/Data/ProcessMaps/ProcessMapPlanOperationDeterminationOfOscillationAnglesDto.cs
View File

@ -1,45 +0,0 @@
using System.ComponentModel.DataAnnotations;
namespace AsbCloudApp.Data.ProcessMaps;
/// <summary>
/// РТК план определения углов осцилляции
/// </summary>
public class ProcessMapPlanOperationDeterminationOfOscillationAnglesDto : ProcessMapPlanBaseDto
{
/// <summary>
/// Максимальное давление, атм
/// </summary>
[Range(0.0, 400.0, ErrorMessage = "Максимальное давление, атм., должно быть в пределах от 0 до 400")]
public double MaxPressure { get; set; }
/// <summary>
/// Перепад давления, атм.
/// </summary>
[Range(0.0, 60.0, ErrorMessage = "Перепад давления, атм., должно быть в пределах от 0 до 60")]
public double DifferentialPressure { get; set; }
/// <summary>
/// Уставки, т., затяжка
/// </summary>
[Range(0.0, 20.0, ErrorMessage = "Уставки, т., затяжка, должно быть в пределах от 0 до 20")]
public double SetpointsTight { get; set; }
/// <summary>
/// Уставки, т., посадка
/// </summary>
[Range(0.0, 20.0, ErrorMessage = "Уставки, т., посадка, должно быть в пределах от 0 до 20")]
public double SetpointsSlackingOff { get; set; }
/// <summary>
/// Скорость, м/ч., Вверх
/// </summary>
[Range(0.0, 999.0, ErrorMessage = "Скорость, м/ч., Вверх, должно быть в пределах от 0 до 999")]
public double Reaming1ROPUp { get; set; }
/// <summary>
/// Скорость, м/ч., Вниз
/// </summary>
[Range(0.0, 999.0, ErrorMessage = "Скорость, м/ч., Вниз, должно быть в пределах от 0 до 999")]
public double Reaming1ROPDown { get; set; }
}

34
AsbCloudApp/Data/ProcessMaps/ProcessMapPlanOperationSwitchingToTheModeDto.cs Normal file
View File

@ -0,0 +1,34 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace AsbCloudApp.Data.ProcessMaps;
/// <summary>
/// РТК план выход на плановый расход
/// </summary>
public class ProcessMapPlanOperationSwitchingToTheModeDto : ProcessMapPlanBaseDto
{
/// <summary>
/// Время выхода буровых насосов на плановый расход, сек.
/// </summary>
[Range(0.0, 3600.0, ErrorMessage = "Время выхода буровых насосов на плановый расход, сек., должно быть в пределах от 0 до 3600")]
public double RampTime { get; set; }
/// <summary>
/// Расход, л/с
/// </summary>
[Range(0.0, 100.0, ErrorMessage = "Расход, л/с., должно быть в пределах от 0 до 100")]
public double FlowRate { get; set; }
/// <summary>
/// Максимально допустимое давление, атм.
/// </summary>
[Range(0.0, 400.0, ErrorMessage = "Максимально допустимое давление, атм., должно быть в пределах от 0 до 400")]
public double PressureMax { get; set; }
/// <summary>
/// Примечание
/// </summary>
[StringLength(1024, ErrorMessage = "Примечание, должно быть не более 1024 символов")]
public string Note { get; set; } = string.Empty;
}

6
AsbCloudDb/Model/AsbCloudDbContext.cs
View File

@ -27,7 +27,7 @@ namespace AsbCloudDb.Model
public virtual DbSet<ProcessMapPlanOperationLoadCapacity> ProcessMapPlanOperationLoadCapacity => Set<ProcessMapPlanOperationLoadCapacity>();
public virtual DbSet<ProcessMapPlanSurvey> ProcessMapPlanSurvey => Set<ProcessMapPlanSurvey>();
public virtual DbSet<ProcessMapPlanOperationPositioningOffTheBottom> ProcessMapPlanOperationPositioningOffTheBottom => Set<ProcessMapPlanOperationPositioningOffTheBottom>();
public virtual DbSet<ProcessMapPlanOperationDeterminationOfOscillationAngles> ProcessMapPlanOperationDeterminationOfOscillationAngles => Set<ProcessMapPlanOperationDeterminationOfOscillationAngles>();
public virtual DbSet<ProcessMapPlanOscillationAngles> ProcessMapPlanOperationDeterminationOfOscillationAngles => Set<ProcessMapPlanOscillationAngles>();
public virtual DbSet<ProcessMapPlanOperationTFOrientation> ProcessMapPlanOperationTFOrientation => Set<ProcessMapPlanOperationTFOrientation>();
public virtual DbSet<ProcessMapPlanOperationSwitchPump> ProcessMapPlanOperationSwitchPump => Set<ProcessMapPlanOperationSwitchPump>();
public virtual DbSet<ProcessMapPlanOperationSwitchingToTheMode> ProcessMapPlanOperationSwitchMode => Set<ProcessMapPlanOperationSwitchingToTheMode>();
@ -498,7 +498,7 @@ namespace AsbCloudDb.Model
.WithMany()
.OnDelete(DeleteBehavior.Restrict);
modelBuilder.Entity<ProcessMapPlanOperationDeterminationOfOscillationAngles>()
modelBuilder.Entity<ProcessMapPlanOscillationAngles>()
.HasOne(p => p.Author)
.WithMany()
.OnDelete(DeleteBehavior.Restrict);
@ -598,7 +598,7 @@ namespace AsbCloudDb.Model
.WithMany()
.OnDelete(DeleteBehavior.Restrict);
modelBuilder.Entity<ProcessMapPlanOperationDeterminationOfOscillationAngles>()
modelBuilder.Entity<ProcessMapPlanOscillationAngles>()
.HasOne(p => p.Editor)
.WithMany()
.OnDelete(DeleteBehavior.Restrict);

2
AsbCloudDb/Model/IAsbCloudDbContext.cs
View File

@ -88,7 +88,7 @@ namespace AsbCloudDb.Model
DbSet<ProcessMapPlanOperationLoadCapacity> ProcessMapPlanOperationLoadCapacity { get; }
DbSet<ProcessMapPlanSurvey> ProcessMapPlanSurvey { get; }
DbSet<ProcessMapPlanOperationPositioningOffTheBottom> ProcessMapPlanOperationPositioningOffTheBottom { get; }
DbSet<ProcessMapPlanOperationDeterminationOfOscillationAngles> ProcessMapPlanOperationDeterminationOfOscillationAngles { get; }
DbSet<ProcessMapPlanOscillationAngles> ProcessMapPlanOperationDeterminationOfOscillationAngles { get; }
DbSet<ProcessMapPlanOperationTFOrientation> ProcessMapPlanOperationTFOrientation { get; }
DbSet<ProcessMapPlanOperationSwitchPump> ProcessMapPlanOperationSwitchPump { get; }
DbSet<ProcessMapPlanOperationSwitchingToTheMode> ProcessMapPlanOperationSwitchMode { get; }

43
AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOperationDeterminationOfOscillationAngles.cs
View File

@ -1,43 +0,0 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using AsbCloudDb.Model.ProcessMapPlan;
using Microsoft.EntityFrameworkCore;
namespace AsbCloudDb.Model.ProcessMaps;
[Table("t_process_map_plan_operation_oscillation_angels"), Comment("Определение углов осцилляции")]
public class ProcessMapPlanOperationDeterminationOfOscillationAngles : ProcessMapPlanBase
{
[Column("max_pressure"), Comment("Максимальное давление, атм")]
[Range(0.0, 400.0)]
[Required]
public double MaxPressure { get; set; }
[Column("differential_pressure"), Comment("Перепад давления, атм.")]
[Range(0.0, 60.0)]
[Required]
public double DifferentialPressure { get; set; }
[Column("setpoints_tight"), Comment("Уставки, т., затяжка")]
[Range(0.0, 20.0)]
[Required]
public double SetpointsTight { get; set; }
[Column("setpoints_slacking_off"), Comment("Уставки, т., посадка")]
[Range(0.0, 20.0)]
[Required]
public double SetpointsSlackingOff { get; set; }
[Column("reaming1_rop_up"), Comment("Скорость, м/ч., Вверх")]
[Range(0.0, 999.0)]
[Required]
public double Reaming1ROPUp { get; set; }
[Column("reaming1_rop_down"), Comment("Скорость, м/ч., Вниз")]
[Range(0.0, 999.0)]
[Required]
public double Reaming1ROPDown { get; set; }
[ForeignKey(nameof(IdPrevious))]
public virtual ProcessMapPlanOperationDeterminationOfOscillationAngles? Previous { get; set; }
}

37
AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOscillationAngles.cs Normal file
View File

@ -0,0 +1,37 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using AsbCloudDb.Model.ProcessMapPlan;
using Microsoft.EntityFrameworkCore;
namespace AsbCloudDb.Model.ProcessMaps;
[Table("t_process_map_plan_operation_oscillation_angels"), Comment("Определение углов осцилляции")]
public class ProcessMapPlanOscillationAngles : ProcessMapPlanBase
{
[Column("top_drive_torque"), Comment("Момент на ВСП, кН*м., Уставка")]
[Range(0.0, 35.0)]
[Required]
public double TopDriveTorque { get; set; }
[Column("top_drive_torque_max"), Comment("Момент на ВСП, кН*м., Ограничение")]
[Range(0.0, 35.0)]
[Required]
public double TopDriveTorqueMax { get; set; }
[Column("rpm"), Comment("Обороты на ВСП, об/мин., Уставка")]
[Range(0.0, 270.0)]
[Required]
public double Rpm { get; set; }
[Column("rpm_max"), Comment("Обороты на ВСП, об/мин., Ограничение")]
[Range(0.0, 270.0)]
[Required]
public double RpmMax { get; set; }
[Column("note"), Comment("Примечание"), StringLength(1024)]
[Required]
public string Note { get; set; } = string.Empty;
[ForeignKey(nameof(IdPrevious))]
public virtual ProcessMapPlanOscillationAngles? Previous { get; set; }
}

18
AsbCloudInfrastructure/DependencyInjection.cs
View File

@ -181,11 +181,11 @@ namespace AsbCloudInfrastructure
Item = src.Adapt<ProcessMapPlanOperationPositioningOffTheBottomDto>()
});
TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanOperationDeterminationOfOscillationAnglesDto>>.NewConfig()
.Include<ProcessMapPlanOperationDeterminationOfOscillationAngles, ChangeLogDto<ProcessMapPlanOperationDeterminationOfOscillationAnglesDto>>()
.Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanOperationDeterminationOfOscillationAnglesDto>()
TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanOscillationAnglesDto>>.NewConfig()
.Include<ProcessMapPlanOscillationAngles, ChangeLogDto<ProcessMapPlanOscillationAnglesDto>>()
.Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanOscillationAnglesDto>()
{
Item = src.Adapt<ProcessMapPlanOperationDeterminationOfOscillationAnglesDto>()
Item = src.Adapt<ProcessMapPlanOscillationAnglesDto>()
});
TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanOperationTFOrientationDto>>.NewConfig()
@ -434,7 +434,7 @@ namespace AsbCloudInfrastructure
services.AddTransient<ProcessMapPlanOperationLoadCapacityParser>();
services.AddTransient<ProcessMapPlanSurveyParser>();
services.AddTransient<ProcessMapPlanOperationPositioningOffTheBottomParser>();
services.AddTransient<ProcessMapPlanOperationDeterminationOfOscillationAnglesParser>();
services.AddTransient<ProcessMapPlanOscillationAnglesParser>();
services.AddTransient<ProcessMapPlanOperationTFOrientationParser>();
services.AddTransient<ProcessMapPlanOperationSwitchPumpParser>();
services.AddTransient<ProcessMapPlanOperationSwitchingToTheModeParser>();
@ -460,7 +460,7 @@ namespace AsbCloudInfrastructure
services.AddTransient<ProcessMapPlanOperationLoadCapacityExportService>();
services.AddTransient<ProcessMapPlanSurveyExportService>();
services.AddTransient<ProcessMapPlanOperationPositioningOffTheBottomExportService>();
services.AddTransient<ProcessMapPlanOperationDeterminationOfOscillationAnglesExportService>();
services.AddTransient<ProcessMapPlanOscillationAnglesExportService>();
services.AddTransient<ProcessMapPlanOperationTFOrientationExportService>();
services.AddTransient<ProcessMapPlanOperationSwitchPumpExportService>();
services.AddTransient<ProcessMapPlanOperationSwitchingToTheModeExportService>();
@ -515,8 +515,8 @@ namespace AsbCloudInfrastructure
ProcessMapPlanBaseRepository<ProcessMapPlanOperationPositioningOffTheBottom, ProcessMapPlanOperationPositioningOffTheBottomDto>>();
services.AddTransient<
IChangeLogRepository<ProcessMapPlanOperationDeterminationOfOscillationAnglesDto, ProcessMapPlanBaseRequestWithWell>,
ProcessMapPlanBaseRepository<ProcessMapPlanOperationDeterminationOfOscillationAngles, ProcessMapPlanOperationDeterminationOfOscillationAnglesDto>>();
IChangeLogRepository<ProcessMapPlanOscillationAnglesDto, ProcessMapPlanBaseRequestWithWell>,
ProcessMapPlanBaseRepository<ProcessMapPlanOscillationAngles, ProcessMapPlanOscillationAnglesDto>>();
services.AddTransient<
IChangeLogRepository<ProcessMapPlanOperationTFOrientationDto, ProcessMapPlanBaseRequestWithWell>,
@ -573,7 +573,7 @@ namespace AsbCloudInfrastructure
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanOperationLoadCapacityDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanSurveyDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanOperationPositioningOffTheBottomDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanOperationDeterminationOfOscillationAnglesDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanOscillationAnglesDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanOperationTFOrientationDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanOperationSwitchPumpDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanOperationSwitchingToTheModeDto>>();

4
AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOperationDeterminationOfOscillationAnglesTemplate.cs → AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOscillationAnglesTemplate.cs
View File

@ -2,13 +2,13 @@ using System.Collections.Generic;
namespace AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates;
public class ProcessMapPlanOperationDeterminationOfOscillationAnglesTemplate : ITemplateParameters
public class ProcessMapPlanOscillationAnglesTemplate : ITemplateParameters
{
public string SheetName => "Определение углов осцилляции";
public int HeaderRowsCount => 2;
public string FileName => "ProcessMapPlanOperationDeterminationOfOscillationAnglesTemplate.xlsx";
public string FileName => "ProcessMapPlanOscillationAnglesTemplate.xlsx";
public IDictionary<string, Cell> Cells => new Dictionary<string, Cell>
{

8
AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOperationDeterminationOfOscillationAnglesExportService.cs → AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOscillationAnglesExportService.cs
View File

@ -10,16 +10,16 @@ using System.Threading.Tasks;
namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Export;
public class ProcessMapPlanOperationDeterminationOfOscillationAnglesExportService : ProcessMapPlanExportService<ProcessMapPlanOperationDeterminationOfOscillationAnglesDto>
public class ProcessMapPlanOscillationAnglesExportService : ProcessMapPlanExportService<ProcessMapPlanOscillationAnglesDto>
{
public ProcessMapPlanOperationDeterminationOfOscillationAnglesExportService(
IChangeLogRepository<ProcessMapPlanOperationDeterminationOfOscillationAnglesDto, ProcessMapPlanBaseRequestWithWell> processMapPlanRepository,
public ProcessMapPlanOscillationAnglesExportService(
IChangeLogRepository<ProcessMapPlanOscillationAnglesDto, ProcessMapPlanBaseRequestWithWell> processMapPlanRepository,
IWellService wellService)
: base(processMapPlanRepository, wellService)
{
}
protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanOperationDeterminationOfOscillationAnglesTemplate();
protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanOscillationAnglesTemplate();
protected override async Task<string> BuildFileNameAsync(WellRelatedExportRequest options, CancellationToken token)
{

8
AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOperationDeterminationOfOscillationAnglesParser.cs → AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOscillationAnglesParser.cs
View File

@ -9,16 +9,16 @@ using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemp
namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Parser;
public class ProcessMapPlanOperationDeterminationOfOscillationAnglesParser : ProcessMapPlanParser<ProcessMapPlanOperationDeterminationOfOscillationAnglesDto>
public class ProcessMapPlanOscillationAnglesParser : ProcessMapPlanParser<ProcessMapPlanOscillationAnglesDto>
{
public ProcessMapPlanOperationDeterminationOfOscillationAnglesParser(IWellOperationRepository wellOperationRepository)
public ProcessMapPlanOscillationAnglesParser(IWellOperationRepository wellOperationRepository)
: base(wellOperationRepository)
{
}
protected override ITemplateParameters TemplateParameters => new ProcessMapPlanOperationDeterminationOfOscillationAnglesTemplate();
protected override ITemplateParameters TemplateParameters => new ProcessMapPlanOscillationAnglesTemplate();
protected override ProcessMapPlanOperationDeterminationOfOscillationAnglesDto BuildDto(IDictionary<string, object?> row, int rowNumber)
protected override ProcessMapPlanOscillationAnglesDto BuildDto(IDictionary<string, object?> row, int rowNumber)
{
var dto = base.BuildDto(row, rowNumber);

77
AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOperationDeterminationOfOscillationAnglesControllerTest.cs
View File

@ -1,77 +0,0 @@
using AsbCloudApp.Data.ProcessMaps;
using AsbCloudApp.Repositories;
using AsbCloudApp.Requests;
using AsbCloudApp.Services;
using AsbCloudDb.Model.ProcessMaps;
using AsbCloudInfrastructure.Services.ProcessMapPlan.Export;
using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser;
using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan;
using AsbCloudWebApi.IntegrationTests;
using Microsoft.EntityFrameworkCore;
using Xunit;
namespace AsbCloudWebApi.Controllers.ProcessMaps;
/// <summary>
/// РТК план определения углов осцилляции
/// </summary>
public class ProcessMapPlanOperationDeterminationOfOscillationAnglesControllerTest :
ProcessMapPlanBaseControllerTest<ProcessMapPlanOperationDeterminationOfOscillationAngles, ProcessMapPlanOperationDeterminationOfOscillationAnglesDto>
{
public ProcessMapPlanOperationDeterminationOfOscillationAnglesControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanOperationDeterminationOfOscillationAngles")
{
}
private readonly ProcessMapPlanOperationDeterminationOfOscillationAnglesDto dto = new ProcessMapPlanOperationDeterminationOfOscillationAnglesDto()
{
IdWell = 1,
DepthStart = 1,
DepthEnd = 2,
Id = 0,
IdWellSectionType = 1,
DifferentialPressure = 1,
MaxPressure = 2,
Reaming1ROPDown = 3,
Reaming1ROPUp = 4,
SetpointsSlackingOff = 5,
SetpointsTight = 6
};
private readonly ProcessMapPlanOperationDeterminationOfOscillationAngles entity = new ProcessMapPlanOperationDeterminationOfOscillationAngles()
{
IdWell = 1,
DepthEnd = 10,
DepthStart = 2,
Id = 0,
IdWellSectionType = 1,
IdAuthor = 1,
IdEditor = 1,
Creation = DateTimeOffset.UtcNow,
DifferentialPressure = 1,
MaxPressure = 2,
Reaming1ROPDown = 3,
Reaming1ROPUp = 4,
SetpointsSlackingOff = 5,
SetpointsTight = 6
};
[Fact]
public async Task Get_actual_returns_success()
{
await Get(entity, dto);
}
protected override ProcessMapPlanOperationDeterminationOfOscillationAngles GetByNote(DbSet<ProcessMapPlanOperationDeterminationOfOscillationAngles> dbSet, ProcessMapPlanOperationDeterminationOfOscillationAnglesDto dto)
{
throw new NotImplementedException();
}
protected override ProcessMapPlanOperationDeterminationOfOscillationAnglesDto GetByNote(IEnumerable<ProcessMapPlanOperationDeterminationOfOscillationAnglesDto> dtos, ProcessMapPlanOperationDeterminationOfOscillationAnglesDto dto)
{
throw new NotImplementedException();
}
protected override ProcessMapPlanOperationDeterminationOfOscillationAngles? GetByWellId()
{
throw new NotImplementedException();
}
}

7
AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOperationSwitchingToTheModeControllerTest.cs
View File

@ -13,7 +13,7 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps;
public class ProcessMapPlanOperationSwitchingToTheModeControllerTest :
ProcessMapPlanBaseControllerTest<ProcessMapPlanOperationSwitchingToTheMode, ProcessMapPlanOperationSwitchingToTheModeDto>
{
public ProcessMapPlanOperationSwitchingToTheModeControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanOperationSwitchMode")
public ProcessMapPlanOperationSwitchingToTheModeControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanOperationSwitchingToTheMode")
{
}
private readonly ProcessMapPlanOperationSwitchingToTheModeDto dto = new ProcessMapPlanOperationSwitchingToTheModeDto()
@ -23,10 +23,6 @@ public class ProcessMapPlanOperationSwitchingToTheModeControllerTest :
DepthEnd = 2,
Id = 0,
IdWellSectionType = 1,
Comment = 1,
ExitTimeConsumption = 2,
ConsumptionFlowRate = 3,
PressureLimitMax = 4,
};
private readonly ProcessMapPlanOperationSwitchingToTheMode entity = new ProcessMapPlanOperationSwitchingToTheMode()
@ -39,7 +35,6 @@ public class ProcessMapPlanOperationSwitchingToTheModeControllerTest :
IdAuthor = 1,
IdEditor = 1,
Creation = DateTimeOffset.UtcNow,
Comment = "1",
};
[Fact]

71
AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOscillationAnglesControllerTest.cs Normal file
View File

@ -0,0 +1,71 @@
using AsbCloudApp.Data.ProcessMaps;
using AsbCloudApp.Repositories;
using AsbCloudApp.Requests;
using AsbCloudApp.Services;
using AsbCloudDb.Model.ProcessMaps;
using AsbCloudInfrastructure.Services.ProcessMapPlan.Export;
using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser;
using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan;
using AsbCloudWebApi.IntegrationTests;
using Microsoft.EntityFrameworkCore;
using Xunit;
namespace AsbCloudWebApi.Controllers.ProcessMaps;
/// <summary>
/// РТК план определения углов осцилляции
/// </summary>
public class ProcessMapPlanOscillationAnglesControllerTest :
ProcessMapPlanBaseControllerTest<ProcessMapPlanOscillationAngles, ProcessMapPlanOscillationAnglesDto>
{
public ProcessMapPlanOscillationAnglesControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanOscillationAngles")
{
}
private readonly ProcessMapPlanOscillationAnglesDto dto = new ProcessMapPlanOscillationAnglesDto()
{
IdWell = 1,
DepthStart = 1,
DepthEnd = 2,
Id = 0,
IdWellSectionType = 1,
DifferentialPressure = 1,
MaxPressure = 2,
Reaming1ROPDown = 3,
Reaming1ROPUp = 4,
SetpointsSlackingOff = 5,
SetpointsTight = 6
};
private readonly ProcessMapPlanOscillationAngles entity = new ProcessMapPlanOscillationAngles()
{
IdWell = 1,
DepthEnd = 10,
DepthStart = 2,
Id = 0,
IdWellSectionType = 1,
IdAuthor = 1,
IdEditor = 1,
Creation = DateTimeOffset.UtcNow,
};
[Fact]
public async Task Get_actual_returns_success()
{
await Get(entity, dto);
}
protected override ProcessMapPlanOscillationAngles GetByNote(DbSet<ProcessMapPlanOscillationAngles> dbSet, ProcessMapPlanOscillationAnglesDto dto)
{
throw new NotImplementedException();
}
protected override ProcessMapPlanOscillationAnglesDto GetByNote(IEnumerable<ProcessMapPlanOscillationAnglesDto> dtos, ProcessMapPlanOscillationAnglesDto dto)
{
throw new NotImplementedException();
}
protected override ProcessMapPlanOscillationAngles? GetByWellId()
{
throw new NotImplementedException();
}
}

28
AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOperationDeterminationOfOscillationAnglesController.cs
View File

@ -1,28 +0,0 @@
using AsbCloudApp.Data.ProcessMaps;
using AsbCloudApp.Repositories;
using AsbCloudApp.Requests;
using AsbCloudApp.Services;
using AsbCloudDb.Model.ProcessMaps;
using AsbCloudInfrastructure.Services.ProcessMapPlan.Export;
using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser;
namespace AsbCloudWebApi.Controllers.ProcessMaps;
/// <summary>
/// РТК план определения углов осцилляции
/// </summary>
public class ProcessMapPlanOperationDeterminationOfOscillationAnglesController :
ProcessMapPlanBaseController<ProcessMapPlanOperationDeterminationOfOscillationAngles, ProcessMapPlanOperationDeterminationOfOscillationAnglesDto>
{
public ProcessMapPlanOperationDeterminationOfOscillationAnglesController(
IChangeLogRepository<ProcessMapPlanOperationDeterminationOfOscillationAnglesDto, ProcessMapPlanBaseRequestWithWell> repository,
IWellService wellService,
ProcessMapPlanOperationDeterminationOfOscillationAnglesParser parserService,
ITelemetryService telemetryService,
ProcessMapPlanOperationDeterminationOfOscillationAnglesExportService processMapPlanExportService)
: base(repository, wellService, parserService, processMapPlanExportService, telemetryService)
{
}
protected override string TemplateFileName => "ЕЦП_шаблон_файла_РТК_план_позиционирование_над_забоем.xlsx";
}

28
AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOscillationAnglesController.cs Normal file
View File

@ -0,0 +1,28 @@
using AsbCloudApp.Data.ProcessMaps;
using AsbCloudApp.Repositories;
using AsbCloudApp.Requests;
using AsbCloudApp.Services;
using AsbCloudDb.Model.ProcessMaps;
using AsbCloudInfrastructure.Services.ProcessMapPlan.Export;
using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser;
namespace AsbCloudWebApi.Controllers.ProcessMaps;
/// <summary>
/// РТК план определения углов осцилляции
/// </summary>
public class ProcessMapPlanOscillationAnglesController :
ProcessMapPlanBaseController<ProcessMapPlanOscillationAngles, ProcessMapPlanOscillationAnglesDto>
{
public ProcessMapPlanOscillationAnglesController(
IChangeLogRepository<ProcessMapPlanOscillationAnglesDto, ProcessMapPlanBaseRequestWithWell> repository,
IWellService wellService,
ProcessMapPlanOscillationAnglesParser parserService,
ITelemetryService telemetryService,
ProcessMapPlanOscillationAnglesExportService processMapPlanExportService)
: base(repository, wellService, parserService, processMapPlanExportService, telemetryService)
{
}
protected override string TemplateFileName => "ЕЦП_шаблон_файла_РТК_план_определение_углов_осцилляции.xlsx";
}