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

Фиксы модели и Dto

Browse Source 
1. Поправлены название полей и комментарии в сущности
2. Поправлены название полей и комментарии в Dto
3. Добавил новые миграции
This commit is contained in:
Степанов Дмитрий Александрович 2023-09-26 10:04:20 +05:00
parent 09e7032c26
commit 4dddb3af28
5 changed files with 8858 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
AsbCloudApp/Data/ProcessMap/ProcessMapWellboreDevelopmentDto.cs
View File

@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
namespace AsbCloudApp.Data.ProcessMap;
/// <summary>
/// Проработка ствола скважины
/// РТК план проработка скважины
/// </summary>
public class ProcessMapWellboreDevelopmentDto : IId, IWellRelated
{
@ -14,19 +14,24 @@ public class ProcessMapWellboreDevelopmentDto : IId, IWellRelated
/// <inheritdoc/>
public int IdWell { get; set; }
/// <summary>
/// Id пользователя
/// </summary>
public int IdUser { get; set; }
/// <summary>
/// Дата последнего изменения
/// </summary>
public DateTimeOffset LastUpdate { get; set; }
/// <summary>
/// Стартовая глубина
/// Стартовая глубина, м
/// </summary>
[Range(0, 99999.9, ErrorMessage = "Значение стартовой глубины должно быть в пределах от 0 до 99999.9")]
public double DepthStart { get; set; }
/// <summary>
/// Окончательная глубина
/// Окончательная глубина, м
/// </summary>
[Range(0, 99999.9, ErrorMessage = "Значение окончательной глубины должно быть в пределах от 0 до 99999.9")]
public double DepthEnd { get; set; }
@ -38,19 +43,19 @@ public class ProcessMapWellboreDevelopmentDto : IId, IWellRelated
public double Repeats { get; set; }
/// <summary>
/// Вращение вверх, об/мин
/// Вращение при движении вверх, об/мин
/// </summary>
[Range(0, 99999.9, ErrorMessage = "Значение количества вращений вверх должно быть в пределах от 0 до 99999.9")]
public double SpinUpward { get; set; }
/// <summary>
/// Вращение вниз, об/мин
/// Вращение при движении вниз, об/мин
/// </summary>
[Range(0, 99999.9, ErrorMessage = "Значение количества вращений вниз должно быть в пределах от 0 до 99999.9")]
public double SpinDownward { get; set; }
/// <summary>
/// Скорость подъема, м/ч
/// Скорость подъёма, м/ч
/// </summary>
[Range(0, 99999.9, ErrorMessage = "Значение скорости подъёма должно быть в пределах от 0 до 99999.9")]
public double SpeedUpward { get; set; }
@ -65,13 +70,13 @@ public class ProcessMapWellboreDevelopmentDto : IId, IWellRelated
/// Уставка зятяжки, т
/// </summary>
[Range(0, 99999.9, ErrorMessage = "Значение затяжек уставки должно быть в пределах от 0 до 99999.9")]
public double SetpointDrags { get; set; }
public double SetpointDrag { get; set; }
/// <summary>
/// Уставка посадки, т
/// </summary>
[Range(0, 99999.9, ErrorMessage = "Значение посадки уставки должно быть в пределах от 0 до 99999.9")]
public double SetpointTights { get; set; }
public double SetpointTight { get; set; }
/// <summary>
/// Давление, атм
@ -80,7 +85,7 @@ public class ProcessMapWellboreDevelopmentDto : IId, IWellRelated
public double Pressure { get; set; }
/// <summary>
/// Момент, кН м
/// Момент, кН*м
/// </summary>
[Range(0, 99999.9, ErrorMessage = "Значение крутящего момента должно быть в пределах от 0 до 99999.9")]
public double Torque { get; set; }

8647
AsbCloudDb/Migrations/20230925132919_Update_ProcessMapWellboreDevelopment.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

158
AsbCloudDb/Migrations/20230925132919_Update_ProcessMapWellboreDevelopment.cs Normal file
View File

@ -0,0 +1,158 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace AsbCloudDb.Migrations
{
public partial class Update_ProcessMapWellboreDevelopment : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "setpoint_tights",
table: "t_process_map_wellbore_development",
newName: "setpoint_tight");
migrationBuilder.RenameColumn(
name: "setpoint_drags",
table: "t_process_map_wellbore_development",
newName: "setpoint_drag");
migrationBuilder.AlterTable(
name: "t_process_map_wellbore_development",
comment: "РТК план проработка скважины",
oldComment: "Проработка скважины");
migrationBuilder.AlterColumn<double>(
name: "torque",
table: "t_process_map_wellbore_development",
type: "double precision",
nullable: false,
comment: "Момент, кН*м",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Момент, кН м");
migrationBuilder.AlterColumn<double>(
name: "pressure",
table: "t_process_map_wellbore_development",
type: "double precision",
nullable: false,
comment: "Давление, атм",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Давление");
migrationBuilder.AlterColumn<double>(
name: "depth_start",
table: "t_process_map_wellbore_development",
type: "double precision",
nullable: false,
comment: "Стартовая глубина, м",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Стартовая глубина");
migrationBuilder.AlterColumn<double>(
name: "depth_end",
table: "t_process_map_wellbore_development",
type: "double precision",
nullable: false,
comment: "Окончательная глубина, м",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Окончательная глубина");
migrationBuilder.AddColumn<int>(
name: "id_user",
table: "t_process_map_wellbore_development",
type: "integer",
nullable: false,
defaultValue: 0,
comment: "Id пользователя");
migrationBuilder.CreateIndex(
name: "IX_t_process_map_wellbore_development_id_user",
table: "t_process_map_wellbore_development",
column: "id_user");
migrationBuilder.AddForeignKey(
name: "FK_t_process_map_wellbore_development_t_user_id_user",
table: "t_process_map_wellbore_development",
column: "id_user",
principalTable: "t_user",
principalColumn: "id",
onDelete: ReferentialAction.Cascade);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_t_process_map_wellbore_development_t_user_id_user",
table: "t_process_map_wellbore_development");
migrationBuilder.DropIndex(
name: "IX_t_process_map_wellbore_development_id_user",
table: "t_process_map_wellbore_development");
migrationBuilder.DropColumn(
name: "id_user",
table: "t_process_map_wellbore_development");
migrationBuilder.RenameColumn(
name: "setpoint_tight",
table: "t_process_map_wellbore_development",
newName: "setpoint_tights");
migrationBuilder.RenameColumn(
name: "setpoint_drag",
table: "t_process_map_wellbore_development",
newName: "setpoint_drags");
migrationBuilder.AlterTable(
name: "t_process_map_wellbore_development",
comment: "Проработка скважины",
oldComment: "РТК план проработка скважины");
migrationBuilder.AlterColumn<double>(
name: "torque",
table: "t_process_map_wellbore_development",
type: "double precision",
nullable: false,
comment: "Момент, кН м",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Момент, кН*м");
migrationBuilder.AlterColumn<double>(
name: "pressure",
table: "t_process_map_wellbore_development",
type: "double precision",
nullable: false,
comment: "Давление",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Давление, атм");
migrationBuilder.AlterColumn<double>(
name: "depth_start",
table: "t_process_map_wellbore_development",
type: "double precision",
nullable: false,
comment: "Стартовая глубина",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Стартовая глубина, м");
migrationBuilder.AlterColumn<double>(
name: "depth_end",
table: "t_process_map_wellbore_development",
type: "double precision",
nullable: false,
comment: "Окончательная глубина",
oldClrType: typeof(double),
oldType: "double precision",
oldComment: "Окончательная глубина, м");
}
}
}

33
AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs
View File

@ -2484,12 +2484,17 @@ namespace AsbCloudDb.Migrations
b.Property<double>("DepthEnd")
.HasColumnType("double precision")
.HasColumnName("depth_end")
.HasComment("Окончательная глубина");
.HasComment("Окончательная глубина, м");
b.Property<double>("DepthStart")
.HasColumnType("double precision")
.HasColumnName("depth_start")
.HasComment("Стартовая глубина");
.HasComment("Стартовая глубина, м");
b.Property<int>("IdUser")
.HasColumnType("integer")
.HasColumnName("id_user")
.HasComment("Id пользователя");
b.Property<int>("IdWell")
.HasColumnType("integer")
@ -2504,21 +2509,21 @@ namespace AsbCloudDb.Migrations
b.Property<double>("Pressure")
.HasColumnType("double precision")
.HasColumnName("pressure")
.HasComment("Давление");
.HasComment("Давление, атм");
b.Property<double>("Repeats")
.HasColumnType("double precision")
.HasColumnName("repeats")
.HasComment("Количество повторений");
b.Property<double>("SetpointDrags")
b.Property<double>("SetpointDrag")
.HasColumnType("double precision")
.HasColumnName("setpoint_drags")
.HasColumnName("setpoint_drag")
.HasComment("Уставка зятяжки, т");
b.Property<double>("SetpointTights")
b.Property<double>("SetpointTight")
.HasColumnType("double precision")
.HasColumnName("setpoint_tights")
.HasColumnName("setpoint_tight")
.HasComment("Уставка посадки, т");
b.Property<double>("SpeedDownward")
@ -2544,15 +2549,17 @@ namespace AsbCloudDb.Migrations
b.Property<double>("Torque")
.HasColumnType("double precision")
.HasColumnName("torque")
.HasComment("Момент, кН м");
.HasComment("Момент, кН*м");
b.HasKey("Id");
b.HasIndex("IdUser");
b.HasIndex("IdWell");
b.ToTable("t_process_map_wellbore_development");
b.HasComment("Проработка скважины");
b.HasComment("РТК план проработка скважины");
});
modelBuilder.Entity("AsbCloudDb.Model.RelationCompanyWell", b =>
@ -8002,12 +8009,20 @@ namespace AsbCloudDb.Migrations
modelBuilder.Entity("AsbCloudDb.Model.ProcessMapWellboreDevelopment", b =>
{
b.HasOne("AsbCloudDb.Model.User", "User")
.WithMany()
.HasForeignKey("IdUser")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("AsbCloudDb.Model.Well", "Well")
.WithMany()
.HasForeignKey("IdWell")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("User");
b.Navigation("Well");
});

24
AsbCloudDb/Model/ProcessMapWellboreDevelopment.cs
View File

@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore;
namespace AsbCloudDb.Model;
[Table("t_process_map_wellbore_development"), Comment("Проработка скважины")]
[Table("t_process_map_wellbore_development"), Comment("РТК план проработка скважины")]
public class ProcessMapWellboreDevelopment : IId, IWellRelated
{
[Key]
@ -15,13 +15,16 @@ public class ProcessMapWellboreDevelopment : IId, IWellRelated
[Column("id_well"), Comment("Id скважины")]
public int IdWell { get; set; }
[Column("id_user"), Comment("Id пользователя")]
public int IdUser { get; set; }
[Column("last_update", TypeName = "timestamp with time zone"), Comment("Дата последнего изменения")]
public DateTimeOffset LastUpdate { get; set; }
[Column("depth_start"), Comment("Стартовая глубина")]
[Column("depth_start"), Comment("Стартовая глубина, м")]
public double DepthStart { get; set; }
[Column("depth_end"), Comment("Окончательная глубина")]
[Column("depth_end"), Comment("Окончательная глубина, м")]
public double DepthEnd { get; set; }
[Column("repeats"), Comment("Количество повторений")]
@ -39,16 +42,16 @@ public class ProcessMapWellboreDevelopment : IId, IWellRelated
[Column("speed_downward"), Comment("Скорость спуска, м/ч")]
public double SpeedDownward { get; set; }
[Column("setpoint_drags"), Comment("Уставка зятяжки, т")]
public double SetpointDrags { get; set; }
[Column("setpoint_drag"), Comment("Уставка зятяжки, т")]
public double SetpointDrag { get; set; }
[Column("setpoint_tights"), Comment("Уставка посадки, т")]
public double SetpointTights { get; set; }
[Column("setpoint_tight"), Comment("Уставка посадки, т")]
public double SetpointTight { get; set; }
[Column("pressure"), Comment("Давление")]
[Column("pressure"), Comment("Давление, атм")]
public double Pressure { get; set; }
[Column("torque"), Comment("Момент, кН м")]
[Column("torque"), Comment("Момент, кН*м")]
public double Torque { get; set; }
[Column("comment"), Comment("Комментарий")]
@ -56,4 +59,7 @@ public class ProcessMapWellboreDevelopment : IId, IWellRelated
[ForeignKey(nameof(IdWell))]
public virtual Well Well { get; set; } = null!;
[ForeignKey(nameof(IdUser))]
public virtual User User { get; set; } = null!;
}