mikhail/parr_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'schedule-exclude' into dev

Browse Source
This commit is contained in:
Mikhail Trubnikov
2025-12-26 11:27:16 +10:00
parent aa14499d3a 61c46770e0
commit 4f4e009ad1
45 changed files with 9240 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
PARR.DAL/Context/DataContext.cs
View File

@@ -5,6 +5,7 @@ using PARR.DAL.Contracts;
using PARR.DAL.Extensions;
using PARR.DAL.Models;
using PARR.DAL.Models.Job;
using PARR.DAL.Models.Schedule;
using PARR.DAL.Models.Unit;
namespace PARR.DAL.Context
@@ -42,12 +43,19 @@ namespace PARR.DAL.Context
public DbSet<RobotConfiguration> RobotConfigurations { get; set; }
public DbSet<RobotHistory> RobotHistories { get; set; }
#region Schedule
public DbSet<EsppSchType> EsppSchTypes { get; set; }
public DbSet<EsppSchTypeValue> EsppSchTypeValues { get; set; }
public DbSet<EsppSchTypeConfig> EsppSchTypeConfigs { get; set; }
public DbSet<EsppSchTypeSchedule> EsppSchTypeSchedules { get; set; }
public DbSet<EsppSchValue> EsppSchValues { get; set; }
public DbSet<ScheduleExcludeTypeCalendar> ScheduleExcludeTypeCalendars { get; set; }
public DbSet<ScheduleExcludeType> ScheduleExcludeTypes { get; set; }
#endregion
public DbSet<AgentHistory> AgentHistories { get; set; }
public DbSet<AgentHistoryLevel> AgentHistoryLevels { get; set; }
@@ -179,8 +187,8 @@ namespace PARR.DAL.Context
new { Name = nameof(SettingsFromDb.RobotAttemptsNumber), Description = "Количество попыток выполнения задания роботом", Value = "3" },
new { Name = nameof(SettingsFromDb.RobotWaitTime), Description = "Время ожидания выполнения роботом задания", Value = "00:15:00" },
new { Name = nameof(SettingsFromDb.ScheduleTimezone), Description = "Расписание регламентной работы - В каком часовом поясе", Value = "MSK" },
new { Name = nameof(SettingsFromDb.ScheduleExcludeType), Description = "Расписание регламентной работы - Тип исключения", Value = "Выполнить ТОЛЬКО В указанном календаре" },
new { Name = nameof(SettingsFromDb.ScheduleExcludeCalendar), Description = "Расписание регламентной работы - Календарь", Value = "8x5 (8.00-17.00)" },
//new { Name = nameof(SettingsFromDb.ScheduleExcludeType), Description = "Расписание регламентной работы - Тип исключения", Value = "Выполнить ТОЛЬКО В указанном календаре" },
//new { Name = nameof(SettingsFromDb.ScheduleExcludeCalendar), Description = "Расписание регламентной работы - Календарь", Value = "8x5 (8.00-17.00)" },
new { Name = nameof(SettingsFromDb.ScheduleRepeatRange), Description = "Расписание регламентной работы - Диапазн повторов", Value = "Отсутствует дата завершения" },
new { Name = nameof(SettingsFromDb.OrderSearchDeltaDate), Description = "Промежуток времени для поиска нарядов в ЕСПП", Value = new TimeSpan(1, 30, 0).ToString() },
new { Name = nameof(SettingsFromDb.EsppRobotAccountTimeZoneHour), Description = "Таймзона УЗ роботов в ЕСПП, в часах (может быть положительная и отрицательная)", Value = "3" },
@@ -195,7 +203,7 @@ namespace PARR.DAL.Context
new TemplateNameConstantPart { Name = "П-2", Value = "ПАРР" }
}.ToJson()
},
new { Name = nameof(SettingsFromDb.EsppUnitTag), Description = "Префикс тега в поле ЭК \"Дополнительная информация\"", Value = "ПАРР-" }
new { Name = nameof(SettingsFromDb.EsppUnitTag), Description = "Префикс тега в поле ЭК \"Дополнительная информация\"", Value = "ПАРР_" }
);
});
#endregion
@@ -514,6 +522,31 @@ namespace PARR.DAL.Context
#endregion
#region ScheduleExcludeType
modelBuilder.Entity<ScheduleExcludeType>(f =>
{
f.HasData(
new() { Id = new Guid("0595B8E0-F322-4661-B5E3-064AF8FBE7CD"), DateCreated = dateCreated, Title = "Нет исключений", EsppName = "Нет исключений", EsppValue = "NONE", Code = ScheduleExcludeTypeEnum.None.ToString() },
new() { Id = new Guid("2B7A4356-9AAF-4E00-B444-42F0B5010E25"), DateCreated = dateCreated, Title = "Выполнить ТОЛЬКО В указанном календаре", EsppName = "Выполнить ТОЛЬКО В указанном календаре", EsppValue = "ONLY", Code = ScheduleExcludeTypeEnum.Only.ToString() },
new() { Id = new Guid("38CD9E64-27C1-4672-A805-2211952A48BD"), DateCreated = dateCreated, Title = "Выполнить везде, КРОМЕ указанного календаря", EsppName = "Выполнить везде, КРОМЕ указанного календаря", EsppValue = "EXCEPT", Code = ScheduleExcludeTypeEnum.Except.ToString() }
);
});
#endregion
#region ScheduleExcludeTypeCalendar
modelBuilder.Entity<ScheduleExcludeTypeCalendar>(f =>
{
f.HasData(
new() { Id = new Guid("A26EDB88-0267-4FBF-B7EC-D172B0A86C9C"), DateCreated = dateCreated, Title = "24x5", EsppName = "24x5", EsppValue = "24x5", Code = "24x5" },
new() { Id = new Guid("6834F1D5-AC51-43D5-974E-4C759D7BBF9F"), DateCreated = dateCreated, Title = "24x7", EsppName = "24x7", EsppValue = "24x7", Code = "24x7" }
);
});
#endregion
}
//protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)

