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

DrillTest

Browse Source
This commit is contained in:
Olga Nemt 2024-06-29 21:50:28 +05:00
parent 35698ca909
commit e501a24875
12 changed files with 93 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
AsbCloudApp/Data/ProcessMaps/ProcessMapPlanFunctionsDrillTestDto.cs
View File

@ -1,51 +0,0 @@
using System.ComponentModel.DataAnnotations;
namespace AsbCloudApp.Data.ProcessMaps;
/// <summary>
/// РТК план дрилтест
/// </summary>
public class ProcessMapPlanFunctionsDrillTestDto : ProcessMapPlanBaseDto
{
/// <summary>
/// Нагрузка минимальная, т
/// </summary>
[Range(1.0, 30.0, ErrorMessage = "Нагрузка минимальная, т., должно быть в пределах от 1 до 30")]
public double WeightOnBitMin { get; set; }
/// <summary>
/// Количество шагов по нагрузке
/// </summary>
[Range(1, 5, ErrorMessage = "Количество шагов по нагрузке, должно быть в пределах от 1 до 5")]
public int NumberOfStepsBit { get; set; }
/// <summary>
/// Минимальные обороты на ВСП, об/мин.
/// </summary>
[Range(5, 200, ErrorMessage = "Минимальные обороты на ВСП, об/мин., должно быть в пределах от 5 до 200")]
public int RevolutionPerMinuteMin { get; set; }
/// <summary>
/// Количество шагов оборотов на ВСП, шт.
/// </summary>
[Range(1, 5, ErrorMessage = "Количество шагов оборотов на ВСП, шт., должно быть в пределах от 1 до 5")]
public int NumberOfStepsRPM { get; set; }
/// <summary>
/// Величина проходки шага, м.
/// </summary>
[Range(0.1, 2.0, ErrorMessage = "Величина проходки шага, м., должно быть в пределах от 0.1 до 2")]
public double LengthStep { get; set; }
/// <summary>
/// Автозапуск или предупреждение
/// </summary>
[Required]
public bool IdAutostartOrWarning { get; set; }
/// <summary>
/// Примечание
/// </summary>
[StringLength(1024, ErrorMessage = "Примечание, должно быть не более 1024 символа")]
public string Note { get; set; } = string.Empty;
}

15
AsbCloudApp/Data/ProcessMaps/ProcessMapPlanStaticMeasurementOutputDto.cs Normal file
View File

@ -0,0 +1,15 @@
using System.ComponentModel.DataAnnotations;
namespace AsbCloudApp.Data.ProcessMaps;
/// <summary>
/// РТК план выход статического замера
/// </summary>
public class ProcessMapPlanStaticMeasurementOutputDto : ProcessMapPlanBaseDto
{
/// <summary>
/// Время ожидания выхода сигнала с ТМС, сек.
/// </summary>
[Range(0.0, 1800.0, ErrorMessage = "Время ожидания выхода сигнала с ТМС, сек., должно быть в пределах от 0 до 1800")]
public double SignalWaitingTime { get; set; }
}

6
AsbCloudDb/Model/AsbCloudDbContext.cs
View File

