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

feat(dal): В Work добавлена маска имени шаблонов, выполнена миграция БД.

Browse Source
This commit is contained in:
Mikhail Kuznetsov
2025-04-16 15:54:50 +10:00
parent 12d92dbfe6
commit ecd3bdac9b
12 changed files with 3377 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PARR.API/MappingProfiles/DomainToResponseProfile.cs
View File

@@ -3,7 +3,7 @@ using PARR.API.Authentication.Models;
using PARR.API.Contracts.V1.Responses; using PARR.API.Contracts.V1.Responses;
using PARR.API.MappingProfiles.Resolvers; using PARR.API.MappingProfiles.Resolvers;
using PARR.Common.Domain; using PARR.Common.Domain;
using PARR.Constants.Shortcode; using PARR.Constants.Shortcodes;
using PARR.DAL.DomainModels; using PARR.DAL.DomainModels;
using PARR.DAL.Extensions; using PARR.DAL.Extensions;
using PARR.DAL.Models; using PARR.DAL.Models;
@@ -137,7 +137,7 @@ namespace PARR.API.MappingProfiles
.ForMember(d => d.IsActive, o => o.MapFrom(s => s.Template!.IsActiveTemplate)) .ForMember(d => d.IsActive, o => o.MapFrom(s => s.Template!.IsActiveTemplate))
.ForMember(d => d.ClosingCode, o => o.MapFrom<RobotTaskTemplateClosingCodeResolver>()) .ForMember(d => d.ClosingCode, o => o.MapFrom<RobotTaskTemplateClosingCodeResolver>())
.ForMember(d => d.FullDescription, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.FullDescription)) .ForMember(d => d.FullDescription, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.FullDescription))
.ForMember(d => d.ShortDescription, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.ShortDescription.ApplyShortcode(Shortcodes.EK, s.Template!.Host!.Ek))) .ForMember(d => d.ShortDescription, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.ShortDescription.ApplyShortcode(ShortcodeEnum.EK, s.Template!.Host!.Ek)))
.ForMember(d => d.Solution, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.Solution)) .ForMember(d => d.Solution, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.Solution))
//.ForMember(d => d.ResponseArea, o => o.MapFrom(s => s.Template!.Host!.ResponseArea!.Name)) //.ForMember(d => d.ResponseArea, o => o.MapFrom(s => s.Template!.Host!.ResponseArea!.Name))
//ЗО берем у группы а не у хоста //ЗО берем у группы а не у хоста
@@ -152,9 +152,9 @@ namespace PARR.API.MappingProfiles
.ForMember(d => d.ProcessEsppId, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.Work!.Tnk!.Subprocess!.Process!.EsppId)) .ForMember(d => d.ProcessEsppId, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.Work!.Tnk!.Subprocess!.Process!.EsppId))
.ForMember(d => d.SubprocessName, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.Work!.Tnk!.Subprocess!.Name)) .ForMember(d => d.SubprocessName, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.Work!.Tnk!.Subprocess!.Name))
.ForMember(d => d.SubprocessEsppId, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.Work!.Tnk!.Subprocess!.EsppId)) .ForMember(d => d.SubprocessEsppId, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.Work!.Tnk!.Subprocess!.EsppId))
.ForMember(d => d.TnkName, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.Work!.Tnk!.Name.ApplyShortcode(Shortcodes.EK, s.Template!.Host!.Ek))) .ForMember(d => d.TnkName, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.Work!.Tnk!.Name.ApplyShortcode(ShortcodeEnum.EK, s.Template!.Host!.Ek)))
.ForMember(d => d.TnkEsppId, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.Work!.Tnk!.EsppId)) .ForMember(d => d.TnkEsppId, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.Work!.Tnk!.EsppId))
.ForMember(d => d.WorkName, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.Work!.Name.ApplyShortcode(Shortcodes.EK, s.Template!.Host!.Ek))) .ForMember(d => d.WorkName, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.Work!.Name.ApplyShortcode(ShortcodeEnum.EK, s.Template!.Host!.Ek)))
.ForMember(d => d.WorkEsppId, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.Work!.EsppId)); .ForMember(d => d.WorkEsppId, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.Work!.EsppId));
CreateMap<RobotConfiguration, RobotTaskScheduleResponse>() CreateMap<RobotConfiguration, RobotTaskScheduleResponse>()