5
PARR.DAL/Context/DataContextSettings.cs
View File

@@ -13,5 +13,10 @@
/// </summary>
public const string Job = "job";
/// <summary>
/// Расписание регламентных работ
/// </summary>
public const string Schedule = "schedule";
}
}

23
PARR.DAL/Contracts/ScheduleExcludeTypeEnum.cs Normal file
View File

@@ -0,0 +1,23 @@
namespace PARR.DAL.Contracts
{
/// <summary>
/// Расписание регламентной работы - Тип исключения
/// </summary>
public enum ScheduleExcludeTypeEnum
{
/// <summary>
/// Нет исключений
/// </summary>
None = 0,
/// <summary>
/// Выполнить ТОЛЬКО В указанном календаре
/// </summary>
Only = 1,
/// <summary>
/// Выполнить везде, КРОМЕ указанного календаря
/// </summary>
Except = 2
}
}

16
PARR.DAL/Contracts/SettingsFromDb.cs
View File

@@ -82,15 +82,15 @@ namespace PARR.DAL.Contracts
/// </summary>
public string ScheduleTimezone { get; set; } = string.Empty;
/// <summary>
/// Расписание регламентной работы - Тип исключения
/// </summary>
public string ScheduleExcludeType { get; set; } = string.Empty;
///// <summary>
///// Расписание регламентной работы - Тип исключения
///// </summary>
//public string ScheduleExcludeType { get; set; } = string.Empty;
/// <summary>
/// Расписание регламентной работы - Календарь
/// </summary>
public string ScheduleExcludeCalendar { get; set; } = string.Empty;
///// <summary>
///// Расписание регламентной работы - Календарь
///// </summary>
//public string ScheduleExcludeCalendar { get; set; } = string.Empty;
/// <summary>
/// Расписание регламентной работы - Диапазн повторов

4081
PARR.DAL/Migrations/20251226005312_tblScheduleExludes.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

211
PARR.DAL/Migrations/20251226005312_tblScheduleExludes.cs Normal file
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", "Расписание регламентной работы - Тип исключения", "Выполнить ТОЛЬКО В указанном календаре" }
});
}
}
}