@ -31,7 +31,7 @@ namespace AsbCloudDb.Model
public virtual DbSet<ProcessMapPlanOperationTFOrientation> ProcessMapPlanOperationTFOrientation => Set<ProcessMapPlanOperationTFOrientation>();
public virtual DbSet<ProcessMapPlanOperationSwitchPump> ProcessMapPlanOperationSwitchPump => Set<ProcessMapPlanOperationSwitchPump>();
public virtual DbSet<ProcessMapPlanOperationSwitchingToTheMode> ProcessMapPlanOperationSwitchMode => Set<ProcessMapPlanOperationSwitchingToTheMode>();
public virtual DbSet<ProcessMapPlanFunctionsDrillTest> ProcessMapPlanFunctionsDrillTest => Set<ProcessMapPlanFunctionsDrillTest>();
public virtual DbSet<ProcessMapPlanDrillTest> ProcessMapPlanFunctionsDrillTest => Set<ProcessMapPlanDrillTest>();
public virtual DbSet<ProcessMapPlanFunctionsShockTest> ProcessMapPlanFunctionsShockTest => Set<ProcessMapPlanFunctionsShockTest>();
public virtual DbSet<ProcessMapPlanFunctionsDamper> ProcessMapPlanFunctionsDamper => Set<ProcessMapPlanFunctionsDamper>();
public virtual DbSet<ProcessMapPlanAutoHoldTF> ProcessMapPlanFunctionsAutoHold => Set<ProcessMapPlanAutoHoldTF>();
@ -518,7 +518,7 @@ namespace AsbCloudDb.Model
.WithMany()
.OnDelete(DeleteBehavior.Restrict);
modelBuilder.Entity<ProcessMapPlanFunctionsDrillTest>()
modelBuilder.Entity<ProcessMapPlanDrillTest>()
.HasOne(p => p.Author)
.WithMany()
.OnDelete(DeleteBehavior.Restrict);
@ -618,7 +618,7 @@ namespace AsbCloudDb.Model
.WithMany()
.OnDelete(DeleteBehavior.Restrict);
modelBuilder.Entity<ProcessMapPlanFunctionsDrillTest>()
modelBuilder.Entity<ProcessMapPlanDrillTest>()
.HasOne(p => p.Editor)
.WithMany()
.OnDelete(DeleteBehavior.Restrict);

2
AsbCloudDb/Model/IAsbCloudDbContext.cs
View File

@ -92,7 +92,7 @@ namespace AsbCloudDb.Model
DbSet<ProcessMapPlanOperationTFOrientation> ProcessMapPlanOperationTFOrientation { get; }
DbSet<ProcessMapPlanOperationSwitchPump> ProcessMapPlanOperationSwitchPump { get; }
DbSet<ProcessMapPlanOperationSwitchingToTheMode> ProcessMapPlanOperationSwitchMode { get; }
DbSet<ProcessMapPlanFunctionsDrillTest> ProcessMapPlanFunctionsDrillTest { get; }
DbSet<ProcessMapPlanDrillTest> ProcessMapPlanFunctionsDrillTest { get; }
DbSet<ProcessMapPlanFunctionsShockTest> ProcessMapPlanFunctionsShockTest { get; }
DbSet<ProcessMapPlanFunctionsDamper> ProcessMapPlanFunctionsDamper { get; }
DbSet<ProcessMapPlanAutoHoldTF> ProcessMapPlanFunctionsAutoHold { get; }

41
AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanDrillTest.cs Normal file
View File

@ -0,0 +1,41 @@
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_drilltest"), Comment("DrillTest")]
public class ProcessMapPlanDrillTest : ProcessMapPlanBase
{
[Column("weight_on_bit_min"), Comment("Нагрузка минимальная, т")]
[Range(1.0, 30.0)]
[Required]
public double WeightOnBitMin { get; set; }
[Column("weight_on_bit_steps_count"), Comment("Количество шагов по нагрузке")]
[Range(1, 5)]
[Required]
public int WeightOnBitStepsCount { get; set; }
[Column("rpm_min"), Comment("Минимальные обороты на ВСП, об/мин.")]
[Range(5, 200)]
[Required]
public double RpmMin { get; set; }
[Column("rpm_steps_count"), Comment("Количество шагов оборотов на ВСП, об/мин.")]
[Range(1, 5)]
[Required]
public int RpmStepsCount { get; set; }
[Column("length_step"), Comment("Величина проходки шага, м.")]
[Range(0.1, 2.0)]
[Required]
public double LengthStep { get; set; }
[Column("note"), Comment("Примечание"), StringLength(1024)]
public string Note { get; set; } = string.Empty;
[ForeignKey(nameof(IdPrevious))]
public virtual ProcessMapPlanDrillTest? Previous { get; set; }
}

45
AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanFunctionsDrillTest.cs
View File

