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

fix(dal) tbl Settings актуализация настроек

Browse Source
This commit is contained in:
Mikhail Kuznetsov
2024-02-29 13:41:44 +10:00
parent 02212cac9f
commit caa84638df
6 changed files with 2599 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,10 +92,10 @@ namespace PARR.DAL.Context
new { Name = nameof(SettingsFromDb.TemplatePrefixName), Description = "Префикс имени шаблона в ЕСПП", Value = "%PREFIX%-ЭИТИ-ПТК-ПАРР" }, new { Name = nameof(SettingsFromDb.TemplatePrefixName), Description = "Префикс имени шаблона в ЕСПП", Value = "%PREFIX%-ЭИТИ-ПТК-ПАРР" },
new { Name = nameof(SettingsFromDb.RobotAttemptsNumber), Description = "Количество попыток выполнения задания роботом", Value = "3" }, new { Name = nameof(SettingsFromDb.RobotAttemptsNumber), Description = "Количество попыток выполнения задания роботом", Value = "3" },
new { Name = nameof(SettingsFromDb.RobotWaitTime), Description = "Время ожидания выполнения роботом задания", Value = "00:15:00" }, new { Name = nameof(SettingsFromDb.RobotWaitTime), Description = "Время ожидания выполнения роботом задания", Value = "00:15:00" },
new { Name = nameof(SettingsFromDb.ScheduleTimezone), Description = "Расписание регламентной работы - В каком часовом поясе", Value = "MSK" }, new { Name = nameof(SettingsFromDb.ScheduleTimezone), Description = "Расписание регламентной работы - В каком часовом поясе", Value = "Greenwich/Universal" },
new { Name = nameof(SettingsFromDb.ScheduleExclude), Description = "Расписание регламентной работы - Тип исключения", Value = "Нет исключений" }, new { Name = nameof(SettingsFromDb.ScheduleExclude), Description = "Расписание регламентной работы - Тип исключения", Value = "Нет исключений" },
new { Name = nameof(SettingsFromDb.ScheduleRepeatRange), Description = "Расписание регламентной работы - Диапазн повторов", Value = "Отсутствует дата завершения" }, new { Name = nameof(SettingsFromDb.ScheduleRepeatRange), Description = "Расписание регламентной работы - Диапазн повторов", Value = "Отсутствует дата завершения" },
new { Name = nameof(SettingsFromDb.OrderSearchDeltaDate), Description = "Промежуток времени для поиска нарядов в ЕСПП", Value = new TimeSpan(1, 0, 0).ToString() } new { Name = nameof(SettingsFromDb.OrderSearchDeltaDate), Description = "Промежуток времени для поиска нарядов в ЕСПП", Value = new TimeSpan(1, 30, 0).ToString() }
); );
}); });
#endregion #endregion

2530
PARR.DAL/Migrations/20240229033358_TblSettingsUpdateSomeValues.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

32
PARR.DAL/Migrations/20240229033358_TblSettingsUpdateSomeValues.cs Normal file
View File

@@ -0,0 +1,32 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace PARR.DAL.Migrations
{
/// <inheritdoc />
public partial class TblSettingsUpdateSomeValues : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.UpdateData(
table: "Settings",
keyColumn: "Name",
keyValue: "ScheduleTimezone",
column: "Value",
value: "Greenwich/Universal");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.UpdateData(
table: "Settings",
keyColumn: "Name",
keyValue: "ScheduleTimezone",
column: "Value",
value: "MSK");
}
}
}

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