4081
PARR.DAL/Migrations/20251226011028_tblsEsppSch-changeScheme.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

68
PARR.DAL/Migrations/20251226011028_tblsEsppSch-changeScheme.cs Normal file
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");
}
}
}

176
PARR.DAL/Migrations/DataContextModelSnapshot.cs
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");

5
PARR.DAL/Models/EsppSchType.cs
View File

@@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations;
using PARR.DAL.Context;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace PARR.DAL.Models
@@ -6,7 +7,7 @@ namespace PARR.DAL.Models
/// <summary>
/// Расписание ЕСПП: типы повторений
/// </summary>
[Table("EsppSchTypes")]
[Table("EsppSchTypes", Schema = DataContextSettings.Schedule)]
public class EsppSchType
{
[Key]

3
PARR.DAL/Models/EsppSchTypeConfig.cs
View File

@@ -1,4 +1,5 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Context;
using PARR.DAL.Models.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -8,7 +9,7 @@ namespace PARR.DAL.Models
/// <summary>
/// Расписание ЕСПП: Конфигурация типов
/// </summary>
[Table("EsppSchTypeConfigs")]
[Table("EsppSchTypeConfigs", Schema = DataContextSettings.Schedule)]
[Index(nameof(TypeScheduleId), nameof(TypeId), IsUnique = true)]
public class EsppSchTypeConfig : IBase
{

5
PARR.DAL/Models/EsppSchTypeSchedule.cs
View File

@@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations;
using PARR.DAL.Context;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace PARR.DAL.Models
@@ -6,7 +7,7 @@ namespace PARR.DAL.Models
/// <summary>
/// Расписание ЕСПП: Повторять задачу
/// </summary>
[Table("EsppSchTypeSchedules")]
[Table("EsppSchTypeSchedules", Schema = DataContextSettings.Schedule)]
public class EsppSchTypeSchedule
{
[Key]

5
PARR.DAL/Models/EsppSchTypeValue.cs
View File

@@ -1,4 +1,5 @@
using PARR.DAL.Models.Base;
using PARR.DAL.Context;
using PARR.DAL.Models.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@@ -7,7 +8,7 @@ namespace PARR.DAL.Models
/// <summary>
/// Расписание ЕСПП: значения типов повторений
/// </summary>
[Table("EsppSchTypeValues")]
[Table("EsppSchTypeValues", Schema = DataContextSettings.Schedule)]
public class EsppSchTypeValue : IBase
{
[Key]

4
PARR.DAL/Models/EsppSchValue.cs
View File

@@ -1,4 +1,5 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Context;
using PARR.DAL.Models.Job;
using System.ComponentModel.DataAnnotations.Schema;
@@ -7,7 +8,7 @@ namespace PARR.DAL.Models
/// <summary>
/// Расписание ЕСПП: значения заданий для ApplicationsInWorks
/// </summary>
[Table("EsppSchValues")]
[Table("EsppSchValues", Schema = DataContextSettings.Schedule)]
//[Index(nameof(ApplicationsInWorkId), nameof(TypeValueId), nameof(TypeConfigId), IsUnique = true)]
//[PrimaryKey(nameof(ApplicationsInWorkId), nameof(TypeValueId), nameof(TypeConfigId))]
[PrimaryKey(nameof(JobGroupId), nameof(TypeValueId), nameof(TypeConfigId))]
@@ -21,6 +22,7 @@ namespace PARR.DAL.Models
public Guid JobGroupId { get; set; }
//[ForeignKey(nameof(ApplicationsInWorkId))]
//public ApplicationsInWork? ApplicationsInWork { get; set; }

5
PARR.DAL/Models/Job/JobFieldFilter.cs
View File

@@ -24,6 +24,11 @@ namespace PARR.DAL.Models.Job
public required string ValueMask { get; set; }
/// <summary>
/// Отсутствует
/// </summary>
public bool IsInverse { get; set; } = false;
[ForeignKey(nameof(FieldId))]
public UnitField? UnitField { get; set; }

20
PARR.DAL/Models/Job/JobGroup.cs
View File

@@ -1,6 +1,7 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Context;
using PARR.DAL.Models.Base;
using PARR.DAL.Models.Schedule;
using PARR.DAL.Models.Unit;
using PARR.DAL.Settings;
using System.ComponentModel.DataAnnotations;
@@ -128,6 +129,19 @@ namespace PARR.DAL.Models.Job
/// </summary>
public Guid? GroupingUnitFieldId { get; set; }
/// <summary>
/// Расписание регламентной работы - Тип исключения
/// </summary>
public Guid ScheduleExcludeTypeId { get; set; }
/// <summary>
/// Расписание регламентной работы, исключение - Календарь
/// </summary>
public Guid? ScheduleExcludeTypeCalendarId { get; set; }
/// <summary>
/// Поле по которому группируется (!!!отключено каскадное удаление!!!)
/// </summary>
@@ -140,5 +154,11 @@ namespace PARR.DAL.Models.Job
public ICollection<Job> Jobs { get; set; } = new HashSet<Job>();
public ICollection<EsppSchValue> EsppSchValues { get; set; } = new HashSet<EsppSchValue>();
[ForeignKey(nameof(ScheduleExcludeTypeId))]
public ScheduleExcludeType? ScheduleExcludeType { get; set; }
[ForeignKey(nameof(ScheduleExcludeTypeCalendarId))]
public ScheduleExcludeTypeCalendar? ScheduleExcludeTypeCalendar { get; set; }
}
}

1
PARR.DAL/Models/Job/JobUnitFilter.cs
View File

@@ -16,6 +16,7 @@ namespace PARR.DAL.Models.Job
public DateTimeOffset DateCreated { get; set; }
public DateTimeOffset? DateModified { get; set; }
public required string UnitFilter { get; set; }
public Guid JobId { get; set; }

39
PARR.DAL/Models/Schedule/ScheduleExcludeType.cs Normal file
View File

@@ -0,0 +1,39 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Context;
using PARR.DAL.Models.Base;
using PARR.DAL.Models.Job;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace PARR.DAL.Models.Schedule
{
/// <summary>
/// Расписание регламентной работы - Тип исключения
/// </summary>
[Table("ExcludeTypes", Schema = DataContextSettings.Schedule)]
[Comment("Расписание регламентной работы - Тип исключения")]
public class ScheduleExcludeType : IBase
{
[Key]
public Guid Id { get; set; }
public DateTimeOffset DateCreated { get; set; }
[NotMapped]
public DateTimeOffset? DateModified { get; set; }
/// <summary>
/// Название в ПАРР
/// </summary>
public required string Title { get; set; }
public required string EsppName { get; set; }
public required string EsppValue { get; set; }
public required string Code { get; set; }
public ICollection<JobGroup> JobGroups { get; set; } = new HashSet<JobGroup>();
}
}

39
PARR.DAL/Models/Schedule/ScheduleExcludeTypeCalendar.cs Normal file
View File

@@ -0,0 +1,39 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Context;
using PARR.DAL.Models.Base;
using PARR.DAL.Models.Job;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace PARR.DAL.Models.Schedule
{
/// <summary>
/// Расписание регламентной работы, исключение - Календарь
/// </summary>
[Table("ExcludeTypeCalendars", Schema = DataContextSettings.Schedule)]
[Comment("Расписание регламентной работы, исключение - Календарь")]
public class ScheduleExcludeTypeCalendar : IBase
{
[Key]
public Guid Id { get; set; }
public DateTimeOffset DateCreated { get; set; }
[NotMapped]
public DateTimeOffset? DateModified { get; set; }
/// <summary>
/// Название в ПАРР
/// </summary>
public required string Title { get; set; }
public required string EsppName { get; set; }
public required string EsppValue { get; set; }
public required string Code { get; set; }
public ICollection<JobGroup> JobGroups { get; set; } = new HashSet<JobGroup>();
}
}

9
PARR.DAL/ParrDalInstaller.cs
View File

@@ -12,9 +12,11 @@ using PARR.DAL.InfluxDbServices;
using PARR.DAL.Services.Implementation;
using PARR.DAL.Services.Implementations;
using PARR.DAL.Services.Implementations.Job;
using PARR.DAL.Services.Implementations.Schedule;
using PARR.DAL.Services.Implementations.Unit;
using PARR.DAL.Services.Interfaces;
using PARR.DAL.Services.Interfaces.Job;
using PARR.DAL.Services.Interfaces.Schedule;
using PARR.DAL.Services.Interfaces.Unit;
using PARR.DAL.Settings;
using PARR.DAL.TransformServices;
@@ -99,6 +101,13 @@ namespace PARR.DAL
services.AddTransient<IParrComponentService, ParrComponentService>();
services.AddTransient<ITemplateStatusTypeService, TemplateStatusTypeService>();
#region Schedule
services.AddTransient<IScheduleExcludeTypeService, ScheduleExcludeTypeService>();
services.AddTransient<IScheduleExcludeTypeCalendarService, ScheduleExcludeTypeCalendarService>();
#endregion
#region Unit
services.AddTransient<IUnitService, UnitService>();

3
PARR.DAL/Services/Implementations/EsppSchTypeConfigService.cs
View File

@@ -60,7 +60,8 @@ namespace PARR.DAL.Services.Implementations
Order = t.Order,
Type = t.Type,
Value = t.Value
}).ToList()
}
).ToList()
};
return dto;