@ -1,45 +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_functions_drilltest"), Comment("Дрилтест")]
public class ProcessMapPlanFunctionsDrillTest : ProcessMapPlanBase
{
[Column("weight_on_bit_min"), Comment("Нагрузка минимальная, т")]
[Range(1.0, 30.0)]
[Required]
public double WeightOnBitMin { get; set; }
[Column("number_of_steps_bit"), Comment("Количество шагов по нагрузке")]
[Range(1, 5)]
[Required]
public int NumberOfStepsBit { get; set; }
[Column("revolution_per_minute_min"), Comment("Минимальные обороты на ВСП, об/мин.")]
[Range(5, 200)]
[Required]
public int RevolutionPerMinuteMin { get; set; }
[Column("number_of_steps_rpm"), Comment("Количество шагов оборотов на ВСП, шт.")]
[Range(1, 5)]
[Required]
public int NumberOfStepsRPM { get; set; }
[Column("length_step"), Comment("Величина проходки шага, м.")]
[Range(0.1, 2.0)]
[Required]
public double LengthStep { get; set; }
[Column("id_autostart_or_warning"), Comment("Автозапуск или Предупреждение")]
[Required]
public bool IdAutostartOrWarning { get; set; }
[Column("note"), Comment("Примечание"), StringLength(1024)]
public string Note { get; set; } = string.Empty;
[ForeignKey(nameof(IdPrevious))]
public virtual ProcessMapPlanFunctionsDrillTest? Previous { get; set; }
}

18
AsbCloudInfrastructure/DependencyInjection.cs
View File

@ -209,11 +209,11 @@ namespace AsbCloudInfrastructure
Item = src.Adapt<ProcessMapPlanOperationSwitchingToTheModeDto>()
});
TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanFunctionsDrillTestDto>>.NewConfig()
.Include<ProcessMapPlanOperationSwitchingToTheMode, ChangeLogDto<ProcessMapPlanFunctionsDrillTestDto>>()
.Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanFunctionsDrillTestDto>()
TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanDrillTestDto>>.NewConfig()
.Include<ProcessMapPlanOperationSwitchingToTheMode, ChangeLogDto<ProcessMapPlanDrillTestDto>>()
.Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanDrillTestDto>()
{
Item = src.Adapt<ProcessMapPlanFunctionsDrillTestDto>()
Item = src.Adapt<ProcessMapPlanDrillTestDto>()
});
TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanFunctionsShockTestDto>>.NewConfig()
@ -438,7 +438,7 @@ namespace AsbCloudInfrastructure
services.AddTransient<ProcessMapPlanOperationTFOrientationParser>();
services.AddTransient<ProcessMapPlanOperationSwitchPumpParser>();
services.AddTransient<ProcessMapPlanOperationSwitchingToTheModeParser>();
services.AddTransient<ProcessMapPlanFunctionsDrillTestParser>();
services.AddTransient<ProcessMapPlanDrillTestParser>();
services.AddTransient<ProcessMapPlanFunctionsShockTestParser>();
services.AddTransient<ProcessMapPlanFunctionsDamperParser>();
services.AddTransient<ProcessMapPlanAutoHoldTFParser>();
@ -464,7 +464,7 @@ namespace AsbCloudInfrastructure
services.AddTransient<ProcessMapPlanOperationTFOrientationExportService>();
services.AddTransient<ProcessMapPlanOperationSwitchPumpExportService>();
services.AddTransient<ProcessMapPlanOperationSwitchingToTheModeExportService>();
services.AddTransient<ProcessMapPlanFunctionsDrillTestExportService>();
services.AddTransient<ProcessMapPlanDrillTestExportService>();
services.AddTransient<ProcessMapPlanFunctionsShockTestExportService>();
services.AddTransient<ProcessMapPlanFunctionsDamperExportService>();
services.AddTransient<ProcessMapPlanAutoHoldTFExportService>();
@ -531,8 +531,8 @@ namespace AsbCloudInfrastructure
ProcessMapPlanBaseRepository<ProcessMapPlanOperationSwitchingToTheMode, ProcessMapPlanOperationSwitchingToTheModeDto>>();
services.AddTransient<
IChangeLogRepository<ProcessMapPlanFunctionsDrillTestDto, ProcessMapPlanBaseRequestWithWell>,
ProcessMapPlanBaseRepository<ProcessMapPlanFunctionsDrillTest, ProcessMapPlanFunctionsDrillTestDto>>();
IChangeLogRepository<ProcessMapPlanDrillTestDto, ProcessMapPlanBaseRequestWithWell>,
ProcessMapPlanBaseRepository<ProcessMapPlanDrillTest, ProcessMapPlanDrillTestDto>>();
services.AddTransient<
IChangeLogRepository<ProcessMapPlanFunctionsShockTestDto, ProcessMapPlanBaseRequestWithWell>,
@ -577,7 +577,7 @@ namespace AsbCloudInfrastructure
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanOperationTFOrientationDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanOperationSwitchPumpDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanOperationSwitchingToTheModeDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanFunctionsDrillTestDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanDrillTestDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanFunctionsShockTestDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanFunctionsDamperDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanAutoHoldTFDto>>();

