Подход к забою в слайде

This commit is contained in:
Olga Nemt 2024-06-30 20:42:19 +05:00
parent 350052bd16
commit 62b373693a
4 changed files with 27 additions and 16 deletions

View File

@ -41,6 +41,7 @@ namespace AsbCloudDb.Model
public virtual DbSet<ProcessMapPlanAntiCrashRotation> ProcessMapPlanFunctionsAnticrashRotation => Set<ProcessMapPlanAntiCrashRotation>(); public virtual DbSet<ProcessMapPlanAntiCrashRotation> ProcessMapPlanFunctionsAnticrashRotation => Set<ProcessMapPlanAntiCrashRotation>();
public virtual DbSet<ProcessMapPlanStaticMeasurementOutput> ProcessMapPlanFunctionsStaticMeasure => Set<ProcessMapPlanStaticMeasurementOutput>(); public virtual DbSet<ProcessMapPlanStaticMeasurementOutput> ProcessMapPlanFunctionsStaticMeasure => Set<ProcessMapPlanStaticMeasurementOutput>();
public virtual DbSet<ProcessMapPlanRotorLoweringBit> ProcessMapPlanRotorLoweringBit => Set<ProcessMapPlanRotorLoweringBit>(); public virtual DbSet<ProcessMapPlanRotorLoweringBit> ProcessMapPlanRotorLoweringBit => Set<ProcessMapPlanRotorLoweringBit>();
public virtual DbSet<ProcessMapPlanSlideLoweringBit> ProcessMapPlanSlideLoweringBit => Set<ProcessMapPlanSlideLoweringBit>();
public virtual DbSet<DrillingProgramPart> DrillingProgramParts => Set<DrillingProgramPart>(); public virtual DbSet<DrillingProgramPart> DrillingProgramParts => Set<DrillingProgramPart>();
public virtual DbSet<FileCategory> FileCategories => Set<FileCategory>(); public virtual DbSet<FileCategory> FileCategories => Set<FileCategory>();
@ -569,6 +570,11 @@ namespace AsbCloudDb.Model
.WithMany() .WithMany()
.OnDelete(DeleteBehavior.Restrict); .OnDelete(DeleteBehavior.Restrict);
modelBuilder.Entity<ProcessMapPlanSlideLoweringBit>()
.HasOne(p => p.Author)
.WithMany()
.OnDelete(DeleteBehavior.Restrict);
modelBuilder.Entity<ProcessMapPlanRotor>() modelBuilder.Entity<ProcessMapPlanRotor>()
.HasOne(p => p.Editor) .HasOne(p => p.Editor)
.WithMany() .WithMany()
@ -674,6 +680,11 @@ namespace AsbCloudDb.Model
.WithMany() .WithMany()
.OnDelete(DeleteBehavior.Restrict); .OnDelete(DeleteBehavior.Restrict);
modelBuilder.Entity<ProcessMapPlanSlideLoweringBit>()
.HasOne(p => p.Editor)
.WithMany()
.OnDelete(DeleteBehavior.Restrict);
DefaultData.DefaultContextData.Fill(modelBuilder); DefaultData.DefaultContextData.Fill(modelBuilder);
} }

View File

@ -102,6 +102,7 @@ namespace AsbCloudDb.Model
DbSet<ProcessMapPlanAntiCrashRotation> ProcessMapPlanFunctionsAnticrashRotation { get; } DbSet<ProcessMapPlanAntiCrashRotation> ProcessMapPlanFunctionsAnticrashRotation { get; }
DbSet<ProcessMapPlanStaticMeasurementOutput> ProcessMapPlanFunctionsStaticMeasure { get; } DbSet<ProcessMapPlanStaticMeasurementOutput> ProcessMapPlanFunctionsStaticMeasure { get; }
DbSet<ProcessMapPlanRotorLoweringBit> ProcessMapPlanRotorLoweringBit { get; } DbSet<ProcessMapPlanRotorLoweringBit> ProcessMapPlanRotorLoweringBit { get; }
DbSet<ProcessMapPlanSlideLoweringBit> ProcessMapPlanSlideLoweringBit { get; }
Task<int> RefreshMaterializedViewAsync(string mwName, CancellationToken token); Task<int> RefreshMaterializedViewAsync(string mwName, CancellationToken token);
Task<int> RefreshMaterializedViewAsync<TEntity>(CancellationToken token) where TEntity : class; Task<int> RefreshMaterializedViewAsync<TEntity>(CancellationToken token) where TEntity : class;

View File

