feat(api,dal): исключения расписаний ЕСПП привязаны к JobGroup, удалены константы из настроек. Кол-во шаблонов в Job считается только used. В JobFieldFilter добавлено поле IsInverse.

This commit is contained in:
Mikhail Trubnikov
2025-12-26 11:21:45 +10:00
parent eb57f4b3cd
commit 61c46770e0
29 changed files with 8901 additions and 46 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,211 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
#pragma warning disable CA1814 // Prefer jagged arrays over multidimensional
namespace PARR.DAL.Migrations
{
/// <inheritdoc />
public partial class tblScheduleExludes : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DeleteData(
table: "Settings",
keyColumn: "Name",
keyValue: "ScheduleExcludeCalendar");
migrationBuilder.DeleteData(
table: "Settings",
keyColumn: "Name",
keyValue: "ScheduleExcludeType");
migrationBuilder.EnsureSchema(
name: "schedule");
migrationBuilder.AddColumn<Guid>(
name: "ScheduleExcludeTypeCalendarId",
schema: "job",
table: "Groups",
type: "uuid",
nullable: true);
migrationBuilder.AddColumn<Guid>(
name: "ScheduleExcludeTypeId",
schema: "job",
table: "Groups",
type: "uuid",
nullable: false,
defaultValue: new Guid("0595B8E0-F322-4661-B5E3-064AF8FBE7CD"));
migrationBuilder.AddColumn<bool>(
name: "IsInverse",
schema: "job",
table: "FieldFilters",
type: "boolean",
nullable: false,
defaultValue: false);
migrationBuilder.CreateTable(
name: "ExcludeTypeCalendars",
schema: "schedule",
columns: table => new
{
Id = table.Column<Guid>(type: "uuid", nullable: false),
DateCreated = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false),
Title = table.Column<string>(type: "text", nullable: false),
EsppName = table.Column<string>(type: "text", nullable: false),
EsppValue = table.Column<string>(type: "text", nullable: false),
Code = table.Column<string>(type: "text", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_ExcludeTypeCalendars", x => x.Id);
},
comment: "Расписание регламентной работы, исключение - Календарь");
migrationBuilder.CreateTable(
name: "ExcludeTypes",
schema: "schedule",
columns: table => new
{
Id = table.Column<Guid>(type: "uuid", nullable: false),
DateCreated = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false),
Title = table.Column<string>(type: "text", nullable: false),
EsppName = table.Column<string>(type: "text", nullable: false),
EsppValue = table.Column<string>(type: "text", nullable: false),
Code = table.Column<string>(type: "text", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_ExcludeTypes", x => x.Id);
},
comment: "Расписание регламентной работы - Тип исключения");
migrationBuilder.InsertData(
schema: "schedule",
table: "ExcludeTypeCalendars",
columns: new[] { "Id", "Code", "DateCreated", "EsppName", "EsppValue", "Title" },
values: new object[,]
{
{ new Guid("6834f1d5-ac51-43d5-974e-4c759d7bbf9f"), "24x7", new DateTimeOffset(new DateTime(2023, 5, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 0, 0, 0, 0)), "24x7", "24x7", "24x7" },
{ new Guid("a26edb88-0267-4fbf-b7ec-d172b0a86c9c"), "24x5", new DateTimeOffset(new DateTime(2023, 5, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 0, 0, 0, 0)), "24x5", "24x5", "24x5" }
});
migrationBuilder.InsertData(
schema: "schedule",
table: "ExcludeTypes",
columns: new[] { "Id", "Code", "DateCreated", "EsppName", "EsppValue", "Title" },
values: new object[,]
{
{ new Guid("0595b8e0-f322-4661-b5e3-064af8fbe7cd"), "None", new DateTimeOffset(new DateTime(2023, 5, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 0, 0, 0, 0)), "Нет исключений", "NONE", "Нет исключений" },
{ new Guid("2b7a4356-9aaf-4e00-b444-42f0b5010e25"), "Only", new DateTimeOffset(new DateTime(2023, 5, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 0, 0, 0, 0)), "Выполнить ТОЛЬКО В указанном календаре", "ONLY", "Выполнить ТОЛЬКО В указанном календаре" },
{ new Guid("38cd9e64-27c1-4672-a805-2211952a48bd"), "Except", new DateTimeOffset(new DateTime(2023, 5, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 0, 0, 0, 0)), "Выполнить везде, КРОМЕ указанного календаря", "EXCEPT", "Выполнить везде, КРОМЕ указанного календаря" }
});
migrationBuilder.UpdateData(
table: "Settings",
keyColumn: "Name",
keyValue: "EsppUnitTag",
column: "Value",
value: АРР_");
migrationBuilder.CreateIndex(
name: "IX_Groups_ScheduleExcludeTypeCalendarId",
schema: "job",
table: "Groups",
column: "ScheduleExcludeTypeCalendarId");
migrationBuilder.CreateIndex(
name: "IX_Groups_ScheduleExcludeTypeId",
schema: "job",
table: "Groups",
column: "ScheduleExcludeTypeId");
migrationBuilder.AddForeignKey(
name: "FK_Groups_ExcludeTypeCalendars_ScheduleExcludeTypeCalendarId",
schema: "job",
table: "Groups",
column: "ScheduleExcludeTypeCalendarId",
principalSchema: "schedule",
principalTable: "ExcludeTypeCalendars",
principalColumn: "Id");
migrationBuilder.AddForeignKey(
name: "FK_Groups_ExcludeTypes_ScheduleExcludeTypeId",
schema: "job",
table: "Groups",
column: "ScheduleExcludeTypeId",
principalSchema: "schedule",
principalTable: "ExcludeTypes",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_Groups_ExcludeTypeCalendars_ScheduleExcludeTypeCalendarId",
schema: "job",
table: "Groups");
migrationBuilder.DropForeignKey(
name: "FK_Groups_ExcludeTypes_ScheduleExcludeTypeId",
schema: "job",
table: "Groups");
migrationBuilder.DropTable(
name: "ExcludeTypeCalendars",
schema: "schedule");
migrationBuilder.DropTable(
name: "ExcludeTypes",
schema: "schedule");
migrationBuilder.DropIndex(
name: "IX_Groups_ScheduleExcludeTypeCalendarId",
schema: "job",
table: "Groups");
migrationBuilder.DropIndex(
name: "IX_Groups_ScheduleExcludeTypeId",
schema: "job",
table: "Groups");
migrationBuilder.DropColumn(
name: "ScheduleExcludeTypeCalendarId",
schema: "job",
table: "Groups");
migrationBuilder.DropColumn(
name: "ScheduleExcludeTypeId",
schema: "job",
table: "Groups");
migrationBuilder.DropColumn(
name: "IsInverse",
schema: "job",
table: "FieldFilters");
migrationBuilder.UpdateData(
table: "Settings",
keyColumn: "Name",
keyValue: "EsppUnitTag",
column: "Value",
value: "ПАРР-");
migrationBuilder.InsertData(
table: "Settings",
columns: new[] { "Name", "Description", "Value" },
values: new object[,]
{
{ "ScheduleExcludeCalendar", "Расписание регламентной работы - Календарь", "8x5 (8.00-17.00)" },
{ "ScheduleExcludeType", "Расписание регламентной работы - Тип исключения", "Выполнить ТОЛЬКО В указанном календаре" }
});
}
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,68 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace PARR.DAL.Migrations
{
/// <inheritdoc />
public partial class tblsEsppSchchangeScheme : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameTable(
name: "EsppSchValues",
newName: "EsppSchValues",
newSchema: "schedule");
migrationBuilder.RenameTable(
name: "EsppSchTypeValues",
newName: "EsppSchTypeValues",
newSchema: "schedule");
migrationBuilder.RenameTable(
name: "EsppSchTypeSchedules",
newName: "EsppSchTypeSchedules",
newSchema: "schedule");
migrationBuilder.RenameTable(
name: "EsppSchTypes",
newName: "EsppSchTypes",
newSchema: "schedule");
migrationBuilder.RenameTable(
name: "EsppSchTypeConfigs",
newName: "EsppSchTypeConfigs",
newSchema: "schedule");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameTable(
name: "EsppSchValues",
schema: "schedule",
newName: "EsppSchValues");
migrationBuilder.RenameTable(
name: "EsppSchTypeValues",
schema: "schedule",
newName: "EsppSchTypeValues");
migrationBuilder.RenameTable(
name: "EsppSchTypeSchedules",
schema: "schedule",
newName: "EsppSchTypeSchedules");
migrationBuilder.RenameTable(
name: "EsppSchTypes",
schema: "schedule",
newName: "EsppSchTypes");
migrationBuilder.RenameTable(
name: "EsppSchTypeConfigs",
schema: "schedule",
newName: "EsppSchTypeConfigs");
}
}
}