4
AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanFunctionsDrillTestTemplate.cs → AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanDrillTestTemplate.cs
View File

@ -2,13 +2,13 @@ using System.Collections.Generic;
namespace AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates;
public class ProcessMapPlanFunctionsDrillTestTemplate : ITemplateParameters
public class ProcessMapPlanDrillTestTemplate : ITemplateParameters
{
public string SheetName => "Дрилтест";
public int HeaderRowsCount => 2;
public string FileName => "ProcessMapPlanFunctionsDrillTestTemplate.xlsx";
public string FileName => "ProcessMapPlanDrillTestTemplate.xlsx";
public IDictionary<string, Cell> Cells => new Dictionary<string, Cell>
{

8
AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanFunctionsDrillTestExportService.cs → AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanDrillTestExportService.cs
View File

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

8
AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanFunctionsDrillTestParser.cs → AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanDrillTestParser.cs
View File

@ -9,16 +9,16 @@ using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemp
namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Parser;
public class ProcessMapPlanFunctionsDrillTestParser : ProcessMapPlanParser<ProcessMapPlanFunctionsDrillTestDto>
public class ProcessMapPlanDrillTestParser : ProcessMapPlanParser<ProcessMapPlanDrillTestDto>
{
public ProcessMapPlanFunctionsDrillTestParser(IWellOperationRepository wellOperationRepository)
public ProcessMapPlanDrillTestParser(IWellOperationRepository wellOperationRepository)
: base(wellOperationRepository)
{
}
protected override ITemplateParameters TemplateParameters => new ProcessMapPlanFunctionsDrillTestTemplate();
protected override ITemplateParameters TemplateParameters => new ProcessMapPlanDrillTestTemplate();
protected override ProcessMapPlanFunctionsDrillTestDto BuildDto(IDictionary<string, object?> row, int rowNumber)
protected override ProcessMapPlanDrillTestDto BuildDto(IDictionary<string, object?> row, int rowNumber)
{
var dto = base.BuildDto(row, rowNumber);

24
AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanFunctionsDrillTestControllerTest.cs → AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanDrillTestControllerTest.cs
View File

@ -15,29 +15,25 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps;
/// <summary>
/// РТК план дрилтест
/// </summary>
public class ProcessMapPlanFunctionsDrillTestControllerTest :
ProcessMapPlanBaseControllerTest<ProcessMapPlanFunctionsDrillTest, ProcessMapPlanFunctionsDrillTestDto>
public class ProcessMapPlanDrillTestControllerTest :
ProcessMapPlanBaseControllerTest<ProcessMapPlanDrillTest, ProcessMapPlanDrillTestDto>
{
public ProcessMapPlanFunctionsDrillTestControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanFunctionsDrillTest")
public ProcessMapPlanDrillTestControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanFunctionsDrillTest")
{
}
private readonly ProcessMapPlanFunctionsDrillTestDto dto = new ProcessMapPlanFunctionsDrillTestDto()
private readonly ProcessMapPlanDrillTestDto dto = new ProcessMapPlanDrillTestDto()
{
IdWell = 1,
DepthStart = 1,
DepthEnd = 2,
Id = 0,
IdWellSectionType = 1,
IdAutostartOrWarning = true,
LengthStep = 1,
Note = "1",
NumberOfStepsBit = 1,
NumberOfStepsRPM = 1,
RevolutionPerMinuteMin = 1,
WeightOnBitMin = 1
};
private readonly ProcessMapPlanFunctionsDrillTest entity = new ProcessMapPlanFunctionsDrillTest()
private readonly ProcessMapPlanDrillTest entity = new ProcessMapPlanDrillTest()
{
IdWell = 1,
DepthEnd = 10,
@ -47,12 +43,8 @@ public class ProcessMapPlanFunctionsDrillTestControllerTest :
IdAuthor = 1,
IdEditor = 1,
Creation = DateTimeOffset.UtcNow,
IdAutostartOrWarning = true,
LengthStep = 1,
Note = "1",
NumberOfStepsBit = 1,
NumberOfStepsRPM = 1,
RevolutionPerMinuteMin = 1,
WeightOnBitMin = 1
};
@ -62,17 +54,17 @@ public class ProcessMapPlanFunctionsDrillTestControllerTest :
await Get(entity, dto);
}
protected override ProcessMapPlanFunctionsDrillTest GetByNote(DbSet<ProcessMapPlanFunctionsDrillTest> dbSet, ProcessMapPlanFunctionsDrillTestDto dto)
protected override ProcessMapPlanDrillTest GetByNote(DbSet<ProcessMapPlanDrillTest> dbSet, ProcessMapPlanDrillTestDto dto)
{
throw new NotImplementedException();
}
protected override ProcessMapPlanFunctionsDrillTestDto GetByNote(IEnumerable<ProcessMapPlanFunctionsDrillTestDto> dtos, ProcessMapPlanFunctionsDrillTestDto dto)
protected override ProcessMapPlanDrillTestDto GetByNote(IEnumerable<ProcessMapPlanDrillTestDto> dtos, ProcessMapPlanDrillTestDto dto)
{
throw new NotImplementedException();
}
protected override ProcessMapPlanFunctionsDrillTest? GetByWellId()
protected override ProcessMapPlanDrillTest? GetByWellId()
{
throw new NotImplementedException();
}

12
AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanFunctionsDrillTestController.cs → AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanDrillTestController.cs
View File

@ -11,15 +11,15 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps;
/// <summary>
/// РТК план дрилтест
/// </summary>
public class ProcessMapPlanFunctionsDrillTestController :
ProcessMapPlanBaseController<ProcessMapPlanFunctionsDrillTest, ProcessMapPlanFunctionsDrillTestDto>
public class ProcessMapPlanDrillTestController :
ProcessMapPlanBaseController<ProcessMapPlanDrillTest, ProcessMapPlanDrillTestDto>
{
public ProcessMapPlanFunctionsDrillTestController(
IChangeLogRepository<ProcessMapPlanFunctionsDrillTestDto, ProcessMapPlanBaseRequestWithWell> repository,
public ProcessMapPlanDrillTestController(
IChangeLogRepository<ProcessMapPlanDrillTestDto, ProcessMapPlanBaseRequestWithWell> repository,
IWellService wellService,
ProcessMapPlanFunctionsDrillTestParser parserService,
ProcessMapPlanDrillTestParser parserService,
ITelemetryService telemetryService,
ProcessMapPlanFunctionsDrillTestExportService processMapPlanExportService)
ProcessMapPlanDrillTestExportService processMapPlanExportService)
: base(repository, wellService, parserService, processMapPlanExportService, telemetryService)
{
}