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

feat(api,bll,dal,esppScheduleSync,TemplateGenerator): изменен рассчет nextRun для задания роботу и синхронизатору, подставляется в зависимости от настроек ЗО и таймзоны УЗ робота ЕСПП. Переименование полей в БД

Browse Source
This commit is contained in:
Mikhail Trubnikov
2026-02-03 16:15:19 +10:00
parent c0210656d9
commit ead4653ad0
36 changed files with 13010 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4144
PARR.DAL/Migrations/20260202235709_tblScheduleResponseAreaTimeOffsetAddUtcTimeOffset.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

32
PARR.DAL/Migrations/20260202235709_tblScheduleResponseAreaTimeOffsetAddUtcTimeOffset.cs Normal file
View File

@@ -0,0 +1,32 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace PARR.DAL.Migrations
{
/// <inheritdoc />
public partial class tblScheduleResponseAreaTimeOffsetAddUtcTimeOffset : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<TimeSpan>(
name: "UtcTimeOffset",
schema: "schedule",
table: "ResponseAreaTimeOffsets",
type: "interval",
nullable: false,
defaultValue: new TimeSpan(0, 0, 0, 0, 0));
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "UtcTimeOffset",
schema: "schedule",
table: "ResponseAreaTimeOffsets");
}
}
}

4150
PARR.DAL/Migrations/20260203055426_tblRenameFields.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

52
PARR.DAL/Migrations/20260203055426_tblRenameFields.cs Normal file
View File

@@ -0,0 +1,52 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace PARR.DAL.Migrations
{
/// <inheritdoc />
public partial class tblRenameFields : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "TimeOffset",
schema: "schedule",
table: "ResponseAreaTimeOffsets",
newName: "EsppValue");
migrationBuilder.RenameColumn(
name: "IsWorkGroupTimezone",
schema: "job",
table: "Groups",
newName: "IsResponseAreaTimezone");
migrationBuilder.InsertData(
table: "Settings",
columns: new[] { "Name", "Description", "Value" },
values: new object[] { "DefaultResponseAreaToTimeOffset", "Зона ответственности для получения тайм зоны по умолчанию для расписаний", "17-МСК" });
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DeleteData(
table: "Settings",
keyColumn: "Name",
keyValue: "DefaultResponseAreaToTimeOffset");
migrationBuilder.RenameColumn(
name: "EsppValue",
schema: "schedule",
table: "ResponseAreaTimeOffsets",
newName: "TimeOffset");
migrationBuilder.RenameColumn(
name: "IsResponseAreaTimezone",
schema: "job",
table: "Groups",
newName: "IsWorkGroupTimezone");
}
}
}

4144
PARR.DAL/Migrations/20260203061028_tbsSettingsRemoveScheduleTimezone.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

42
PARR.DAL/Migrations/20260203061028_tbsSettingsRemoveScheduleTimezone.cs Normal file
View File

@@ -0,0 +1,42 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace PARR.DAL.Migrations
{
/// <inheritdoc />
public partial class tbsSettingsRemoveScheduleTimezone : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DeleteData(
table: "Settings",
keyColumn: "Name",
keyValue: "ScheduleTimezone");
migrationBuilder.UpdateData(
table: "Settings",
keyColumn: "Name",
keyValue: "TemplateNameConstantParts",
column: "Value",
value: "[{\"Name\":\"П-1\",\"Value\":\"ЭИТИ-ПАРР\"}]");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.UpdateData(
table: "Settings",
keyColumn: "Name",
keyValue: "TemplateNameConstantParts",
column: "Value",
value: "[{\"Name\":\"П-1\",\"Value\":\"ЭИТИ\"},{\"Name\":\"П-2\",\"Value\":\"ПАРР\"}]");
migrationBuilder.InsertData(
table: "Settings",
columns: new[] { "Name", "Description", "Value" },
values: new object[] { "ScheduleTimezone", "Расписание регламентной работы - В каком часовом поясе", "MSK" });
}
}
}

21
PARR.DAL/Migrations/DataContextModelSnapshot.cs
View File

@@ -1678,7 +1678,7 @@ namespace PARR.DAL.Migrations
b.Property<bool>("IsAutoDistributionEnabled")
.HasColumnType("boolean");
b.Property<bool>("IsWorkGroupTimezone")
b.Property<bool>("IsResponseAreaTimezone")
.HasColumnType("boolean");
b.Property<DateTimeOffset>("ReferenceDate")
@@ -2581,10 +2581,13 @@ namespace PARR.DAL.Migrations
b.Property<string>("ResponseArea")
.HasColumnType("text");
b.Property<string>("TimeOffset")
b.Property<string>("EsppValue")
.IsRequired()
.HasColumnType("text");
b.Property<TimeSpan>("UtcTimeOffset")
.HasColumnType("interval");
b.HasKey("ResponseArea");
b.ToTable("ResponseAreaTimeOffsets", "schedule", t =>
@@ -2648,12 +2651,6 @@ namespace PARR.DAL.Migrations
Value = "00:15:00"
},
new
{
Name = "ScheduleTimezone",
Description = "Расписание регламентной работы - В каком часовом поясе",
Value = "MSK"
},
new
{
Name = "ScheduleRepeatRange",
Description = "Расписание регламентной работы - Диапазн повторов",
@@ -2681,7 +2678,7 @@ namespace PARR.DAL.Migrations
{
Name = "TemplateNameConstantParts",
Description = "Список неизменных частей имени шаблона",
Value = "[{\"Name\":\"П-1\",\"Value\":\"ЭИТИ\"},{\"Name\":\"П-2\",\"Value\":\"ПАРР\"}]"
Value = "[{\"Name\":\"П-1\",\"Value\":\"ЭИТИ-ПАРР\"}]"
},
new
{
@@ -2694,6 +2691,12 @@ namespace PARR.DAL.Migrations
Name = "JobIdForUnusedTemplates",
Description = "Job в который перемещаем ниспользованные шаблоны",
Value = "8f85a91c-a223-4686-bb69-1f0ee73624f2"
},
new
{
Name = "DefaultResponseAreaToTimeOffset",
Description = "Зона ответственности для получения тайм зоны по умолчанию для расписаний",
Value = "17-МСК"
});
});