diff --git a/AsbCloudDb/Migrations/20250109123425_TelemetryDataWellWorkover.Designer.cs b/AsbCloudDb/Migrations/20250113122319_TelemetryDataWellWorkover.Designer.cs
similarity index 99%
rename from AsbCloudDb/Migrations/20250109123425_TelemetryDataWellWorkover.Designer.cs
rename to AsbCloudDb/Migrations/20250113122319_TelemetryDataWellWorkover.Designer.cs
index 3eb5007c..304f0570 100644
--- a/AsbCloudDb/Migrations/20250109123425_TelemetryDataWellWorkover.Designer.cs
+++ b/AsbCloudDb/Migrations/20250113122319_TelemetryDataWellWorkover.Designer.cs
@@ -13,7 +13,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
namespace AsbCloudDb.Migrations
{
[DbContext(typeof(AsbCloudDbContext))]
- [Migration("20250109123425_TelemetryDataWellWorkover")]
+ [Migration("20250113122319_TelemetryDataWellWorkover")]
partial class TelemetryDataWellWorkover
{
///
@@ -7377,17 +7377,17 @@ namespace AsbCloudDb.Migrations
b.Property("BitDepth")
.HasColumnType("real")
- .HasColumnName("tool_depth")
+ .HasColumnName("bit_depth")
.HasComment("Глубина инструмента, м ");
b.Property("BlockPosition")
.HasColumnType("real")
- .HasColumnName("hook_block_depth")
+ .HasColumnName("block_position")
.HasComment("Высота крюкоблока, м");
b.Property("FlowRate")
.HasColumnType("real")
- .HasColumnName("liquid_rate")
+ .HasColumnName("flow_rate")
.HasComment("Расход доливаемой жидкости, м3/ч");
b.Property("GasIndicationsCH4")
@@ -7402,7 +7402,7 @@ namespace AsbCloudDb.Migrations
b.Property("HookLoad")
.HasColumnType("real")
- .HasColumnName("hook_weight")
+ .HasColumnName("hook_load")
.HasComment("Вес на крюке");
b.Property("IdUser")
@@ -7412,22 +7412,22 @@ namespace AsbCloudDb.Migrations
b.Property("MudDensity")
.HasColumnType("real")
- .HasColumnName("liquid_density")
+ .HasColumnName("mud_density")
.HasComment("Плотность жидкости в ДЕ, г/см3");
b.Property("MudTemperatureInBlowOutPreventor")
.HasColumnType("real")
- .HasColumnName("liquid_branch_brace_temperature")
+ .HasColumnName("mud_temperature_in_blow_out_preventor")
.HasComment("Температура жидкости в отводе крестовины ПВО, С");
b.Property("TripInOutSpeed")
.HasColumnType("real")
- .HasColumnName("up_and_down_operations_speed")
+ .HasColumnName("trip_in_out_speed")
.HasComment("Скорость СПО, м/с");
b.Property("TripTankVolume")
.HasColumnType("real")
- .HasColumnName("slagging_tank_volume")
+ .HasColumnName("trip_tank_volume")
.HasComment("Объем доливной емкости (ДЕ), м3");
b.Property("WellLevel")
diff --git a/AsbCloudDb/Migrations/20250109123425_TelemetryDataWellWorkover.cs b/AsbCloudDb/Migrations/20250113122319_TelemetryDataWellWorkover.cs
similarity index 63%
rename from AsbCloudDb/Migrations/20250109123425_TelemetryDataWellWorkover.cs
rename to AsbCloudDb/Migrations/20250113122319_TelemetryDataWellWorkover.cs
index 138115f2..6ae723eb 100644
--- a/AsbCloudDb/Migrations/20250109123425_TelemetryDataWellWorkover.cs
+++ b/AsbCloudDb/Migrations/20250113122319_TelemetryDataWellWorkover.cs
@@ -18,15 +18,15 @@ namespace AsbCloudDb.Migrations
id_telemetry = table.Column(type: "integer", nullable: false),
date = table.Column(type: "timestamp with time zone", nullable: false, comment: "'2021-10-19 18:23:54+05'"),
id_user = table.Column(type: "integer", nullable: true, comment: "Пользователь ТКРС"),
- tool_depth = table.Column(type: "real", nullable: false, comment: "Глубина инструмента, м "),
- hook_block_depth = table.Column(type: "real", nullable: false, comment: "Высота крюкоблока, м"),
- hook_weight = table.Column(type: "real", nullable: false, comment: "Вес на крюке"),
- up_and_down_operations_speed = table.Column(type: "real", nullable: false, comment: "Скорость СПО, м/с"),
- slagging_tank_volume = table.Column(type: "real", nullable: false, comment: "Объем доливной емкости (ДЕ), м3"),
- liquid_density = table.Column(type: "real", nullable: false, comment: "Плотность жидкости в ДЕ, г/см3"),
- liquid_rate = table.Column(type: "real", nullable: false, comment: "Расход доливаемой жидкости, м3/ч"),
+ bit_depth = table.Column(type: "real", nullable: false, comment: "Глубина инструмента, м "),
+ block_position = table.Column(type: "real", nullable: false, comment: "Высота крюкоблока, м"),
+ hook_load = table.Column(type: "real", nullable: false, comment: "Вес на крюке"),
+ trip_in_out_speed = table.Column(type: "real", nullable: false, comment: "Скорость СПО, м/с"),
+ trip_tank_volume = table.Column(type: "real", nullable: false, comment: "Объем доливной емкости (ДЕ), м3"),
+ mud_density = table.Column(type: "real", nullable: false, comment: "Плотность жидкости в ДЕ, г/см3"),
+ flow_rate = table.Column(type: "real", nullable: false, comment: "Расход доливаемой жидкости, м3/ч"),
well_level = table.Column(type: "real", nullable: false, comment: "Уровень в скважине (по эхолоту), м"),
- liquid_branch_brace_temperature = table.Column(type: "real", nullable: false, comment: "Температура жидкости в отводе крестовины ПВО, С"),
+ mud_temperature_in_blow_out_preventor = table.Column(type: "real", nullable: false, comment: "Температура жидкости в отводе крестовины ПВО, С"),
gas_indications_CH4 = table.Column(type: "real", nullable: false, comment: "Газопоказания (СН4), %"),
gas_indications_H2S = table.Column(type: "real", nullable: false, comment: "Газопоказания (Н2S), %")
},
diff --git a/AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs b/AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs
index ec04e8d7..788c0e33 100644
--- a/AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs
+++ b/AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs
@@ -7374,17 +7374,17 @@ namespace AsbCloudDb.Migrations
b.Property("BitDepth")
.HasColumnType("real")
- .HasColumnName("tool_depth")
+ .HasColumnName("bit_depth")
.HasComment("Глубина инструмента, м ");
b.Property("BlockPosition")
.HasColumnType("real")
- .HasColumnName("hook_block_depth")
+ .HasColumnName("block_position")
.HasComment("Высота крюкоблока, м");
b.Property("FlowRate")
.HasColumnType("real")
- .HasColumnName("liquid_rate")
+ .HasColumnName("flow_rate")
.HasComment("Расход доливаемой жидкости, м3/ч");
b.Property("GasIndicationsCH4")
@@ -7399,7 +7399,7 @@ namespace AsbCloudDb.Migrations
b.Property("HookLoad")
.HasColumnType("real")
- .HasColumnName("hook_weight")
+ .HasColumnName("hook_load")
.HasComment("Вес на крюке");
b.Property("IdUser")
@@ -7409,22 +7409,22 @@ namespace AsbCloudDb.Migrations
b.Property("MudDensity")
.HasColumnType("real")
- .HasColumnName("liquid_density")
+ .HasColumnName("mud_density")
.HasComment("Плотность жидкости в ДЕ, г/см3");
b.Property("MudTemperatureInBlowOutPreventor")
.HasColumnType("real")
- .HasColumnName("liquid_branch_brace_temperature")
+ .HasColumnName("mud_temperature_in_blow_out_preventor")
.HasComment("Температура жидкости в отводе крестовины ПВО, С");
b.Property("TripInOutSpeed")
.HasColumnType("real")
- .HasColumnName("up_and_down_operations_speed")
+ .HasColumnName("trip_in_out_speed")
.HasComment("Скорость СПО, м/с");
b.Property("TripTankVolume")
.HasColumnType("real")
- .HasColumnName("slagging_tank_volume")
+ .HasColumnName("trip_tank_volume")
.HasComment("Объем доливной емкости (ДЕ), м3");
b.Property("WellLevel")
diff --git a/AsbCloudDb/Model/TelemetryDataWellWorkover.cs b/AsbCloudDb/Model/TelemetryDataWellWorkover.cs
index 822703b0..4771b250 100644
--- a/AsbCloudDb/Model/TelemetryDataWellWorkover.cs
+++ b/AsbCloudDb/Model/TelemetryDataWellWorkover.cs
@@ -17,31 +17,31 @@ namespace AsbCloudDb.Model
[Column("date", TypeName = "timestamp with time zone"), Comment("'2021-10-19 18:23:54+05'")]
public DateTimeOffset DateTime { get; set; }
- [Column("tool_depth"), Comment("Глубина инструмента, м ")]
+ [Column("bit_depth"), Comment("Глубина инструмента, м ")]
public float BitDepth { get; set; }
- [Column("hook_block_depth"), Comment("Высота крюкоблока, м")]
+ [Column("block_position"), Comment("Высота крюкоблока, м")]
public float BlockPosition { get; set; }
- [Column("hook_weight"), Comment("Вес на крюке")]
+ [Column("hook_load"), Comment("Вес на крюке")]
public float HookLoad { get; set; }
- [Column("up_and_down_operations_speed"), Comment("Скорость СПО, м/с")]
+ [Column("trip_in_out_speed"), Comment("Скорость СПО, м/с")]
public float TripInOutSpeed { get; set; }
- [Column("slagging_tank_volume"), Comment("Объем доливной емкости (ДЕ), м3")]
+ [Column("trip_tank_volume"), Comment("Объем доливной емкости (ДЕ), м3")]
public float TripTankVolume { get; set; }
- [Column("liquid_density"), Comment("Плотность жидкости в ДЕ, г/см3")]
+ [Column("mud_density"), Comment("Плотность жидкости в ДЕ, г/см3")]
public float MudDensity { get; set; }
- [Column("liquid_rate"), Comment("Расход доливаемой жидкости, м3/ч")]
+ [Column("flow_rate"), Comment("Расход доливаемой жидкости, м3/ч")]
public float FlowRate { get; set; }
[Column("well_level"), Comment("Уровень в скважине (по эхолоту), м")]
public float WellLevel { get; set; }
- [Column("liquid_branch_brace_temperature"), Comment("Температура жидкости в отводе крестовины ПВО, С")]
+ [Column("mud_temperature_in_blow_out_preventor"), Comment("Температура жидкости в отводе крестовины ПВО, С")]
public float MudTemperatureInBlowOutPreventor { get; set; }
[Column("gas_indications_CH4"), Comment("Газопоказания (СН4), %")]
diff --git a/AsbCloudWebApi/appsettings.json b/AsbCloudWebApi/appsettings.json
index 72d50f57..747e0304 100644
--- a/AsbCloudWebApi/appsettings.json
+++ b/AsbCloudWebApi/appsettings.json
@@ -7,10 +7,10 @@
}
},
"ConnectionStrings": {
- "DefaultConnection": "Host=localhost;Database=postgres;Username=postgres;Password=q;Persist Security Info=True",
- "DebugConnection": "Host=localhost;Database=postgres;Username=postgres;Password=q;Persist Security Info=True;Include Error Detail=True",
- "TestConnection": "Host=localhost;Database=test;Username=postgres;Password=q;Persist Security Info=True;Include Error Detail=True",
- "LocalConnection": "Host=localhost;Database=postgres;Username=postgres;Password=q;Persist Security Info=True"
+ "DefaultConnection": "Host=localhost;Database=tkrs;Username=postgres;Password=q;Persist Security Info=True",
+ "DebugConnection": "Host=localhost;Database=tkrs;Username=postgres;Password=q;Persist Security Info=True;Include Error Detail=True",
+ "TestConnection": "Host=localhost;Database=tkrs;Username=postgres;Password=q;Persist Security Info=True;Include Error Detail=True",
+ "LocalConnection": "Host=localhost;Database=tkrs;Username=postgres;Password=q;Persist Security Info=True"
},
"AllowedHosts": "*",
"ContentPath": "../data",