16
PARR.Constants/Shortcode/ShortcodeNames.cs
View File

@@ -1,16 +0,0 @@
namespace PARR.Constants.Shortcode
{
public static class ShortcodeNames
{
private static Dictionary<Shortcodes, string> ShortcodeNamesList = new Dictionary<Shortcodes, string>
{
{Shortcodes.EK, "%ЭК%" }
};
public static string GetShortcodeName(Shortcodes shortcode)
{
return ShortcodeNamesList[shortcode];
}
}
}

7
PARR.Constants/Shortcode/Shortcodes.cs → PARR.Constants/Shortcodes/ShortcodeEnum.cs
View File

@@ -1,8 +1,9 @@
namespace PARR.Constants.Shortcode namespace PARR.Constants.Shortcodes
{ {
public enum Shortcodes public enum ShortcodeEnum
{ {
EK EK,
ZO
//!!!Не забыть добавить в справочник имен (ShortcodeName) строковое значение //!!!Не забыть добавить в справочник имен (ShortcodeName) строковое значение
} }
} }

15
PARR.Constants/Shortcodes/ShortcodeItem.cs Normal file
View File

@@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace PARR.Constants.Shortcodes
{
public class ShortcodeItem
{
public ShortcodeEnum ShortcodeEnum { get; set; }
public required string Name { get; set; }
public required string Description { get; set; }
}
}

20
PARR.Constants/Shortcodes/Shortcodes.cs Normal file
View File

@@ -0,0 +1,20 @@
using System.Data.Common;
namespace PARR.Constants.Shortcodes
{
public static class Shortcodes
{
private static readonly List<ShortcodeItem> ShortcodesList = new List<ShortcodeItem>()
{
new ShortcodeItem { ShortcodeEnum = ShortcodeEnum.EK, Name = "%ЭК%", Description = "Элемент конфигурации"},
new ShortcodeItem { ShortcodeEnum = ShortcodeEnum.ZO, Name = "%ЗО%", Description = "Зона ответственности"}
};
public static string GetShortcodeName(ShortcodeEnum shortcode)
{
return ShortcodesList.First(s => s.ShortcodeEnum == shortcode).Name;
}
}
}

8
PARR.DAL/Extensions/GeneralExtesions.cs
View File

@@ -1,4 +1,4 @@
using PARR.Constants.Shortcode; using PARR.Constants.Shortcodes;
using System.Text.Encodings.Web; using System.Text.Encodings.Web;
using System.Text.Json; using System.Text.Json;
using System.Text.Unicode; using System.Text.Unicode;
@@ -43,12 +43,12 @@ namespace PARR.DAL.Extensions
/// ///
/// </summary> /// </summary>
/// <param name="sourceString">Исходная строка, включающая переменные части вида %ШАБЛОН%</param> /// <param name="sourceString">Исходная строка, включающая переменные части вида %ШАБЛОН%</param>
/// <param name="shortcode">Код шаблона из PARR.Constants.Shortcode.Shortcodes</param> /// <param name="shortcode">Код шаблона из PARR.Constants.ShortcodeEnum.ShortcodeEnum</param>
/// <param name="shortcodeValue">Итоговое строковое значение</param> /// <param name="shortcodeValue">Итоговое строковое значение</param>
/// <returns></returns> /// <returns></returns>
public static string ApplyShortcode(this string sourceString, Shortcodes shortcode, string shortcodeValue) public static string ApplyShortcode(this string sourceString, ShortcodeEnum shortcode, string shortcodeValue)
{ {
var shortcodeName = ShortcodeNames.GetShortcodeName(shortcode); var shortcodeName = Shortcodes.GetShortcodeName(shortcode);
return sourceString.Replace(shortcodeName, shortcodeValue); return sourceString.Replace(shortcodeName, shortcodeValue);
} }

