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

Merge branch 'dev' into fix/#23919905-daily-diagram-create-report-from-signalr

Browse Source
This commit is contained in:
Никита Фролов 2023-12-05 12:05:17 +05:00
commit fe1c84467d
3 changed files with 9165 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9083
AsbCloudDb/Migrations/20231205062914_Daily_report_lost_migration.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

35
AsbCloudDb/Migrations/20231205062914_Daily_report_lost_migration.cs Normal file
View File

@ -0,0 +1,35 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace AsbCloudDb.Migrations
{
public partial class Daily_report_lost_migration : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DeleteData(
table: "t_relation_user_role_permission",
keyColumns: new[] { "id_permission", "id_user_role" },
keyValues: new object[] { 529, 1 });
migrationBuilder.DeleteData(
table: "t_permission",
keyColumn: "id",
keyValue: 529);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.InsertData(
table: "t_permission",
columns: new[] { "id", "description", "name" },
values: new object[] { 529, "Разрешение редактировать фактические траектории", "FactTrajectory.edit" });
migrationBuilder.InsertData(
table: "t_relation_user_role_permission",
columns: new[] { "id_permission", "id_user_role" },
values: new object[] { 529, 1 });
}
}
}

65
AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs
View File

@ -19,7 +19,7 @@ namespace AsbCloudDb.Migrations
#pragma warning disable 612, 618
modelBuilder
.UseCollation("Russian_Russia.1251")
.HasAnnotation("ProductVersion", "6.0.22")
.HasAnnotation("ProductVersion", "6.0.7")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.HasPostgresExtension(modelBuilder, "adminpack");
@ -136,21 +136,21 @@ namespace AsbCloudDb.Migrations
{
Id = 1,
Caption = "Недропользователь",
IsContact = false,
IsContact = true,
Order = 3
},
new
{
Id = 2,
Caption = "Буровой подрядчик",
IsContact = false,
IsContact = true,
Order = 2
},
new
{
Id = 3,
Caption = "Сервис автоматизации бурения",
IsContact = false,
IsContact = true,
Order = 0
},
new
@ -178,7 +178,7 @@ namespace AsbCloudDb.Migrations
{
Id = 7,
Caption = "Служба супервайзинга",
IsContact = true,
IsContact = false,
Order = 1
},
new
@ -189,11 +189,18 @@ namespace AsbCloudDb.Migrations
Order = 7
},
new
{
Id = 11,
Caption = "Дизельный сервис",
IsContact = false,
Order = 9
},
new
{
Id = 12,
Caption = "Сервис по обслуживанию верхних силовых приводов",
IsContact = true,
Order = 7
Order = 8
});
});
@ -264,24 +271,46 @@ namespace AsbCloudDb.Migrations
modelBuilder.Entity("AsbCloudDb.Model.DailyReports.DailyReport", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<DateTime>("Date")
.HasColumnType("timestamp with time zone")
.HasColumnName("date")
.HasComment("Дата формирования отчёта");
b.Property<DateTime?>("DateLastUpdate")
.HasColumnType("timestamp with time zone")
.HasColumnName("date_last_update")
.HasComment("Дата последнего обновления");
b.Property<int>("IdWell")
.HasColumnType("integer")
.HasColumnName("id_well")
.HasComment("ID скважины");
b.Property<DateOnly>("StartDate")
.HasColumnType("date")
.HasColumnName("start_date")
.HasComment("Дата отчёта");
b.Property<string>("Info")
.IsRequired()
b.Property<string>("SignBlock")
.HasColumnType("jsonb")
.HasColumnName("info")
.HasComment("Список параметров для отчёта");
.HasColumnName("sign_block")
.HasComment("Подпись");
b.HasKey("IdWell", "StartDate")
.HasName("t_id_well_date_start_pk");
b.Property<string>("SubsystemBlock")
.HasColumnType("jsonb")
.HasColumnName("subsystem_block")
.HasComment("Наработкой подсистем");
b.Property<string>("TimeBalanceBlock")
.HasColumnType("jsonb")
.HasColumnName("time_balance_block")
.HasComment("Баланс времени");
b.HasKey("Id");
b.HasIndex("IdWell", "Date")
.IsUnique();
b.ToTable("t_daily_report");
@ -8066,7 +8095,7 @@ namespace AsbCloudDb.Migrations
b.Navigation("Well");
});
modelBuilder.Entity("AsbCloudDb.Model.DailyReport.DailyReport", b =>
modelBuilder.Entity("AsbCloudDb.Model.DailyReports.DailyReport", b =>
{
b.HasOne("AsbCloudDb.Model.Well", "Well")
.WithMany()