Автоудержание TF

This commit is contained in:
Olga Nemt 2024-06-29 21:32:53 +05:00
parent 04fd517ab1
commit da475cc320
10 changed files with 46 additions and 46 deletions

View File

@ -3,9 +3,9 @@
namespace AsbCloudApp.Data.ProcessMaps; namespace AsbCloudApp.Data.ProcessMaps;
/// <summary> /// <summary>
/// РТК план автоудержание /// РТК план автоудержание TF
/// </summary> /// </summary>
public class ProcessMapPlanFunctionsAutoHoldDto : ProcessMapPlanBaseDto public class ProcessMapPlanAutoHoldTFDto : ProcessMapPlanBaseDto
{ {
/// <summary> /// <summary>
/// Зенитный угол, градусы /// Зенитный угол, градусы

View File

@ -34,7 +34,7 @@ namespace AsbCloudDb.Model
public virtual DbSet<ProcessMapPlanFunctionsDrillTest> ProcessMapPlanFunctionsDrillTest => Set<ProcessMapPlanFunctionsDrillTest>(); public virtual DbSet<ProcessMapPlanFunctionsDrillTest> ProcessMapPlanFunctionsDrillTest => Set<ProcessMapPlanFunctionsDrillTest>();
public virtual DbSet<ProcessMapPlanFunctionsShockTest> ProcessMapPlanFunctionsShockTest => Set<ProcessMapPlanFunctionsShockTest>(); public virtual DbSet<ProcessMapPlanFunctionsShockTest> ProcessMapPlanFunctionsShockTest => Set<ProcessMapPlanFunctionsShockTest>();
public virtual DbSet<ProcessMapPlanFunctionsDamper> ProcessMapPlanFunctionsDamper => Set<ProcessMapPlanFunctionsDamper>(); public virtual DbSet<ProcessMapPlanFunctionsDamper> ProcessMapPlanFunctionsDamper => Set<ProcessMapPlanFunctionsDamper>();
public virtual DbSet<ProcessMapPlanFunctionsAutoHold> ProcessMapPlanFunctionsAutoHold => Set<ProcessMapPlanFunctionsAutoHold>(); public virtual DbSet<ProcessMapPlanAutoHoldTF> ProcessMapPlanFunctionsAutoHold => Set<ProcessMapPlanAutoHoldTF>();
public virtual DbSet<ProcessMapPlanFunctionsJarrDrillTool> ProcessMapPlanFunctionsJarrDrillTool => Set<ProcessMapPlanFunctionsJarrDrillTool>(); public virtual DbSet<ProcessMapPlanFunctionsJarrDrillTool> ProcessMapPlanFunctionsJarrDrillTool => Set<ProcessMapPlanFunctionsJarrDrillTool>();
public virtual DbSet<ProcessMapPlanUpdatingNoloadParameters> ProcessMapPlanFunctionsUpgradeNoload => Set<ProcessMapPlanUpdatingNoloadParameters>(); public virtual DbSet<ProcessMapPlanUpdatingNoloadParameters> ProcessMapPlanFunctionsUpgradeNoload => Set<ProcessMapPlanUpdatingNoloadParameters>();
public virtual DbSet<ProcessMapPlanOscillation> ProcessMapPlanFunctionsOscillation => Set<ProcessMapPlanOscillation>(); public virtual DbSet<ProcessMapPlanOscillation> ProcessMapPlanFunctionsOscillation => Set<ProcessMapPlanOscillation>();
@ -533,7 +533,7 @@ namespace AsbCloudDb.Model
.WithMany() .WithMany()
.OnDelete(DeleteBehavior.Restrict); .OnDelete(DeleteBehavior.Restrict);
modelBuilder.Entity<ProcessMapPlanFunctionsAutoHold>() modelBuilder.Entity<ProcessMapPlanAutoHoldTF>()
.HasOne(p => p.Author) .HasOne(p => p.Author)
.WithMany() .WithMany()
.OnDelete(DeleteBehavior.Restrict); .OnDelete(DeleteBehavior.Restrict);
@ -633,7 +633,7 @@ namespace AsbCloudDb.Model
.WithMany() .WithMany()
.OnDelete(DeleteBehavior.Restrict); .OnDelete(DeleteBehavior.Restrict);
modelBuilder.Entity<ProcessMapPlanFunctionsAutoHold>() modelBuilder.Entity<ProcessMapPlanAutoHoldTF>()
.HasOne(p => p.Editor) .HasOne(p => p.Editor)
.WithMany() .WithMany()
.OnDelete(DeleteBehavior.Restrict); .OnDelete(DeleteBehavior.Restrict);

View File

@ -95,7 +95,7 @@ namespace AsbCloudDb.Model
DbSet<ProcessMapPlanFunctionsDrillTest> ProcessMapPlanFunctionsDrillTest { get; } DbSet<ProcessMapPlanFunctionsDrillTest> ProcessMapPlanFunctionsDrillTest { get; }
DbSet<ProcessMapPlanFunctionsShockTest> ProcessMapPlanFunctionsShockTest { get; } DbSet<ProcessMapPlanFunctionsShockTest> ProcessMapPlanFunctionsShockTest { get; }
DbSet<ProcessMapPlanFunctionsDamper> ProcessMapPlanFunctionsDamper { get; } DbSet<ProcessMapPlanFunctionsDamper> ProcessMapPlanFunctionsDamper { get; }
DbSet<ProcessMapPlanFunctionsAutoHold> ProcessMapPlanFunctionsAutoHold { get; } DbSet<ProcessMapPlanAutoHoldTF> ProcessMapPlanFunctionsAutoHold { get; }
DbSet<ProcessMapPlanFunctionsJarrDrillTool> ProcessMapPlanFunctionsJarrDrillTool { get; } DbSet<ProcessMapPlanFunctionsJarrDrillTool> ProcessMapPlanFunctionsJarrDrillTool { get; }
DbSet<ProcessMapPlanUpdatingNoloadParameters> ProcessMapPlanFunctionsUpgradeNoload { get; } DbSet<ProcessMapPlanUpdatingNoloadParameters> ProcessMapPlanFunctionsUpgradeNoload { get; }
DbSet<ProcessMapPlanOscillation> ProcessMapPlanFunctionsOscillation { get; } DbSet<ProcessMapPlanOscillation> ProcessMapPlanFunctionsOscillation { get; }

View File

@ -5,8 +5,8 @@ using Microsoft.EntityFrameworkCore;
namespace AsbCloudDb.Model.ProcessMaps; namespace AsbCloudDb.Model.ProcessMaps;
[Table("t_process_map_plan_functions_autohold"), Comment("Автоудержание")] [Table("t_process_map_plan_auto_hold_tf"), Comment("Автоудержание TF")]
public class ProcessMapPlanFunctionsAutoHold : ProcessMapPlanBase public class ProcessMapPlanAutoHoldTF : ProcessMapPlanBase
{ {
[Column("zenit_angle"), Comment("Зенитный угол, градусы")] [Column("zenit_angle"), Comment("Зенитный угол, градусы")]
[Range(0.0, 100.0)] [Range(0.0, 100.0)]
@ -17,5 +17,5 @@ public class ProcessMapPlanFunctionsAutoHold : ProcessMapPlanBase
public string Note { get; set; } = string.Empty; public string Note { get; set; } = string.Empty;
[ForeignKey(nameof(IdPrevious))] [ForeignKey(nameof(IdPrevious))]
public virtual ProcessMapPlanFunctionsAutoHold? Previous { get; set; } public virtual ProcessMapPlanAutoHoldTF? Previous { get; set; }
} }

View File

@ -230,11 +230,11 @@ namespace AsbCloudInfrastructure
Item = src.Adapt<ProcessMapPlanFunctionsDamperDto>() Item = src.Adapt<ProcessMapPlanFunctionsDamperDto>()
}); });
TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanFunctionsAutoHoldDto>>.NewConfig() TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanAutoHoldTFDto>>.NewConfig()
.Include<ProcessMapPlanFunctionsAutoHold, ChangeLogDto<ProcessMapPlanFunctionsAutoHoldDto>>() .Include<ProcessMapPlanAutoHoldTF, ChangeLogDto<ProcessMapPlanAutoHoldTFDto>>()
.Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanFunctionsAutoHoldDto>() .Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanAutoHoldTFDto>()
{ {
Item = src.Adapt<ProcessMapPlanFunctionsAutoHoldDto>() Item = src.Adapt<ProcessMapPlanAutoHoldTFDto>()
}); });
TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanFunctionsJarrDrillToolDto>>.NewConfig() TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanFunctionsJarrDrillToolDto>>.NewConfig()
@ -441,7 +441,7 @@ namespace AsbCloudInfrastructure
services.AddTransient<ProcessMapPlanFunctionsDrillTestParser>(); services.AddTransient<ProcessMapPlanFunctionsDrillTestParser>();
services.AddTransient<ProcessMapPlanFunctionsShockTestParser>(); services.AddTransient<ProcessMapPlanFunctionsShockTestParser>();
services.AddTransient<ProcessMapPlanFunctionsDamperParser>(); services.AddTransient<ProcessMapPlanFunctionsDamperParser>();
services.AddTransient<ProcessMapPlanFunctionsAutoHoldParser>(); services.AddTransient<ProcessMapPlanAutoHoldTFParser>();
services.AddTransient<ProcessMapPlanFunctionsJarrDrillToolParser>(); services.AddTransient<ProcessMapPlanFunctionsJarrDrillToolParser>();
services.AddTransient<ProcessMapPlanUpdatingNoloadParametersParser>(); services.AddTransient<ProcessMapPlanUpdatingNoloadParametersParser>();
services.AddTransient<ProcessMapPlanOscillationParser>(); services.AddTransient<ProcessMapPlanOscillationParser>();
@ -467,7 +467,7 @@ namespace AsbCloudInfrastructure
services.AddTransient<ProcessMapPlanFunctionsDrillTestExportService>(); services.AddTransient<ProcessMapPlanFunctionsDrillTestExportService>();
services.AddTransient<ProcessMapPlanFunctionsShockTestExportService>(); services.AddTransient<ProcessMapPlanFunctionsShockTestExportService>();
services.AddTransient<ProcessMapPlanFunctionsDamperExportService>(); services.AddTransient<ProcessMapPlanFunctionsDamperExportService>();
services.AddTransient<ProcessMapPlanFunctionsAutoHoldExportService>(); services.AddTransient<ProcessMapPlanAutoHoldTFExportService>();
services.AddTransient<ProcessMapPlanFunctionsJarrDrillToolExportService>(); services.AddTransient<ProcessMapPlanFunctionsJarrDrillToolExportService>();
services.AddTransient<ProcessMapPlanUpdatingNoloadParametersExportService>(); services.AddTransient<ProcessMapPlanUpdatingNoloadParametersExportService>();
services.AddTransient<ProcessMapPlanOscillationExportService>(); services.AddTransient<ProcessMapPlanOscillationExportService>();
@ -543,8 +543,8 @@ namespace AsbCloudInfrastructure
ProcessMapPlanBaseRepository<ProcessMapPlanFunctionsDamper, ProcessMapPlanFunctionsDamperDto>>(); ProcessMapPlanBaseRepository<ProcessMapPlanFunctionsDamper, ProcessMapPlanFunctionsDamperDto>>();
services.AddTransient< services.AddTransient<
IChangeLogRepository<ProcessMapPlanFunctionsAutoHoldDto, ProcessMapPlanBaseRequestWithWell>, IChangeLogRepository<ProcessMapPlanAutoHoldTFDto, ProcessMapPlanBaseRequestWithWell>,
ProcessMapPlanBaseRepository<ProcessMapPlanFunctionsAutoHold, ProcessMapPlanFunctionsAutoHoldDto>>(); ProcessMapPlanBaseRepository<ProcessMapPlanAutoHoldTF, ProcessMapPlanAutoHoldTFDto>>();
services.AddTransient< services.AddTransient<
IChangeLogRepository<ProcessMapPlanFunctionsJarrDrillToolDto, ProcessMapPlanBaseRequestWithWell>, IChangeLogRepository<ProcessMapPlanFunctionsJarrDrillToolDto, ProcessMapPlanBaseRequestWithWell>,
@ -580,7 +580,7 @@ namespace AsbCloudInfrastructure
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanFunctionsDrillTestDto>>(); services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanFunctionsDrillTestDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanFunctionsShockTestDto>>(); services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanFunctionsShockTestDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanFunctionsDamperDto>>(); services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanFunctionsDamperDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanFunctionsAutoHoldDto>>(); services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanAutoHoldTFDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanFunctionsJarrDrillToolDto>>(); services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanFunctionsJarrDrillToolDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanUpdatingNoloadParametersDto>>(); services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanUpdatingNoloadParametersDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanOscillationDto>>(); services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanOscillationDto>>();