3246
PARR.DAL/Migrations/20250416052702_tblWorkAddСlmnTemplateNameMask.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

28
PARR.DAL/Migrations/20250416052702_tblWorkAddСlmnTemplateNameMask.cs Normal file
View File

@@ -0,0 +1,28 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace PARR.DAL.Migrations
{
/// <inheritdoc />
public partial class tblWorkAddСlmnTemplateNameMask : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "TemplateNameMask",
table: "Works",
type: "text",
nullable: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "TemplateNameMask",
table: "Works");
}
}
}

85
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
@@ -101,7 +101,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("WorkGroupId"); b.HasIndex("WorkGroupId");
b.ToTable("AppInWorkInWorkGroups", (string)null); b.ToTable("AppInWorkInWorkGroups");
}); });
modelBuilder.Entity("PARR.DAL.Models.Application", b => modelBuilder.Entity("PARR.DAL.Models.Application", b =>
@@ -130,7 +130,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("Name", "ApplicationTypeId") b.HasIndex("Name", "ApplicationTypeId")
.IsUnique(); .IsUnique();
b.ToTable("Applications", (string)null); b.ToTable("Applications");
}); });
modelBuilder.Entity("PARR.DAL.Models.ApplicationInHost", b => modelBuilder.Entity("PARR.DAL.Models.ApplicationInHost", b =>
@@ -157,7 +157,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 =>
@@ -181,7 +181,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
@@ -294,7 +294,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.DistributionPeriod", b => modelBuilder.Entity("PARR.DAL.Models.DistributionPeriod", b =>
@@ -319,7 +319,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("Type"); b.HasIndex("Type");
b.ToTable("DistributionPeriods", (string)null); b.ToTable("DistributionPeriods");
b.HasData( b.HasData(
new new
@@ -349,7 +349,7 @@ namespace PARR.DAL.Migrations
b.HasKey("Type"); b.HasKey("Type");
b.ToTable("DistributionPeriodTypes", (string)null); b.ToTable("DistributionPeriodTypes");
b.HasData( b.HasData(
new new
@@ -383,7 +383,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
@@ -446,7 +446,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
@@ -515,7 +515,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
@@ -618,7 +618,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
@@ -691,7 +691,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
@@ -1492,7 +1492,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 =>
@@ -1539,7 +1539,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("WorkGroupId"); b.HasIndex("WorkGroupId");
b.ToTable("Hosts", (string)null); b.ToTable("Hosts");
}); });
modelBuilder.Entity("PARR.DAL.Models.JobAutoControl", b => modelBuilder.Entity("PARR.DAL.Models.JobAutoControl", b =>
@@ -1583,7 +1583,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("ApplicationInWorkId") b.HasIndex("ApplicationInWorkId")
.IsUnique(); .IsUnique();
b.ToTable("JobAutoControls", (string)null); b.ToTable("JobAutoControls");
}); });
modelBuilder.Entity("PARR.DAL.Models.JobAutoControlInEkStatus", b => modelBuilder.Entity("PARR.DAL.Models.JobAutoControlInEkStatus", b =>
@@ -1598,7 +1598,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("EkStatusCode"); b.HasIndex("EkStatusCode");
b.ToTable("JobAutoControlInEkStatus", (string)null); b.ToTable("JobAutoControlInEkStatus");
}); });
modelBuilder.Entity("PARR.DAL.Models.JobEkMask", b => modelBuilder.Entity("PARR.DAL.Models.JobEkMask", b =>
@@ -1622,7 +1622,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("JobAutoControlId", "Name") b.HasIndex("JobAutoControlId", "Name")
.IsUnique(); .IsUnique();
b.ToTable("JobEkMasks", (string)null); b.ToTable("JobEkMasks");
}); });
modelBuilder.Entity("PARR.DAL.Models.Order", b => modelBuilder.Entity("PARR.DAL.Models.Order", b =>
@@ -1674,7 +1674,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 =>
@@ -1695,7 +1695,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
@@ -1748,7 +1748,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("Name") b.HasIndex("Name")
.IsUnique(); .IsUnique();
b.ToTable("ParrComponents", (string)null); b.ToTable("ParrComponents");
b.HasData( b.HasData(
new new
@@ -1855,7 +1855,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("EsppId") b.HasIndex("EsppId")
.IsUnique(); .IsUnique();
b.ToTable("Processes", (string)null); b.ToTable("Processes");
}); });
modelBuilder.Entity("PARR.DAL.Models.ResponseArea", b => modelBuilder.Entity("PARR.DAL.Models.ResponseArea", b =>
@@ -1872,7 +1872,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
@@ -1998,7 +1998,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
@@ -2053,7 +2053,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 =>
@@ -2091,7 +2091,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 =>
@@ -2112,7 +2112,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
@@ -2159,7 +2159,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
@@ -2207,7 +2207,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
@@ -2241,7 +2241,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
@@ -2347,7 +2347,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 =>
@@ -2368,7 +2368,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
@@ -2446,7 +2446,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.TemplateHistory", b => modelBuilder.Entity("PARR.DAL.Models.TemplateHistory", b =>
@@ -2493,7 +2493,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("ParentId"); b.HasIndex("ParentId");
b.ToTable("TemplateHistories", (string)null); b.ToTable("TemplateHistories");
}); });
modelBuilder.Entity("PARR.DAL.Models.Tnk", b => modelBuilder.Entity("PARR.DAL.Models.Tnk", b =>
@@ -2525,7 +2525,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 =>
@@ -2556,7 +2556,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 =>
@@ -2571,7 +2571,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("UserId"); b.HasIndex("UserId");
b.ToTable("UsersInRoles", (string)null); b.ToTable("UsersInRoles");
}); });
modelBuilder.Entity("PARR.DAL.Models.WeekendDay", b => modelBuilder.Entity("PARR.DAL.Models.WeekendDay", b =>
@@ -2588,7 +2588,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("Date") b.HasIndex("Date")
.IsUnique(); .IsUnique();
b.ToTable("WeekendDays", (string)null); b.ToTable("WeekendDays");
}); });
modelBuilder.Entity("PARR.DAL.Models.Work", b => modelBuilder.Entity("PARR.DAL.Models.Work", b =>
@@ -2610,6 +2610,9 @@ namespace PARR.DAL.Migrations
.IsRequired() .IsRequired()
.HasColumnType("text"); .HasColumnType("text");
b.Property<string>("TemplateNameMask")
.HasColumnType("text");
b.Property<string>("TemplateSuffix") b.Property<string>("TemplateSuffix")
.HasColumnType("text"); .HasColumnType("text");
@@ -2623,7 +2626,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("TnkId"); b.HasIndex("TnkId");
b.ToTable("Works", (string)null); b.ToTable("Works");
}); });
modelBuilder.Entity("PARR.DAL.Models.WorkGroup", b => modelBuilder.Entity("PARR.DAL.Models.WorkGroup", b =>
@@ -2646,7 +2649,7 @@ namespace PARR.DAL.Migrations
b.HasIndex("ResponseAreaCode"); b.HasIndex("ResponseAreaCode");
b.ToTable("WorkGroups", (string)null); b.ToTable("WorkGroups");
}); });
modelBuilder.Entity("PARR.DAL.Models.AgentHistory", b => modelBuilder.Entity("PARR.DAL.Models.AgentHistory", b =>

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

@@ -18,6 +18,11 @@ namespace PARR.DAL.Models
public required string Name { get; set; } public required string Name { get; set; }
/// <summary>
/// Маска для динамического формирования имени шаблона
/// </summary>
public string? TemplateNameMask { get; set; }
/// <summary> /// <summary>
/// Короткое имя, для формирования имени шаблона /// Короткое имя, для формирования имени шаблона
/// </summary> /// </summary>

6
PARR.EsppTemplateSync/TemplateMQSyncer.cs
View File

@@ -75,7 +75,7 @@ namespace PARR.EsppTemplateSync
IsActive = template.IsActiveTemplate, IsActive = template.IsActiveTemplate,
//WorkGroup = template.Host!.WorkGroup!, //WorkGroup = template.Host!.WorkGroup!,
WorkGroup = template.Host!.WorkGroup!.Name, WorkGroup = template.Host!.WorkGroup!.Name,
ShortDescription = Normalize(template.ApplicationsInWork!.ShortDescription.ApplyShortcode(Constants.Shortcode.Shortcodes.EK,template.Host.Ek)), ShortDescription = Normalize(template.ApplicationsInWork!.ShortDescription.ApplyShortcode(Constants.Shortcodes.ShortcodeEnum.EK,template.Host.Ek)),
//ResponseArea = template.Host!.ResponseArea!.Name, //ResponseArea = template.Host!.ResponseArea!.Name,
//ЗО берем РГ а не хоста //ЗО берем РГ а не хоста
ResponseArea = template.Host!.WorkGroup!.ResponseArea!.Name, ResponseArea = template.Host!.WorkGroup!.ResponseArea!.Name,
@@ -85,8 +85,8 @@ namespace PARR.EsppTemplateSync
Solution = Normalize(template.ApplicationsInWork.Solution), Solution = Normalize(template.ApplicationsInWork.Solution),
Process = template.ApplicationsInWork.Work!.Tnk!.Subprocess!.Process!.Name, Process = template.ApplicationsInWork.Work!.Tnk!.Subprocess!.Process!.Name,
SubProcess = template.ApplicationsInWork.Work.Tnk.Subprocess.Name, SubProcess = template.ApplicationsInWork.Work.Tnk.Subprocess.Name,
TNK = template.ApplicationsInWork.Work.Tnk.Name.ApplyShortcode(Constants.Shortcode.Shortcodes.EK, template.Host.Ek), TNK = template.ApplicationsInWork.Work.Tnk.Name.ApplyShortcode(Constants.Shortcodes.ShortcodeEnum.EK, template.Host.Ek),
Work = template.ApplicationsInWork.Work.Name.ApplyShortcode(Constants.Shortcode.Shortcodes.EK, template.Host.Ek), Work = template.ApplicationsInWork.Work.Name.ApplyShortcode(Constants.Shortcodes.ShortcodeEnum.EK, template.Host.Ek),
Initiator = settingsFromDb.Initiator Initiator = settingsFromDb.Initiator
}; };