23
PARR.DAL/Services/Implementations/Schedule/ScheduleExcludeTypeCalendarService.cs Normal file
View File

@@ -0,0 +1,23 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using PARR.DAL.Context;
using PARR.DAL.Models.Schedule;
using PARR.DAL.Services.Abstracts;
using PARR.DAL.Services.Interfaces.Schedule;
namespace PARR.DAL.Services.Implementations.Schedule
{
internal class ScheduleExcludeTypeCalendarService : BaseService<ScheduleExcludeTypeCalendar>, IScheduleExcludeTypeCalendarService
{
private readonly DataContext dataContext;
protected override DbSet<ScheduleExcludeTypeCalendar> EntitySet => dataContext.ScheduleExcludeTypeCalendars;
protected override DataContext EntitiContext => dataContext;
public ScheduleExcludeTypeCalendarService(DataContext dataContext, ILogger<ScheduleExcludeTypeCalendarService> logger) : base(logger)
{
this.dataContext = dataContext;
}
}
}

23
PARR.DAL/Services/Implementations/Schedule/ScheduleExcludeTypeService.cs Normal file
View File

@@ -0,0 +1,23 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using PARR.DAL.Context;
using PARR.DAL.Models.Schedule;
using PARR.DAL.Services.Abstracts;
using PARR.DAL.Services.Interfaces.Schedule;
namespace PARR.DAL.Services.Implementations.Schedule
{
internal class ScheduleExcludeTypeService : BaseService<ScheduleExcludeType>, IScheduleExcludeTypeService
{
private readonly DataContext dataContext;
protected override DbSet<ScheduleExcludeType> EntitySet => dataContext.ScheduleExcludeTypes;
protected override DataContext EntitiContext => dataContext;
public ScheduleExcludeTypeService(DataContext dataContext, ILogger<ScheduleExcludeTypeService> logger) : base(logger)
{
this.dataContext = dataContext;
}
}
}

9
PARR.DAL/Services/Interfaces/Schedule/IScheduleExcludeTypeCalendar.cs Normal file
View File

@@ -0,0 +1,9 @@
using PARR.DAL.Models.Schedule;
using PARR.DAL.Services.Interfaces.Base;
namespace PARR.DAL.Services.Interfaces.Schedule
{
public interface IScheduleExcludeTypeCalendarService: IBaseService<ScheduleExcludeTypeCalendar>
{
}
}

9
PARR.DAL/Services/Interfaces/Schedule/IScheduleExcludeTypeService.cs Normal file
View File

@@ -0,0 +1,9 @@
using PARR.DAL.Models.Schedule;
using PARR.DAL.Services.Interfaces.Base;
namespace PARR.DAL.Services.Interfaces.Schedule
{
public interface IScheduleExcludeTypeService : IBaseService<ScheduleExcludeType>
{
}
}