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-30 13:33:32 +05:00
parent 6ab361351f
commit 1093320f9c
12 changed files with 130 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
AsbCloudApp/Data/ProcessMaps/ProcessMapPlanLoadCapacityDto.cs Normal file
View File

@ -0,0 +1,35 @@
using System.ComponentModel.DataAnnotations;
namespace AsbCloudApp.Data.ProcessMaps;
/// <summary>
/// РТК план выработка нагрузки
/// </summary>
public class ProcessMapPlanLoadCapacityDto : ProcessMapPlanBaseDto
{
/// <summary>
/// Время выработки минимальное, сек
/// </summary>
[Range(0.0, 800.0, ErrorMessage = "Время выработки минимальное, сек., должно быть в пределах от 0 до 800")]
public double TimeLoadCapacityMin { get; set; }
/// <summary>
/// Перепад давления минимальный, атм
/// </summary>
[Range(0.1, 400.0, ErrorMessage = "Перепад давления минимальный, атм., должно быть в пределах от 0.1 до 400")]
public double DifferentialPressureMin { get; set; }
/// <summary>
/// Нагрузка минимальная, т
/// </summary>
[Range(0.1, 99.0, ErrorMessage = "Нагрузка минимальная, т, должно быть в пределах от 0.1 до 99")]
public double WeightOnBitMin { get; set; }
/// <summary>
/// Примечание
/// </summary>
[StringLength(1024, ErrorMessage = "Примечание, должно быть не более 1024 символов")]
public string Note { get; set; } = string.Empty;
}

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

@ -1,34 +0,0 @@
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

@ -30,7 +30,7 @@ namespace AsbCloudDb.Model
public virtual DbSet<ProcessMapPlanOscillationAngles> ProcessMapPlanOperationDeterminationOfOscillationAngles => Set<ProcessMapPlanOscillationAngles>();
public virtual DbSet<ProcessMapPlanTFOrientation> ProcessMapPlanOperationTFOrientation => Set<ProcessMapPlanTFOrientation>();
public virtual DbSet<ProcessMapPlanSwitchingOffThePump> ProcessMapPlanOperationSwitchPump => Set<ProcessMapPlanSwitchingOffThePump>();
public virtual DbSet<ProcessMapPlanOperationSwitchingToTheMode> ProcessMapPlanOperationSwitchMode => Set<ProcessMapPlanOperationSwitchingToTheMode>();
public virtual DbSet<ProcessMapPlanSwitchingToTheMode> ProcessMapPlanOperationSwitchMode => Set<ProcessMapPlanSwitchingToTheMode>();
public virtual DbSet<ProcessMapPlanDrillTest> ProcessMapPlanFunctionsDrillTest => Set<ProcessMapPlanDrillTest>();
public virtual DbSet<ProcessMapPlanShockTest> ProcessMapPlanFunctionsShockTest => Set<ProcessMapPlanShockTest>();
public virtual DbSet<ProcessMapPlanDamper> ProcessMapPlanFunctionsDamper => Set<ProcessMapPlanDamper>();
@ -513,7 +513,7 @@ namespace AsbCloudDb.Model
.WithMany()
.OnDelete(DeleteBehavior.Restrict);
modelBuilder.Entity<ProcessMapPlanOperationSwitchingToTheMode>()
modelBuilder.Entity<ProcessMapPlanSwitchingToTheMode>()
.HasOne(p => p.Author)
.WithMany()
.OnDelete(DeleteBehavior.Restrict);
@ -613,7 +613,7 @@ namespace AsbCloudDb.Model
.WithMany()
.OnDelete(DeleteBehavior.Restrict);
modelBuilder.Entity<ProcessMapPlanOperationSwitchingToTheMode>()
modelBuilder.Entity<ProcessMapPlanSwitchingToTheMode>()
.HasOne(p => p.Editor)
.WithMany()
.OnDelete(DeleteBehavior.Restrict);

2
AsbCloudDb/Model/IAsbCloudDbContext.cs
View File

@ -91,7 +91,7 @@ namespace AsbCloudDb.Model
DbSet<ProcessMapPlanOscillationAngles> ProcessMapPlanOperationDeterminationOfOscillationAngles { get; }
DbSet<ProcessMapPlanTFOrientation> ProcessMapPlanOperationTFOrientation { get; }
DbSet<ProcessMapPlanSwitchingOffThePump> ProcessMapPlanOperationSwitchPump { get; }
DbSet<ProcessMapPlanOperationSwitchingToTheMode> ProcessMapPlanOperationSwitchMode { get; }
DbSet<ProcessMapPlanSwitchingToTheMode> ProcessMapPlanOperationSwitchMode { get; }
DbSet<ProcessMapPlanDrillTest> ProcessMapPlanFunctionsDrillTest { get; }
DbSet<ProcessMapPlanShockTest> ProcessMapPlanFunctionsShockTest { get; }
DbSet<ProcessMapPlanDamper> ProcessMapPlanFunctionsDamper { get; }