8
PARR.GeneratorTemplates/Services/TemplateManager.cs
View File

@@ -149,13 +149,13 @@ namespace PARR.GeneratorTemplates.Services
// Id = Guid.NewGuid(), // Id = Guid.NewGuid(),
// //Name = TemplateHelpers.GenerateTemplateName("ЗО" ,settingsFromDb.TemplatePrefixName, host.Ek, appInWork.Work!.Name), // //Name = TemplateHelpers.GenerateTemplateName("ЗО" ,settingsFromDb.TemplatePrefixName, host.Ek, appInWork.Work!.Name),
// //Генерить имя с полным именем работы и подстановкой ЭК // //Генерить имя с полным именем работы и подстановкой ЭК
// //Name = TemplateHelpers.GenerateTemplateNameWithResponseArea(host.ResponseArea!.Name, settingsFromDb.TemplatePrefixName, host.Ek, appInWork.Work!.Name.ApplyShortcode(Constants.Shortcode.Shortcodes.EK, host.Ek)), // //Name = TemplateHelpers.GenerateTemplateNameWithResponseArea(host.ResponseArea!.Name, settingsFromDb.TemplatePrefixName, host.Ek, appInWork.Work!.Name.ApplyShortcode(Constants.Shortcode.ShortcodeEnum.EK, host.Ek)),
// //Вместо полного имени работы, подставляется сокращенный суффикс или полное имя с ЭК если суффикса нет // //Вместо полного имени работы, подставляется сокращенный суффикс или полное имя с ЭК если суффикса нет
// Name = TemplateHelpers.GenerateTemplateNameWithResponseArea( // Name = TemplateHelpers.GenerateTemplateNameWithResponseArea(
// host.ResponseArea!.Name, // host.ResponseArea!.Name,
// settingsFromDb.TemplatePrefixName, // settingsFromDb.TemplatePrefixName,
// host.Ek, // host.Ek,
// appInWork.Work!.TemplateSuffix ?? appInWork.Work!.Name.ApplyShortcode(Constants.Shortcode.Shortcodes.EK, host.Ek) // appInWork.Work!.TemplateSuffix ?? appInWork.Work!.Name.ApplyShortcode(Constants.Shortcode.ShortcodeEnum.EK, host.Ek)
// ), // ),
// IsActiveTemplate = query.IsActiveTemplate ?? false, // IsActiveTemplate = query.IsActiveTemplate ?? false,
// IsActiveSchedule = query.IsActiveSchedule ?? false, // IsActiveSchedule = query.IsActiveSchedule ?? false,
@@ -221,13 +221,13 @@ namespace PARR.GeneratorTemplates.Services
Id = Guid.NewGuid(), Id = Guid.NewGuid(),
//Name = TemplateHelpers.GenerateTemplateName("ЗО" ,settingsFromDb.TemplatePrefixName, host.Ek, appInWork.Work!.Name), //Name = TemplateHelpers.GenerateTemplateName("ЗО" ,settingsFromDb.TemplatePrefixName, host.Ek, appInWork.Work!.Name),
//Генерить имя с полным именем работы и подстановкой ЭК //Генерить имя с полным именем работы и подстановкой ЭК
//Name = TemplateHelpers.GenerateTemplateNameWithResponseArea(host.ResponseArea!.Name, settingsFromDb.TemplatePrefixName, host.Ek, appInWork.Work!.Name.ApplyShortcode(Constants.Shortcode.Shortcodes.EK, host.Ek)), //Name = TemplateHelpers.GenerateTemplateNameWithResponseArea(host.ResponseArea!.Name, settingsFromDb.TemplatePrefixName, host.Ek, appInWork.Work!.Name.ApplyShortcode(Constants.Shortcode.ShortcodeEnum.EK, host.Ek)),
//Вместо полного имени работы, подставляется сокращенный суффикс или полное имя с ЭК если суффикса нет //Вместо полного имени работы, подставляется сокращенный суффикс или полное имя с ЭК если суффикса нет
Name = TemplateHelpers.GenerateTemplateNameWithResponseArea( Name = TemplateHelpers.GenerateTemplateNameWithResponseArea(
host.ResponseArea!.Name, host.ResponseArea!.Name,
settingsFromDb.TemplatePrefixName, settingsFromDb.TemplatePrefixName,
host.Ek, host.Ek,
appInWork.Work!.TemplateSuffix ?? appInWork.Work!.Name.ApplyShortcode(Constants.Shortcode.Shortcodes.EK, host.Ek) appInWork.Work!.TemplateSuffix ?? appInWork.Work!.Name.ApplyShortcode(Constants.Shortcodes.ShortcodeEnum.EK, host.Ek)
), ),
IsActiveTemplate = query.IsActiveTemplate ?? false, IsActiveTemplate = query.IsActiveTemplate ?? false,
IsActiveSchedule = query.IsActiveSchedule ?? false, IsActiveSchedule = query.IsActiveSchedule ?? false,