View File

@@ -446,7 +446,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Id");
b.ToTable("EsppSchTypes");
b.ToTable("EsppSchTypes", "schedule");
b.HasData(
new
@@ -515,7 +515,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("TypeScheduleId", "TypeId")
.IsUnique();
b.ToTable("EsppSchTypeConfigs");
b.ToTable("EsppSchTypeConfigs", "schedule");
b.HasData(
new
@@ -618,7 +618,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Id");
b.ToTable("EsppSchTypeSchedules");
b.ToTable("EsppSchTypeSchedules", "schedule");
b.HasData(
new
@@ -691,7 +691,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("TypeId");
b.ToTable("EsppSchTypeValues");
b.ToTable("EsppSchTypeValues", "schedule");
b.HasData(
new
@@ -1492,7 +1492,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("TypeValueId");
b.ToTable("EsppSchValues");
b.ToTable("EsppSchValues", "schedule");
});
modelBuilder.Entity("PARR.DAL.Models.Host", b =>
@@ -1634,6 +1634,9 @@ namespace PARR.DAL.Migrations
b.Property<Guid>("FieldId")
.HasColumnType("uuid");
b.Property<bool>("IsInverse")
.HasColumnType("boolean");
b.Property<Guid>("UnitFilterId")
.HasColumnType("uuid");
@@ -1697,6 +1700,12 @@ namespace PARR.DAL.Migrations
b.Property<DateTimeOffset>("ReferenceDate")
.HasColumnType("timestamp with time zone");
b.Property<Guid?>("ScheduleExcludeTypeCalendarId")
.HasColumnType("uuid");
b.Property<Guid>("ScheduleExcludeTypeId")
.HasColumnType("uuid");
b.Property<string>("ShortDescription")
.IsRequired()
.HasColumnType("text");
@@ -1715,6 +1724,10 @@ namespace PARR.DAL.Migrations
b.HasIndex("GroupingUnitFieldId");
b.HasIndex("ScheduleExcludeTypeCalendarId");
b.HasIndex("ScheduleExcludeTypeId");
b.ToTable("Groups", "job", t =>
{
t.HasComment("Таблица описания групп работ, для реализации зонтиков");
@@ -2436,6 +2449,121 @@ namespace PARR.DAL.Migrations
});
});
modelBuilder.Entity("PARR.DAL.Models.Schedule.ScheduleExcludeType", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid");
b.Property<string>("Code")
.IsRequired()
.HasColumnType("text");
b.Property<DateTimeOffset>("DateCreated")
.HasColumnType("timestamp with time zone");
b.Property<string>("EsppName")
.IsRequired()
.HasColumnType("text");
b.Property<string>("EsppValue")
.IsRequired()
.HasColumnType("text");
b.Property<string>("Title")
.IsRequired()
.HasColumnType("text");
b.HasKey("Id");
b.ToTable("ExcludeTypes", "schedule", t =>
{
t.HasComment("Расписание регламентной работы - Тип исключения");
});
b.HasData(
new
{
Id = new Guid("0595b8e0-f322-4661-b5e3-064af8fbe7cd"),
Code = "None",
DateCreated = new DateTimeOffset(new DateTime(2023, 5, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 0, 0, 0, 0)),
EsppName = "Нет исключений",
EsppValue = "NONE",
Title = "Нет исключений"
},
new
{
Id = new Guid("2b7a4356-9aaf-4e00-b444-42f0b5010e25"),
Code = "Only",
DateCreated = new DateTimeOffset(new DateTime(2023, 5, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 0, 0, 0, 0)),
EsppName = "Выполнить ТОЛЬКО В указанном календаре",
EsppValue = "ONLY",
Title = "Выполнить ТОЛЬКО В указанном календаре"
},
new
{
Id = new Guid("38cd9e64-27c1-4672-a805-2211952a48bd"),
Code = "Except",
DateCreated = new DateTimeOffset(new DateTime(2023, 5, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 0, 0, 0, 0)),
EsppName = "Выполнить везде, КРОМЕ указанного календаря",
EsppValue = "EXCEPT",
Title = "Выполнить везде, КРОМЕ указанного календаря"
});
});
modelBuilder.Entity("PARR.DAL.Models.Schedule.ScheduleExcludeTypeCalendar", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid");
b.Property<string>("Code")
.IsRequired()
.HasColumnType("text");
b.Property<DateTimeOffset>("DateCreated")
.HasColumnType("timestamp with time zone");
b.Property<string>("EsppName")
.IsRequired()
.HasColumnType("text");
b.Property<string>("EsppValue")
.IsRequired()
.HasColumnType("text");
b.Property<string>("Title")
.IsRequired()
.HasColumnType("text");
b.HasKey("Id");
b.ToTable("ExcludeTypeCalendars", "schedule", t =>
{
t.HasComment("Расписание регламентной работы, исключение - Календарь");
});
b.HasData(
new
{
Id = new Guid("a26edb88-0267-4fbf-b7ec-d172b0a86c9c"),
Code = "24x5",
DateCreated = new DateTimeOffset(new DateTime(2023, 5, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 0, 0, 0, 0)),
EsppName = "24x5",
EsppValue = "24x5",
Title = "24x5"
},
new
{
Id = new Guid("6834f1d5-ac51-43d5-974e-4c759d7bbf9f"),
Code = "24x7",
DateCreated = new DateTimeOffset(new DateTime(2023, 5, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 0, 0, 0, 0)),
EsppName = "24x7",
EsppValue = "24x7",
Title = "24x7"
});
});
modelBuilder.Entity("PARR.DAL.Models.Setting", b =>
{
b.Property<string>("Name")
@@ -2497,18 +2625,6 @@ namespace PARR.DAL.Migrations
Value = "MSK"
},
new
{
Name = "ScheduleExcludeType",
Description = "Расписание регламентной работы - Тип исключения",
Value = "Выполнить ТОЛЬКО В указанном календаре"
},
new
{
Name = "ScheduleExcludeCalendar",
Description = "Расписание регламентной работы - Календарь",
Value = "8x5 (8.00-17.00)"
},
new
{
Name = "ScheduleRepeatRange",
Description = "Расписание регламентной работы - Диапазн повторов",
@@ -2542,7 +2658,7 @@ namespace PARR.DAL.Migrations
{
Name = "EsppUnitTag",
Description = "Префикс тега в поле ЭК \"Дополнительная информация\"",
Value = "ПАРР-"
Value = "ПАРР_"
});
});
@@ -3371,9 +3487,23 @@ namespace PARR.DAL.Migrations
.HasForeignKey("GroupingUnitFieldId")
.OnDelete(DeleteBehavior.Restrict);
b.HasOne("PARR.DAL.Models.Schedule.ScheduleExcludeTypeCalendar", "ScheduleExcludeTypeCalendar")
.WithMany("JobGroups")
.HasForeignKey("ScheduleExcludeTypeCalendarId");
b.HasOne("PARR.DAL.Models.Schedule.ScheduleExcludeType", "ScheduleExcludeType")
.WithMany("JobGroups")
.HasForeignKey("ScheduleExcludeTypeId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("GroupType");
b.Navigation("GroupingUnitField");
b.Navigation("ScheduleExcludeType");
b.Navigation("ScheduleExcludeTypeCalendar");
});
modelBuilder.Entity("PARR.DAL.Models.Job.JobRelationshipFilter", b =>
@@ -3847,6 +3977,16 @@ namespace PARR.DAL.Migrations
b.Navigation("Users");
});
modelBuilder.Entity("PARR.DAL.Models.Schedule.ScheduleExcludeType", b =>
{
b.Navigation("JobGroups");
});
modelBuilder.Entity("PARR.DAL.Models.Schedule.ScheduleExcludeTypeCalendar", b =>
{
b.Navigation("JobGroups");
});
modelBuilder.Entity("PARR.DAL.Models.Subprocess", b =>
{
b.Navigation("Tnks");