6
AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOperationSwitchingToTheMode.cs → AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanSwitchingToTheMode.cs
View File

@ -5,8 +5,8 @@ using Microsoft.EntityFrameworkCore;
namespace AsbCloudDb.Model.ProcessMaps;
[Table("t_process_map_plan_operation_switch_mode"), Comment("Выход на плановый расход")]
public class ProcessMapPlanOperationSwitchingToTheMode : ProcessMapPlanBase
[Table("t_process_map_plan_switching_to_the_mode"), Comment("Выход на плановый расход")]
public class ProcessMapPlanSwitchingToTheMode : ProcessMapPlanBase
{
[Column("ramp_time"), Comment("Время выхода буровых насосов на плановый расход, сек.")]
[Range(0.0, 3600.0)]
@ -28,5 +28,5 @@ public class ProcessMapPlanOperationSwitchingToTheMode : ProcessMapPlanBase
public string Note { get; set; } = string.Empty;
[ForeignKey(nameof(IdPrevious))]
public virtual ProcessMapPlanOperationSwitchingToTheMode? Previous { get; set; }
public virtual ProcessMapPlanSwitchingToTheMode? Previous { get; set; }
}

22
AsbCloudInfrastructure/DependencyInjection.cs
View File

@ -202,22 +202,22 @@ namespace AsbCloudInfrastructure
Item = src.Adapt<ProcessMapPlanSwitchingOffThePumpDto>()
});
TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanOperationSwitchingToTheModeDto>>.NewConfig()
.Include<ProcessMapPlanOperationSwitchingToTheMode, ChangeLogDto<ProcessMapPlanOperationSwitchingToTheModeDto>>()
.Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanOperationSwitchingToTheModeDto>()
TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanSwitchingToTheModeDto>>.NewConfig()
.Include<ProcessMapPlanSwitchingToTheMode, ChangeLogDto<ProcessMapPlanSwitchingToTheModeDto>>()
.Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanSwitchingToTheModeDto>()
{
Item = src.Adapt<ProcessMapPlanOperationSwitchingToTheModeDto>()
Item = src.Adapt<ProcessMapPlanSwitchingToTheModeDto>()
});
TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanDrillTestDto>>.NewConfig()
.Include<ProcessMapPlanOperationSwitchingToTheMode, ChangeLogDto<ProcessMapPlanDrillTestDto>>()
.Include<ProcessMapPlanSwitchingToTheMode, ChangeLogDto<ProcessMapPlanDrillTestDto>>()
.Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanDrillTestDto>()
{
Item = src.Adapt<ProcessMapPlanDrillTestDto>()
});
TypeAdapterConfig<ChangeLogAbstract, ChangeLogDto<ProcessMapPlanShockTestDto>>.NewConfig()
.Include<ProcessMapPlanOperationSwitchingToTheMode, ChangeLogDto<ProcessMapPlanShockTestDto>>()
.Include<ProcessMapPlanSwitchingToTheMode, ChangeLogDto<ProcessMapPlanShockTestDto>>()
.Map(dest => dest, src => new ChangeLogDto<ProcessMapPlanShockTestDto>()
{
Item = src.Adapt<ProcessMapPlanShockTestDto>()
@ -437,7 +437,7 @@ namespace AsbCloudInfrastructure
services.AddTransient<ProcessMapPlanOscillationAnglesParser>();
services.AddTransient<ProcessMapPlanTFOrientationParser>();
services.AddTransient<ProcessMapPlanSwitchingOffThePumpParser>();
services.AddTransient<ProcessMapPlanOperationSwitchingToTheModeParser>();
services.AddTransient<ProcessMapPlanSwitchingToTheModeParser>();
services.AddTransient<ProcessMapPlanDrillTestParser>();
services.AddTransient<ProcessMapPlanShockTestParser>();
services.AddTransient<ProcessMapPlanDamperParser>();
@ -463,7 +463,7 @@ namespace AsbCloudInfrastructure
services.AddTransient<ProcessMapPlanOscillationAnglesExportService>();
services.AddTransient<ProcessMapPlanTFOrientationExportService>();
services.AddTransient<ProcessMapPlanSwitchingOffThePumpExportService>();
services.AddTransient<ProcessMapPlanOperationSwitchingToTheModeExportService>();
services.AddTransient<ProcessMapPlanSwitchingToTheModeExportService>();
services.AddTransient<ProcessMapPlanDrillTestExportService>();
services.AddTransient<ProcessMapPlanShockTestExportService>();
services.AddTransient<ProcessMapPlanDamperExportService>();
@ -527,8 +527,8 @@ namespace AsbCloudInfrastructure
ProcessMapPlanBaseRepository<ProcessMapPlanSwitchingOffThePump, ProcessMapPlanSwitchingOffThePumpDto>>();
services.AddTransient<
IChangeLogRepository<ProcessMapPlanOperationSwitchingToTheModeDto, ProcessMapPlanBaseRequestWithWell>,
ProcessMapPlanBaseRepository<ProcessMapPlanOperationSwitchingToTheMode, ProcessMapPlanOperationSwitchingToTheModeDto>>();
IChangeLogRepository<ProcessMapPlanSwitchingToTheModeDto, ProcessMapPlanBaseRequestWithWell>,
ProcessMapPlanBaseRepository<ProcessMapPlanSwitchingToTheMode, ProcessMapPlanSwitchingToTheModeDto>>();
services.AddTransient<
IChangeLogRepository<ProcessMapPlanDrillTestDto, ProcessMapPlanBaseRequestWithWell>,
@ -576,7 +576,7 @@ namespace AsbCloudInfrastructure
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanOscillationAnglesDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanTFOrientationDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanSwitchingOffThePumpDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanOperationSwitchingToTheModeDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanSwitchingToTheModeDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanDrillTestDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanShockTestDto>>();
services.AddTransient<IWellCompositeRepository, WellCompositeRepository<ProcessMapPlanDamperDto>>();

4
AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOperationSwitchingToTheModeTemplate.cs → AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanSwitchingToTheModeTemplate.cs
View File

@ -2,13 +2,13 @@ using System.Collections.Generic;
namespace AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates;
public class ProcessMapPlanOperationSwitchingToTheModeTemplate : ITemplateParameters
public class ProcessMapPlanSwitchingToTheModeTemplate : ITemplateParameters
{
public string SheetName => "Выход на плановый расход";
public int HeaderRowsCount => 2;
public string FileName => "ProcessMapPlanOperationSwitchingToTheModeTemplate.xlsx";
public string FileName => "ProcessMapPlanSwitchingToTheModeTemplate.xlsx";
public IDictionary<string, Cell> Cells => new Dictionary<string, Cell>
{

8
AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOperationSwitchingToTheModeExportService.cs → AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanSwitchingToTheModeExportService.cs
View File

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

8
AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOperationSwitchingToTheModeParser.cs → AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanSwitchingToTheModeParser.cs
View File

@ -9,16 +9,16 @@ using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemp
namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Parser;
public class ProcessMapPlanOperationSwitchingToTheModeParser : ProcessMapPlanParser<ProcessMapPlanOperationSwitchingToTheModeDto>
public class ProcessMapPlanSwitchingToTheModeParser : ProcessMapPlanParser<ProcessMapPlanSwitchingToTheModeDto>
{
public ProcessMapPlanOperationSwitchingToTheModeParser(IWellOperationRepository wellOperationRepository)
public ProcessMapPlanSwitchingToTheModeParser(IWellOperationRepository wellOperationRepository)
: base(wellOperationRepository)
{
}
protected override ITemplateParameters TemplateParameters => new ProcessMapPlanOperationSwitchingToTheModeTemplate();
protected override ITemplateParameters TemplateParameters => new ProcessMapPlanSwitchingToTheModeTemplate();
protected override ProcessMapPlanOperationSwitchingToTheModeDto BuildDto(IDictionary<string, object?> row, int rowNumber)
protected override ProcessMapPlanSwitchingToTheModeDto BuildDto(IDictionary<string, object?> row, int rowNumber)
{
var dto = base.BuildDto(row, rowNumber);

60
AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanSwitchingToTheModeControllerTest.cs Normal file
View File

@ -0,0 +1,60 @@
using AsbCloudApp.Data.ProcessMaps;
using AsbCloudDb.Model.ProcessMaps;
using AsbCloudWebApi.IntegrationTests;
using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan;
using Microsoft.EntityFrameworkCore;
using Xunit;
namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations;
/// <summary>
/// РТК план выход на плановый расход
/// </summary>
public class ProcessMapPlanSwitchingToTheModeControllerTest :
ProcessMapPlanBaseControllerTest<ProcessMapPlanSwitchingToTheMode, ProcessMapPlanSwitchingToTheModeDto>
{
public ProcessMapPlanSwitchingToTheModeControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanOperationSwitchingToTheMode")
{
}
private readonly ProcessMapPlanSwitchingToTheModeDto dto = new ProcessMapPlanSwitchingToTheModeDto()
{
IdWell = 1,
DepthStart = 1,
DepthEnd = 2,
Id = 0,
IdWellSectionType = 1,
};
private readonly ProcessMapPlanSwitchingToTheMode entity = new ProcessMapPlanSwitchingToTheMode()
{
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 ProcessMapPlanSwitchingToTheMode GetByNote(DbSet<ProcessMapPlanSwitchingToTheMode> dbSet, ProcessMapPlanSwitchingToTheModeDto dto)
{
throw new NotImplementedException();
}
protected override ProcessMapPlanSwitchingToTheModeDto GetByNote(IEnumerable<ProcessMapPlanSwitchingToTheModeDto> dtos, ProcessMapPlanSwitchingToTheModeDto dto)
{
throw new NotImplementedException();
}
protected override ProcessMapPlanSwitchingToTheMode? GetByWellId()
{
throw new NotImplementedException();
}
}

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

@ -1,60 +0,0 @@
using AsbCloudApp.Data.ProcessMaps;
using AsbCloudDb.Model.ProcessMaps;
using AsbCloudWebApi.IntegrationTests;
using AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan;
using Microsoft.EntityFrameworkCore;
using Xunit;
namespace AsbCloudWebApi.Controllers.ProcessMaps;
/// <summary>
/// РТК план выход на плановый расход
/// </summary>
public class ProcessMapPlanOperationSwitchingToTheModeControllerTest :
ProcessMapPlanBaseControllerTest<ProcessMapPlanOperationSwitchingToTheMode, ProcessMapPlanOperationSwitchingToTheModeDto>
{
public ProcessMapPlanOperationSwitchingToTheModeControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanOperationSwitchingToTheMode")
{
}
private readonly ProcessMapPlanOperationSwitchingToTheModeDto dto = new ProcessMapPlanOperationSwitchingToTheModeDto()
{
IdWell = 1,
DepthStart = 1,
DepthEnd = 2,
Id = 0,
IdWellSectionType = 1,
};
private readonly ProcessMapPlanOperationSwitchingToTheMode entity = new ProcessMapPlanOperationSwitchingToTheMode()
{
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 ProcessMapPlanOperationSwitchingToTheMode GetByNote(DbSet<ProcessMapPlanOperationSwitchingToTheMode> dbSet, ProcessMapPlanOperationSwitchingToTheModeDto dto)
{
throw new NotImplementedException();
}
protected override ProcessMapPlanOperationSwitchingToTheModeDto GetByNote(IEnumerable<ProcessMapPlanOperationSwitchingToTheModeDto> dtos, ProcessMapPlanOperationSwitchingToTheModeDto dto)
{
throw new NotImplementedException();
}
protected override ProcessMapPlanOperationSwitchingToTheMode? GetByWellId()
{
throw new NotImplementedException();
}
}

14
AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOperationSwitchingToTheModeController.cs → AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanSwitchingToTheModeController.cs
View File

@ -6,20 +6,20 @@ using AsbCloudDb.Model.ProcessMaps;
using AsbCloudInfrastructure.Services.ProcessMapPlan.Export;
using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser;
namespace AsbCloudWebApi.Controllers.ProcessMaps;
namespace AsbCloudWebApi.Controllers.ProcessMaps.Operations;
/// <summary>
/// РТК план выход на плановый расход
/// </summary>
public class ProcessMapPlanOperationSwitchingToTheModeController :
ProcessMapPlanBaseController<ProcessMapPlanOperationSwitchingToTheMode, ProcessMapPlanOperationSwitchingToTheModeDto>
public class ProcessMapPlanSwitchingToTheModeController :
ProcessMapPlanBaseController<ProcessMapPlanSwitchingToTheMode, ProcessMapPlanSwitchingToTheModeDto>
{
public ProcessMapPlanOperationSwitchingToTheModeController(
IChangeLogRepository<ProcessMapPlanOperationSwitchingToTheModeDto, ProcessMapPlanBaseRequestWithWell> repository,
public ProcessMapPlanSwitchingToTheModeController(
IChangeLogRepository<ProcessMapPlanSwitchingToTheModeDto, ProcessMapPlanBaseRequestWithWell> repository,
IWellService wellService,
ProcessMapPlanOperationSwitchingToTheModeParser parserService,
ProcessMapPlanSwitchingToTheModeParser parserService,
ITelemetryService telemetryService,
ProcessMapPlanOperationSwitchingToTheModeExportService processMapPlanExportService)
ProcessMapPlanSwitchingToTheModeExportService processMapPlanExportService)
: base(repository, wellService, parserService, processMapPlanExportService, telemetryService)
{
}