View File

@ -2,13 +2,13 @@ using System.Collections.Generic;
namespace AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; namespace AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates;
public class ProcessMapPlanFunctionsAutoHoldTemplate : ITemplateParameters public class ProcessMapPlanAutoHoldTFTemplate : ITemplateParameters
{ {
public string SheetName => "Автоудержание"; public string SheetName => "Автоудержание TF";
public int HeaderRowsCount => 2; public int HeaderRowsCount => 2;
public string FileName => "ProcessMapPlanFunctionsAutoHoldTemplate.xlsx"; public string FileName => "ProcessMapPlanAutoHoldTFTemplate.xlsx";
public IDictionary<string, Cell> Cells => new Dictionary<string, Cell> public IDictionary<string, Cell> Cells => new Dictionary<string, Cell>
{ {

View File

@ -10,21 +10,21 @@ using System.Threading.Tasks;
namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Export; namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Export;
public class ProcessMapPlanFunctionsAutoHoldExportService : ProcessMapPlanExportService<ProcessMapPlanFunctionsAutoHoldDto> public class ProcessMapPlanAutoHoldTFExportService : ProcessMapPlanExportService<ProcessMapPlanAutoHoldTFDto>
{ {
public ProcessMapPlanFunctionsAutoHoldExportService( public ProcessMapPlanAutoHoldTFExportService(
IChangeLogRepository<ProcessMapPlanFunctionsAutoHoldDto, ProcessMapPlanBaseRequestWithWell> processMapPlanRepository, IChangeLogRepository<ProcessMapPlanAutoHoldTFDto, ProcessMapPlanBaseRequestWithWell> processMapPlanRepository,
IWellService wellService) IWellService wellService)
: base(processMapPlanRepository, wellService) : base(processMapPlanRepository, wellService)
{ {
} }
protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanFunctionsAutoHoldTemplate(); protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanAutoHoldTFTemplate();
protected override async Task<string> BuildFileNameAsync(WellRelatedExportRequest options, CancellationToken token) protected override async Task<string> BuildFileNameAsync(WellRelatedExportRequest options, CancellationToken token)
{ {
var caption = await wellService.GetWellCaptionByIdAsync(options.IdWell, token); var caption = await wellService.GetWellCaptionByIdAsync(options.IdWell, token);
return $"{caption}_РТК_План_автоудержание.xlsx"; return $"{caption}_РТК_План_автоудержание_tf.xlsx";
} }
} }

View File

@ -9,16 +9,16 @@ using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemp
namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Parser;
public class ProcessMapPlanFunctionsAutoHoldParser : ProcessMapPlanParser<ProcessMapPlanFunctionsAutoHoldDto> public class ProcessMapPlanAutoHoldTFParser : ProcessMapPlanParser<ProcessMapPlanAutoHoldTFDto>
{ {
public ProcessMapPlanFunctionsAutoHoldParser(IWellOperationRepository wellOperationRepository) public ProcessMapPlanAutoHoldTFParser(IWellOperationRepository wellOperationRepository)
: base(wellOperationRepository) : base(wellOperationRepository)
{ {
} }
protected override ITemplateParameters TemplateParameters => new ProcessMapPlanFunctionsAutoHoldTemplate(); protected override ITemplateParameters TemplateParameters => new ProcessMapPlanAutoHoldTFTemplate();
protected override ProcessMapPlanFunctionsAutoHoldDto BuildDto(IDictionary<string, object?> row, int rowNumber) protected override ProcessMapPlanAutoHoldTFDto BuildDto(IDictionary<string, object?> row, int rowNumber)
{ {
var dto = base.BuildDto(row, rowNumber); var dto = base.BuildDto(row, rowNumber);

View File

@ -15,13 +15,13 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps;
/// <summary> /// <summary>
/// РТК план автоудержание /// РТК план автоудержание
/// </summary> /// </summary>
public class ProcessMapPlanFunctionsAutoHoldControllerTest : public class ProcessMapPlanAutoHoldTFControllerTest :
ProcessMapPlanBaseControllerTest<ProcessMapPlanFunctionsAutoHold, ProcessMapPlanFunctionsAutoHoldDto> ProcessMapPlanBaseControllerTest<ProcessMapPlanAutoHoldTF, ProcessMapPlanAutoHoldTFDto>
{ {
public ProcessMapPlanFunctionsAutoHoldControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanFunctionsAutoHold") public ProcessMapPlanAutoHoldTFControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanFunctionsAutoHold")
{ {
} }
private readonly ProcessMapPlanFunctionsAutoHoldDto dto = new ProcessMapPlanFunctionsAutoHoldDto() private readonly ProcessMapPlanAutoHoldTFDto dto = new ProcessMapPlanAutoHoldTFDto()
{ {
IdWell = 1, IdWell = 1,
DepthStart = 1, DepthStart = 1,
@ -32,7 +32,7 @@ public class ProcessMapPlanFunctionsAutoHoldControllerTest :
ZenithAngle = 2, ZenithAngle = 2,
}; };
private readonly ProcessMapPlanFunctionsAutoHold entity = new ProcessMapPlanFunctionsAutoHold() private readonly ProcessMapPlanAutoHoldTF entity = new ProcessMapPlanAutoHoldTF()
{ {
IdWell = 1, IdWell = 1,
DepthEnd = 10, DepthEnd = 10,
@ -52,17 +52,17 @@ public class ProcessMapPlanFunctionsAutoHoldControllerTest :
await Get(entity, dto); await Get(entity, dto);
} }
protected override ProcessMapPlanFunctionsAutoHold GetByNote(DbSet<ProcessMapPlanFunctionsAutoHold> dbSet, ProcessMapPlanFunctionsAutoHoldDto dto) protected override ProcessMapPlanAutoHoldTF GetByNote(DbSet<ProcessMapPlanAutoHoldTF> dbSet, ProcessMapPlanAutoHoldTFDto dto)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
protected override ProcessMapPlanFunctionsAutoHoldDto GetByNote(IEnumerable<ProcessMapPlanFunctionsAutoHoldDto> dtos, ProcessMapPlanFunctionsAutoHoldDto dto) protected override ProcessMapPlanAutoHoldTFDto GetByNote(IEnumerable<ProcessMapPlanAutoHoldTFDto> dtos, ProcessMapPlanAutoHoldTFDto dto)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
protected override ProcessMapPlanFunctionsAutoHold? GetByWellId() protected override ProcessMapPlanAutoHoldTF? GetByWellId()
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }

View File

@ -9,20 +9,20 @@ using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser;
namespace AsbCloudWebApi.Controllers.ProcessMaps; namespace AsbCloudWebApi.Controllers.ProcessMaps;
/// <summary> /// <summary>
/// РТК план автоудержание /// РТК план автоудержание TF
/// </summary> /// </summary>
public class ProcessMapPlanFunctionsAutoHoldController : public class ProcessMapPlanAutoHoldTFController :
ProcessMapPlanBaseController<ProcessMapPlanFunctionsAutoHold, ProcessMapPlanFunctionsAutoHoldDto> ProcessMapPlanBaseController<ProcessMapPlanAutoHoldTF, ProcessMapPlanAutoHoldTFDto>
{ {
public ProcessMapPlanFunctionsAutoHoldController( public ProcessMapPlanAutoHoldTFController(
IChangeLogRepository<ProcessMapPlanFunctionsAutoHoldDto, ProcessMapPlanBaseRequestWithWell> repository, IChangeLogRepository<ProcessMapPlanAutoHoldTFDto, ProcessMapPlanBaseRequestWithWell> repository,
IWellService wellService, IWellService wellService,
ProcessMapPlanFunctionsAutoHoldParser parserService, ProcessMapPlanAutoHoldTFParser parserService,
ITelemetryService telemetryService, ITelemetryService telemetryService,
ProcessMapPlanFunctionsAutoHoldExportService processMapPlanExportService) ProcessMapPlanAutoHoldTFExportService processMapPlanExportService)
: base(repository, wellService, parserService, processMapPlanExportService, telemetryService) : base(repository, wellService, parserService, processMapPlanExportService, telemetryService)
{ {
} }
protected override string TemplateFileName => "ЕЦП_шаблон_файла_РТК_план_автоудержание.xlsx"; protected override string TemplateFileName => "ЕЦП_шаблон_файла_РТК_план_автоудержание_tf.xlsx";
} }