@@ -51,7 +51,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("TemplateId"); b.HasIndex("TemplateId");
b.ToTable("AgentHistories", (string)null); b.ToTable("AgentHistories");
}); });
modelBuilder.Entity("PARR.DAL.Models.AgentHistoryLevel", b => modelBuilder.Entity("PARR.DAL.Models.AgentHistoryLevel", b =>
@@ -72,7 +72,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.ToTable("AgentHistoryLevels", (string)null); b.ToTable("AgentHistoryLevels");
b.HasData( b.HasData(
new new
@@ -115,7 +115,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("Name") b.HasIndex("Name")
.IsUnique(); .IsUnique();
b.ToTable("Applications", (string)null); b.ToTable("Applications");
}); });
modelBuilder.Entity("PARR.DAL.Models.ApplicationInHost", b => modelBuilder.Entity("PARR.DAL.Models.ApplicationInHost", b =>
@@ -142,7 +142,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("HostId"); b.HasIndex("HostId");
b.ToTable("ApplicationsInHost", (string)null); b.ToTable("ApplicationsInHost");
}); });
modelBuilder.Entity("PARR.DAL.Models.ApplicationType", b => modelBuilder.Entity("PARR.DAL.Models.ApplicationType", b =>
@@ -166,7 +166,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.ToTable("ApplicationTypes", (string)null); b.ToTable("ApplicationTypes");
b.HasData( b.HasData(
new new
@@ -251,7 +251,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("WorkId", "ApplicationId") b.HasIndex("WorkId", "ApplicationId")
.IsUnique(); .IsUnique();
b.ToTable("ApplicationsInWorks", (string)null); b.ToTable("ApplicationsInWorks");
}); });
modelBuilder.Entity("PARR.DAL.Models.EkStatus", b => modelBuilder.Entity("PARR.DAL.Models.EkStatus", b =>
@@ -268,7 +268,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Code"); b.HasKey("Code");
b.ToTable("EkStatuses", (string)null); b.ToTable("EkStatuses");
b.HasData( b.HasData(
new new
@@ -331,7 +331,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.ToTable("EsppSchTypes", (string)null); b.ToTable("EsppSchTypes");
b.HasData( b.HasData(
new new
@@ -400,7 +400,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("TypeScheduleId", "TypeId") b.HasIndex("TypeScheduleId", "TypeId")
.IsUnique(); .IsUnique();
b.ToTable("EsppSchTypeConfigs", (string)null); b.ToTable("EsppSchTypeConfigs");
b.HasData( b.HasData(
new new
@@ -503,7 +503,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.ToTable("EsppSchTypeSchedules", (string)null); b.ToTable("EsppSchTypeSchedules");
b.HasData( b.HasData(
new new
@@ -568,7 +568,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("TypeId"); b.HasIndex("TypeId");
b.ToTable("EsppSchTypeValues", (string)null); b.ToTable("EsppSchTypeValues");
b.HasData( b.HasData(
new new
@@ -1254,7 +1254,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("TypeValueId"); b.HasIndex("TypeValueId");
b.ToTable("EsppSchValues", (string)null); b.ToTable("EsppSchValues");
}); });
modelBuilder.Entity("PARR.DAL.Models.Host", b => modelBuilder.Entity("PARR.DAL.Models.Host", b =>
@@ -1296,7 +1296,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("Ek", "IP"); b.HasIndex("Ek", "IP");
b.ToTable("Hosts", (string)null); b.ToTable("Hosts");
}); });
modelBuilder.Entity("PARR.DAL.Models.Order", b => modelBuilder.Entity("PARR.DAL.Models.Order", b =>
@@ -1348,7 +1348,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("TemplateId"); b.HasIndex("TemplateId");
b.ToTable("Orders", (string)null); b.ToTable("Orders");
}); });
modelBuilder.Entity("PARR.DAL.Models.OrderStatus", b => modelBuilder.Entity("PARR.DAL.Models.OrderStatus", b =>
@@ -1369,7 +1369,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Code"); b.HasKey("Code");
b.ToTable("OrderStatuses", (string)null); b.ToTable("OrderStatuses");
b.HasData( b.HasData(
new new
@@ -1425,7 +1425,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.ToTable("Processes", (string)null); b.ToTable("Processes");
}); });
modelBuilder.Entity("PARR.DAL.Models.ResponseArea", b => modelBuilder.Entity("PARR.DAL.Models.ResponseArea", b =>
@@ -1442,7 +1442,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Code"); b.HasKey("Code");
b.ToTable("ResponseAreas", (string)null); b.ToTable("ResponseAreas");
b.HasData( b.HasData(
new new
@@ -1553,7 +1553,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("Name") b.HasIndex("Name")
.IsUnique(); .IsUnique();
b.ToTable("Robots", (string)null); b.ToTable("Robots");
b.HasData( b.HasData(
new new
@@ -1608,7 +1608,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("TemplateId", "RobotCode") b.HasIndex("TemplateId", "RobotCode")
.IsUnique(); .IsUnique();
b.ToTable("RobotConfigurations", (string)null); b.ToTable("RobotConfigurations");
}); });
modelBuilder.Entity("PARR.DAL.Models.RobotHistory", b => modelBuilder.Entity("PARR.DAL.Models.RobotHistory", b =>
@@ -1643,7 +1643,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("TaskStatusCode"); b.HasIndex("TaskStatusCode");
b.ToTable("RobotHistories", (string)null); b.ToTable("RobotHistories");
}); });
modelBuilder.Entity("PARR.DAL.Models.RobotHistoryLevel", b => modelBuilder.Entity("PARR.DAL.Models.RobotHistoryLevel", b =>
@@ -1664,7 +1664,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Level"); b.HasKey("Level");
b.ToTable("RobotHistoryLevels", (string)null); b.ToTable("RobotHistoryLevels");
b.HasData( b.HasData(
new new
@@ -1711,7 +1711,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Code"); b.HasKey("Code");
b.ToTable("RobotStatuses", (string)null); b.ToTable("RobotStatuses");
b.HasData( b.HasData(
new new
@@ -1759,7 +1759,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.ToTable("Roles", (string)null); b.ToTable("Roles");
b.HasData( b.HasData(
new new
@@ -1793,7 +1793,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Name"); b.HasKey("Name");
b.ToTable("Settings", (string)null); b.ToTable("Settings");
b.HasData( b.HasData(
new new
@@ -1836,7 +1836,7 @@ namespace PARR.DAL.Migrations
{ {
Name = "ScheduleTimezone", Name = "ScheduleTimezone",
Description = "Расписание регламентной работы - В каком часовом поясе", Description = "Расписание регламентной работы - В каком часовом поясе",
Value = "MSK" Value = "Greenwich/Universal"
}, },
new new
{ {
@@ -1884,7 +1884,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("ProcessId"); b.HasIndex("ProcessId");
b.ToTable("Subprocesses", (string)null); b.ToTable("Subprocesses");
}); });
modelBuilder.Entity("PARR.DAL.Models.TaskStatus", b => modelBuilder.Entity("PARR.DAL.Models.TaskStatus", b =>
@@ -1905,7 +1905,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Code"); b.HasKey("Code");
b.ToTable("TaskStatuses", (string)null); b.ToTable("TaskStatuses");
b.HasData( b.HasData(
new new
@@ -1968,7 +1968,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("Name") b.HasIndex("Name")
.IsUnique(); .IsUnique();
b.ToTable("Templates", (string)null); b.ToTable("Templates");
}); });
modelBuilder.Entity("PARR.DAL.Models.Tnk", b => modelBuilder.Entity("PARR.DAL.Models.Tnk", b =>
@@ -1997,7 +1997,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("SubprocessId"); b.HasIndex("SubprocessId");
b.ToTable("Tnks", (string)null); b.ToTable("Tnks");
}); });
modelBuilder.Entity("PARR.DAL.Models.User", b => modelBuilder.Entity("PARR.DAL.Models.User", b =>
@@ -2028,7 +2028,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("Ip") b.HasIndex("Ip")
.IsUnique(); .IsUnique();
b.ToTable("Users", (string)null); b.ToTable("Users");
}); });
modelBuilder.Entity("PARR.DAL.Models.UsersInRole", b => modelBuilder.Entity("PARR.DAL.Models.UsersInRole", b =>
@@ -2043,7 +2043,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("UserId"); b.HasIndex("UserId");
b.ToTable("UsersInRoles", (string)null); b.ToTable("UsersInRoles");
}); });
modelBuilder.Entity("PARR.DAL.Models.Work", b => modelBuilder.Entity("PARR.DAL.Models.Work", b =>
@@ -2072,7 +2072,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("TnkId"); b.HasIndex("TnkId");
b.ToTable("Works", (string)null); b.ToTable("Works");
}); });
modelBuilder.Entity("PARR.DAL.Models.AgentHistory", b => modelBuilder.Entity("PARR.DAL.Models.AgentHistory", b =>

2
PARR.EsppScheduleSync/Domain/EsppObjectSchedule.cs
View File

@@ -89,7 +89,7 @@ namespace PARR.EsppScheduleSync.Domain
public required string Scheduled { get; set; } public required string Scheduled { get; set; }
/// <summary> /// <summary>
/// В каком часовом поясе: MSK /// В каком часовом поясе: Greenwich/Universal
/// </summary> /// </summary>
public required string Timezone { get; set; } public required string Timezone { get; set; }

3
PARR.Test/Worker.cs
View File

@@ -1,4 +1,5 @@
using PARR.BLL.Services.Interfaces; using PARR.BLL.Services.Interfaces;
using PARR.Constants;
using PARR.EsppApi; using PARR.EsppApi;
using PARR.EsppApi.Constants; using PARR.EsppApi.Constants;
using PARR.EsppApi.Models.Query; using PARR.EsppApi.Models.Query;
@@ -110,7 +111,7 @@ namespace PARR.Test
{ {
foreach (var item in result.Data) foreach (var item in result.Data)
{ {
if (item.StatusEnum == Constants.OrderStatusEnum.New) if (item.StatusEnum == OrderStatusEnum.New)
{ {
await esppApiService.SetStatusInWorkAsync(item.Number, ResultMsg); await esppApiService.SetStatusInWorkAsync(item.Number, ResultMsg);
} }