@ -18,26 +18,11 @@ public class ProcessMapPlanSlideLoweringBit : ProcessMapPlanBase
[Required] [Required]
public double DifferentialPressure { get; set; } public double DifferentialPressure { get; set; }
[Column("slacking_off"), Comment("Посадка, т.")]
[Range(0.0, 20.0)]
[Required]
public double SlackingOff { get; set; }
[Column("torque_max"), Comment("Максимально допустимый момент, кН*м.")]
[Range(0.0, 35.0)]
[Required]
public double TorqueMax { get; set; }
[Column("rop_down"), Comment("Скорость вниз, м/ч.")] [Column("rop_down"), Comment("Скорость вниз, м/ч.")]
[Range(0.0, 999.0)] [Range(0.0, 999.0)]
[Required] [Required]
public double RopDown { get; set; } public double RopDown { get; set; }
[Column("rpm_down"), Comment("Обороты вниз, об/мин.")]
[Range(0.0, 270.0)]
[Required]
public double RpmDown { get; set; }
[Column("flow_rate_down"), Comment("Расход вниз, л/с.")] [Column("flow_rate_down"), Comment("Расход вниз, л/с.")]
[Range(0.0, 100.0)] [Range(0.0, 100.0)]
[Required] [Required]
@ -47,5 +32,5 @@ public class ProcessMapPlanSlideLoweringBit : ProcessMapPlanBase
public string Note { get; set; } = string.Empty; public string Note { get; set; } = string.Empty;
[ForeignKey(nameof(IdPrevious))] [ForeignKey(nameof(IdPrevious))]
public virtual ProcessMapPlanRotorLoweringBit? Previous { get; set; } public virtual ProcessMapPlanSlideLoweringBit? Previous { get; set; }
} }

View File

@ -278,6 +278,13 @@ namespace AsbCloudInfrastructure
{ {
Item = src.Adapt<ProcessMapPlanRotorLoweringBitDto>() Item = src.Adapt<ProcessMapPlanRotorLoweringBitDto>()
}); });
TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanSlideLoweringBitDto>>.NewConfig()
.Include<ProcessMapPlanSlideLoweringBit, ChangeLogDto<ProcessMapPlanSlideLoweringBitDto>>()
.Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanSlideLoweringBitDto>()
{
Item = src.Adapt<ProcessMapPlanSlideLoweringBitDto>()
});
} }
public static IServiceCollection AddInfrastructure(this IServiceCollection services, IConfiguration configuration) public static IServiceCollection AddInfrastructure(this IServiceCollection services, IConfiguration configuration)
@ -455,6 +462,7 @@ namespace AsbCloudInfrastructure
services.AddTransient<ProcessMapPlanAntiCrashRotationParser>(); services.AddTransient<ProcessMapPlanAntiCrashRotationParser>();
services.AddTransient<ProcessMapPlanStaticMeasurementOutputParser>(); services.AddTransient<ProcessMapPlanStaticMeasurementOutputParser>();
services.AddTransient<ProcessMapPlanRotorLoweringBitParser>(); services.AddTransient<ProcessMapPlanRotorLoweringBitParser>();
services.AddTransient<ProcessMapPlanSlideLoweringBitParser>();
services.AddTransient<TrajectoryPlanExportService>(); services.AddTransient<TrajectoryPlanExportService>();
services.AddTransient<TrajectoryFactManualExportService>(); services.AddTransient<TrajectoryFactManualExportService>();
@ -482,6 +490,7 @@ namespace AsbCloudInfrastructure
services.AddTransient<ProcessMapPlanAntiCrashRotationExportService>(); services.AddTransient<ProcessMapPlanAntiCrashRotationExportService>();
services.AddTransient<ProcessMapPlanStaticMeasurementOutputExportService>(); services.AddTransient<ProcessMapPlanStaticMeasurementOutputExportService>();
services.AddTransient<ProcessMapPlanRotorLoweringBitExportService>(); services.AddTransient<ProcessMapPlanRotorLoweringBitExportService>();
services.AddTransient<ProcessMapPlanSlideLoweringBitExportService>();
services.AddTransient<WellOperationParserFactory>(); services.AddTransient<WellOperationParserFactory>();
services.AddTransient<WellOperationExportServiceFactory>(); services.AddTransient<WellOperationExportServiceFactory>();
@ -579,6 +588,10 @@ namespace AsbCloudInfrastructure
IChangeLogRepository<ProcessMapPlanRotorLoweringBitDto, ProcessMapPlanBaseRequestWithWell>, IChangeLogRepository<ProcessMapPlanRotorLoweringBitDto, ProcessMapPlanBaseRequestWithWell>,
ProcessMapPlanBaseRepository<ProcessMapPlanRotorLoweringBit, ProcessMapPlanRotorLoweringBitDto>>(); ProcessMapPlanBaseRepository<ProcessMapPlanRotorLoweringBit, ProcessMapPlanRotorLoweringBitDto>>();
services.AddTransient<
IChangeLogRepository<ProcessMapPlanSlideLoweringBitDto, ProcessMapPlanBaseRequestWithWell>,
ProcessMapPlanBaseRepository<ProcessMapPlanSlideLoweringBit, ProcessMapPlanSlideLoweringBitDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanRotorDto>>(); services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanRotorDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanSlideDto>>(); services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanSlideDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanReamingRotorDto>>(); services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanReamingRotorDto>>();
@ -600,6 +613,7 @@ namespace AsbCloudInfrastructure
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanAntiCrashRotationDto>>(); services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanAntiCrashRotationDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanStaticMeasurementOutputDto>>(); services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanStaticMeasurementOutputDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanRotorLoweringBitDto>>(); services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanRotorLoweringBitDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanSlideLoweringBitDto>>();
return services; return services;
} }