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

feat(api,dal): в таблицу Jobs добавлено поле ResponseAreaMask. В JobController добавлено поле ResponseAreaMask. В TemplateController отображается фактическая РК, ЗО шаблона. RobotTask ЗО отдается согласно ResponseAreaMask. ShortcodeService теперь умеет принимать Template.

Browse Source
This commit is contained in:
Mikhail Trubnikov
2026-01-13 14:36:07 +10:00
parent 43d40d950e
commit bd4ad918e3
21 changed files with 8438 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PARR.API/Contracts/V1/Requests/JobRequest.cs
View File

@@ -21,6 +21,8 @@
public required string WorkName { get; set; }
public required string ResponseAreaMask { get; set; }
#region AutoControl
public bool IsEnableAutoControl { get; set; }

2
PARR.API/Contracts/V1/Responses/JobResponse.cs
View File

@@ -17,6 +17,8 @@
public required string WorkName { get; set; }
public required string WorkGroupMask { get; set; }
public required string ResponseAreaMask { get; set; }
}

10
PARR.API/Contracts/V1/Responses/TemplateResponse.cs
View File

@@ -24,6 +24,16 @@
public required string TemplateDuration { get; set; }
/// <summary>
/// Рабочая группа (формируется из шорткода)
/// </summary>
public required string WorkGroup { get; set; }
/// <summary>
/// ЗО, формируется из шорткода
/// </summary>
public required string ResponseArea { get; set; }
public TemplateAgentResponse? Agent { get; set; }
public DateTimeOffset? LastRun { get; set; }

1
PARR.API/Controllers/V1/JobController.cs
View File

@@ -286,6 +286,7 @@ namespace PARR.API.Controllers.V1
orig.WorkGroupMask = request.WorkGroupMask.Trim();
orig.TnkId = request.TnkId;
orig.GroupId = request.GroupId;
orig.ResponseAreaMask = request.ResponseAreaMask;
if (orig.AutoControl != null)
{

142
PARR.API/Controllers/V1/RobotTaskController.cs
View File

@@ -197,47 +197,48 @@ namespace PARR.API.Controllers.V1
//TODO Вынести в отдельный метод ShortcodesService
// Построим TemplateForShortcodes из уже загруженного task.Template
var templateForShortcodes = new TemplateForShortcodes
{
Id = task.Template!.Id,
Index = task.Template.Index,
JobId = task.Template.JobId,
UnitId = task.Template.UnitId,
Job = task.Template.Job == null ? null : new JobForShortcodes
{
Group = task.Template.Job.Group == null ? null : new JobGroupForShortcodes
{
Id = task.Template.Job.Group.Id,
GroupingUnitFieldId = task.Template.Job.Group.GroupingUnitFieldId,
GroupType = task.Template.Job.Group.GroupType == null ? null : new JobGroupTypeForShortcodes
{
Code = task.Template.Job.Group.GroupType.Code
},
GroupName = task.Template.Job.Group.GroupName
},
Tnk = task.Template.Job.Tnk == null ? null : new TnkForShortcodes
{
Name = task.Template.Job.Tnk.Name,
ShortName = task.Template.Job.Tnk.ShortName ?? ""
},
WorkName = task.Template.Job.WorkName,
Name = task.Template.Job.Name
},
UnitsInTemplate = task.Template.UnitsInTemplate?.Select(uit => new UnitInTemplateForShortcodes { UnitId = uit.UnitId }).ToList() ?? new List<UnitInTemplateForShortcodes>()
};
//var templateForShortcodes = new TemplateForShortcodes
//{
// Id = task.Template!.Id,
// Index = task.Template.Index,
// JobId = task.Template.JobId,
// UnitId = task.Template.UnitId,
// Job = task.Template.Job == null ? null : new JobForShortcodes
// {
// Group = task.Template.Job.Group == null ? null : new JobGroupForShortcodes
// {
// Id = task.Template.Job.Group.Id,
// GroupingUnitFieldId = task.Template.Job.Group.GroupingUnitFieldId,
// GroupType = task.Template.Job.Group.GroupType == null ? null : new JobGroupTypeForShortcodes
// {
// Code = task.Template.Job.Group.GroupType.Code
// },
// GroupName = task.Template.Job.Group.GroupName
// },
// Tnk = task.Template.Job.Tnk == null ? null : new TnkForShortcodes
// {
// Name = task.Template.Job.Tnk.Name,
// ShortName = task.Template.Job.Tnk.ShortName ?? ""
// },
// WorkName = task.Template.Job.WorkName,
// Name = task.Template.Job.Name
// },
// UnitsInTemplate = task.Template.UnitsInTemplate?.Select(uit => new UnitInTemplateForShortcodes { UnitId = uit.UnitId }).ToList() ?? new List<UnitInTemplateForShortcodes>()
//};
if (shortcodesService.IsAnyShortcodes(robotTaskTemplateResponse.FullDescription))
robotTaskTemplateResponse.FullDescription = await shortcodesService.ApplyShortcodesAsync(robotTaskTemplateResponse.FullDescription, templateForShortcodes);
if (shortcodesService.IsAnyShortcodes(robotTaskTemplateResponse.ShortDescription))
robotTaskTemplateResponse.ShortDescription = await shortcodesService.ApplyShortcodesAsync(robotTaskTemplateResponse.ShortDescription, templateForShortcodes);
if (shortcodesService.IsAnyShortcodes(robotTaskTemplateResponse.Solution))
robotTaskTemplateResponse.Solution = await shortcodesService.ApplyShortcodesAsync(robotTaskTemplateResponse.Solution, templateForShortcodes);
if (shortcodesService.IsAnyShortcodes(robotTaskTemplateResponse.TnkName))
robotTaskTemplateResponse.TnkName = await shortcodesService.ApplyShortcodesAsync(robotTaskTemplateResponse.TnkName, templateForShortcodes);
if (shortcodesService.IsAnyShortcodes(robotTaskTemplateResponse.WorkName))
robotTaskTemplateResponse.WorkName = await shortcodesService.ApplyShortcodesAsync(robotTaskTemplateResponse.WorkName, templateForShortcodes);
if (shortcodesService.IsAnyShortcodes(robotTaskTemplateResponse.WorkGroup))
robotTaskTemplateResponse.WorkGroup = await shortcodesService.ApplyShortcodesAsync(robotTaskTemplateResponse.WorkGroup, templateForShortcodes);
//if (shortcodesService.IsAnyShortcodes(robotTaskTemplateResponse.FullDescription))
robotTaskTemplateResponse.FullDescription = await shortcodesService.ApplyShortcodesAsync(robotTaskTemplateResponse.FullDescription, task.Template!);
//if (shortcodesService.IsAnyShortcodes(robotTaskTemplateResponse.ShortDescription))
robotTaskTemplateResponse.ShortDescription = await shortcodesService.ApplyShortcodesAsync(robotTaskTemplateResponse.ShortDescription, task.Template!);
//if (shortcodesService.IsAnyShortcodes(robotTaskTemplateResponse.Solution))
robotTaskTemplateResponse.Solution = await shortcodesService.ApplyShortcodesAsync(robotTaskTemplateResponse.Solution, task.Template!);
//if (shortcodesService.IsAnyShortcodes(robotTaskTemplateResponse.TnkName))
robotTaskTemplateResponse.TnkName = await shortcodesService.ApplyShortcodesAsync(robotTaskTemplateResponse.TnkName, task.Template!);
//if (shortcodesService.IsAnyShortcodes(robotTaskTemplateResponse.WorkName))
robotTaskTemplateResponse.WorkName = await shortcodesService.ApplyShortcodesAsync(robotTaskTemplateResponse.WorkName, task.Template!);
//if (shortcodesService.IsAnyShortcodes(robotTaskTemplateResponse.WorkGroup))
robotTaskTemplateResponse.WorkGroup = await shortcodesService.ApplyShortcodesAsync(robotTaskTemplateResponse.WorkGroup, task.Template!);
robotTaskTemplateResponse.ResponseArea = await shortcodesService.ApplyShortcodesAsync(robotTaskTemplateResponse.ResponseArea, task.Template!);
return Ok(new Response<RobotTaskTemplateResponse>(robotTaskTemplateResponse, true));
}
@@ -248,37 +249,38 @@ namespace PARR.API.Controllers.V1
//RobotTaskScheduleResponse
var robotTaskScheduleResponse = mapper.Map<RobotTaskScheduleResponse>(task);
// Построим TemplateForShortcodes из уже загруженного task.Template
var templateForShortcodes = new TemplateForShortcodes
{
Id = task.Template!.Id,
Index = task.Template.Index,
JobId = task.Template.JobId,
UnitId = task.Template.UnitId,
Job = task.Template.Job == null ? null : new JobForShortcodes
{
Group = task.Template.Job.Group == null ? null : new JobGroupForShortcodes
{
GroupingUnitFieldId = task.Template.Job.Group.GroupingUnitFieldId,
GroupType = task.Template.Job.Group.GroupType == null ? null : new JobGroupTypeForShortcodes
{
Code = task.Template.Job.Group.GroupType.Code
},
GroupName = task.Template.Job.Group.GroupName
},
Tnk = task.Template.Job.Tnk == null ? null : new TnkForShortcodes
{
Name = task.Template.Job.Tnk.Name,
ShortName = task.Template.Job.Tnk.ShortName
},
WorkName = task.Template.Job.WorkName,
Name = task.Template.Job.Name
},
UnitsInTemplate = task.Template.UnitsInTemplate?.Select(uit => new UnitInTemplateForShortcodes { UnitId = uit.UnitId }).ToList() ?? new List<UnitInTemplateForShortcodes>()
};
//// Построим TemplateForShortcodes из уже загруженного task.Template
//var templateForShortcodes = new TemplateForShortcodes
//{
// Id = task.Template!.Id,
// Index = task.Template.Index,
// JobId = task.Template.JobId,
// UnitId = task.Template.UnitId,
// Job = task.Template.Job == null ? null : new JobForShortcodes
// {
// Group = task.Template.Job.Group == null ? null : new JobGroupForShortcodes
// {
// GroupingUnitFieldId = task.Template.Job.Group.GroupingUnitFieldId,
// GroupType = task.Template.Job.Group.GroupType == null ? null : new JobGroupTypeForShortcodes
// {
// Code = task.Template.Job.Group.GroupType.Code
// },
// GroupName = task.Template.Job.Group.GroupName
// },
// Tnk = task.Template.Job.Tnk == null ? null : new TnkForShortcodes
// {
// Name = task.Template.Job.Tnk.Name,
// ShortName = task.Template.Job.Tnk.ShortName
// },
// WorkName = task.Template.Job.WorkName,
// Name = task.Template.Job.Name
// },
// UnitsInTemplate = task.Template.UnitsInTemplate?.Select(uit => new UnitInTemplateForShortcodes { UnitId = uit.UnitId }).ToList() ?? new List<UnitInTemplateForShortcodes>()
//};
if (shortcodesService.IsAnyShortcodes(robotTaskScheduleResponse.WorkGroup))
robotTaskScheduleResponse.WorkGroup = await shortcodesService.ApplyShortcodesAsync(robotTaskScheduleResponse.WorkGroup, templateForShortcodes);
//if (shortcodesService.IsAnyShortcodes(robotTaskScheduleResponse.WorkGroup))
robotTaskScheduleResponse.WorkGroup = await shortcodesService.ApplyShortcodesAsync(robotTaskScheduleResponse.WorkGroup, task.Template!);
robotTaskScheduleResponse.ResponseArea = await shortcodesService.ApplyShortcodesAsync(robotTaskScheduleResponse.ResponseArea, task.Template!);
return Ok(new Response<RobotTaskScheduleResponse>(robotTaskScheduleResponse, true));
}

22
PARR.API/Controllers/V1/TemplateController.cs
View File

@@ -15,6 +15,7 @@ using PARR.Common.Domain;
using PARR.Constants;
using PARR.DAL.Contracts;
using PARR.DAL.DomainModels;
using PARR.DAL.DomainServices.Shortcodes;
using PARR.DAL.Models;
using PARR.DAL.Services.Interfaces;
@@ -31,13 +32,15 @@ namespace PARR.API.Controllers.V1
private readonly IRobotConfigurationService robotConfigurationService;
private readonly IClientService clientService;
private readonly ILogger<TemplateController> logger;
private readonly IShortcodesService shortcodesService;
public TemplateController(
IMapper mapper,
ITemplateService templateService,
IRobotConfigurationService robotConfigurationService,
IClientService clientService,
ILogger<TemplateController> logger
ILogger<TemplateController> logger,
IShortcodesService shortcodesService
)
{
this.mapper = mapper;
@@ -45,6 +48,7 @@ namespace PARR.API.Controllers.V1
this.robotConfigurationService = robotConfigurationService;
this.clientService = clientService;
this.logger = logger;
this.shortcodesService = shortcodesService;
}
@@ -106,6 +110,11 @@ namespace PARR.API.Controllers.V1
return NoContent();
var templateResponse = mapper.Map<List<TemplateResponse>>(templates);
foreach (var responseItem in templateResponse)
{
await ApplyTemplateShortcodesAsync(responseItem, templates.First(t => t.Id == responseItem.Id));
}
var paginationResponse = new PagedResponse<TemplateResponse>(templateResponse, true).GetPaginatedProps(paginationFilter, query);
return Ok(paginationResponse);
@@ -136,6 +145,7 @@ namespace PARR.API.Controllers.V1
return NotFound();
var response = mapper.Map<TemplateResponse>(template);
await ApplyTemplateShortcodesAsync(response, template);
return Ok(new Response<TemplateResponse>(response, true));
}
@@ -198,12 +208,20 @@ namespace PARR.API.Controllers.V1
.Include(t => t.Job).ThenInclude(t => t.Group).ThenInclude(t => t.ScheduleExcludeType)
.Include(t => t.Job).ThenInclude(t => t.Group).ThenInclude(t => t.ScheduleExcludeTypeCalendar)
.AsSplitQuery()
.FirstOrDefaultAsync(t => t.Id == id);
.FirstAsync(t => t.Id == id);
var response = mapper.Map<TemplateResponse>(templateToResponse);
await ApplyTemplateShortcodesAsync(response, templateToResponse);
return Ok(new Response<TemplateResponse>(response, true));
}
private async Task ApplyTemplateShortcodesAsync(TemplateResponse response, Template template)
{
response.WorkGroup = await shortcodesService.ApplyShortcodesAsync(template.Job.WorkGroupMask, template);
response.ResponseArea = await shortcodesService.ApplyShortcodesAsync(template.Job.ResponseAreaMask, template);
}
}
}

3
PARR.API/Validators/JobRequestValidator.cs
View File

@@ -53,6 +53,9 @@ namespace PARR.API.Validators
RuleFor(t => t.MaxValueRelationships)
.GreaterThanOrEqualTo(t => t.MinValueRelationships);
RuleFor(t => t.ResponseAreaMask)
.NotNull().NotEmpty();
}
private async Task<bool> IsUnitFiltersCorrect(JobRequest entity)

6
PARR.DAL.IntegrationTests/TestDataGenerator.cs
View File

@@ -144,7 +144,8 @@ namespace PARR.DAL.IntegrationTests
GroupId = group.Id,
TnkId = Guid.NewGuid(),
Group = group,
DateCreated = now
DateCreated = now,
ResponseAreaMask = "%ЗО_РГ%"
};
var unitFilter1Id = Guid.NewGuid();
job1.UnitFilters = new List<JobUnitFilter>
@@ -204,7 +205,8 @@ namespace PARR.DAL.IntegrationTests
GroupId = group.Id,
TnkId = Guid.NewGuid(),
Group = group,
DateCreated = now
DateCreated = now,
ResponseAreaMask= "%ЗО_РГ%"
};
var unitFilter2Id = Guid.NewGuid();
job2.UnitFilters = new List<JobUnitFilter>

6
PARR.DAL.Tests/TestDataGenerator.cs
View File

@@ -145,7 +145,8 @@ namespace PARR.DAL.Tests
GroupId = group.Id,
TnkId = Guid.NewGuid(),
Group = group,
DateCreated = now
DateCreated = now,
ResponseAreaMask = "%ЗО_РГ%"
};
var unitFilter1Id = Guid.NewGuid();
job1.UnitFilters = new List<JobUnitFilter>
@@ -205,7 +206,8 @@ namespace PARR.DAL.Tests
GroupId = group.Id,
TnkId = Guid.NewGuid(),
Group = group,
DateCreated = now
DateCreated = now,
ResponseAreaMask = "%ЗО_РГ%"
};
var unitFilter2Id = Guid.NewGuid();
job2.UnitFilters = new List<JobUnitFilter>

5
PARR.DAL/DomainServices/Shortcodes/IShortcodesService.cs
View File

@@ -1,5 +1,6 @@
using PARR.DAL.DomainModels;
using PARR.DAL.DomainServices.Shortcodes.Models;
using PARR.DAL.Models;
namespace PARR.DAL.DomainServices.Shortcodes
{
@@ -7,7 +8,9 @@ namespace PARR.DAL.DomainServices.Shortcodes
{
Task<string> ApplyShortcodesAsync(string str, TemplateForShortcodes template);
bool IsAnyShortcodes(string str);
Task<string> ApplyShortcodesAsync(string str, Template template);
// bool IsAnyShortcodes(string str);
Task<List<ShortcodeInfoDto>> GetAvailableShortcodesAsync();
}

46
PARR.DAL/DomainServices/Shortcodes/ShortcodesService.cs
View File

@@ -6,6 +6,7 @@ using PARR.DAL.Contracts;
using PARR.DAL.DomainModels;
using PARR.DAL.DomainServices.Interfaces;
using PARR.DAL.DomainServices.Shortcodes.Models;
using PARR.DAL.Models;
using PARR.DAL.Models.Unit;
using PARR.DAL.Services.Interfaces;
using PARR.DAL.Services.Interfaces.Job;
@@ -58,8 +59,51 @@ namespace PARR.DAL.DomainServices.Shortcodes
this.unitFilterService = unitFilterService;
}
public Task<string> ApplyShortcodesAsync(string str, Template template)
{
// Построим TemplateForShortcodes из уже загруженного template
var templateForShortcodes = new TemplateForShortcodes
{
Id = template.Id,
Index = template.Index,
JobId = template.JobId,
UnitId = template.UnitId,
Job = template.Job == null ? null : new JobForShortcodes
{
Group = template.Job.Group == null ? null : new JobGroupForShortcodes
{
Id = template.Job.GroupId,
GroupingUnitFieldId = template.Job.Group.GroupingUnitFieldId,
GroupType = template.Job.Group.GroupType == null ? null : new JobGroupTypeForShortcodes
{
Code = template.Job.Group.GroupType.Code
},
GroupName = template.Job.Group.GroupName
},
Tnk = template.Job.Tnk == null ? null : new TnkForShortcodes
{
Name = template.Job.Tnk.Name,
ShortName = template.Job.Tnk.ShortName
},
WorkName = template.Job.WorkName,
Name = template.Job.Name
},
UnitsInTemplate = template.UnitsInTemplate?.Select(uit => new UnitInTemplateForShortcodes { UnitId = uit.UnitId }).ToList() ?? new List<UnitInTemplateForShortcodes>()
};
return ApplyShortcodesAsync(str, templateForShortcodes);
}
//todo: сделать private в перспективе
public async Task<string> ApplyShortcodesAsync(string str, TemplateForShortcodes template)
{
if (!IsAnyShortcodes(str))
{
logger.LogDebug("Строка не содержит шорткодов: {str}", str);
return str;
}
logger.LogDebug("Начата подстановка шорткодов. Вход: '{Input}', templateId={TemplateId}, index={Index}", str, template.Id, template.Index);
var job = template.Job;
@@ -228,7 +272,7 @@ namespace PARR.DAL.DomainServices.Shortcodes
return resultName;
}
public bool IsAnyShortcodes(string str)
private bool IsAnyShortcodes(string str)
{
return Regex.IsMatch(str, shortcodePattern) ||
Regex.IsMatch(str, maxShortcodePattern) ||

4095
PARR.DAL/Migrations/20260113000345_tblJobsAddResponseArea.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

31
PARR.DAL/Migrations/20260113000345_tblJobsAddResponseArea.cs Normal file
View File

@@ -0,0 +1,31 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace PARR.DAL.Migrations
{
/// <inheritdoc />
public partial class tblJobsAddResponseArea : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "ResponseArea",
schema: "job",
table: "Jobs",
type: "text",
nullable: false,
defaultValue: "%ЗО_РГ%");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ResponseArea",
schema: "job",
table: "Jobs");
}
}
}

4095
PARR.DAL/Migrations/20260113021048_tblJobsRenameResponseArea.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

30
PARR.DAL/Migrations/20260113021048_tblJobsRenameResponseArea.cs Normal file
View File

@@ -0,0 +1,30 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace PARR.DAL.Migrations
{
/// <inheritdoc />
public partial class tblJobsRenameResponseArea : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "ResponseArea",
schema: "job",
table: "Jobs",
newName: "ResponseAreaMask");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "ResponseAreaMask",
schema: "job",
table: "Jobs",
newName: "ResponseArea");
}
}
}

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

@@ -1570,6 +1570,10 @@ namespace PARR.DAL.Migrations
.IsRequired()
.HasColumnType("text");
b.Property<string>("ResponseAreaMask")
.IsRequired()
.HasColumnType("text");
b.Property<string>("TemplateNameMask")
.IsRequired()
.HasColumnType("text");

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

@@ -56,6 +56,11 @@ namespace PARR.DAL.Models.Job
/// </summary
public required string WorkGroupMask { get; set; }
/// <summary>
/// Зона ответственности
/// </summary>
public required string ResponseAreaMask { get; set; }
public Guid TnkId { get; set; }
public Guid GroupId { get; set; }

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

@@ -45,7 +45,8 @@ namespace PARR.DAL.Services.Implementations
.ThenInclude(s => s!.Subprocess)
.ThenInclude(p => p!.Process)
.Include(t => t.Job)
.ThenInclude(t => t!.Group);
.ThenInclude(t => t!.Group)
.ThenInclude(t=>t.GroupType);
}
public override Task<bool> CreateAsync(Template obj)

2
PARR.EsppSync/SyncService.cs
View File

@@ -129,7 +129,7 @@ namespace PARR.EsppSync
{
var value = property.GetValue(dbObjectInEsppObject)?.ToString();
if (value != null && shortcodesService.IsAnyShortcodes(value))
if (value != null)
{
var processedValue = await shortcodesService.ApplyShortcodesAsync(value, templateForShortcodes);
property.SetValue(dbObjectInEsppObject, processedValue);

7
PARR.EsppTemplateSync/TemplateMQSyncer.cs
View File

@@ -89,10 +89,11 @@ namespace PARR.EsppTemplateSync
//ShortDescription = Normalize(template.Job.Group.ShortDescription.ApplyShortcode(Constants.Shortcodes.ShortcodeEnum.EK,template.Unit.Name)),
ShortDescription = template.Job!.Group!.ShortDescription,//TODO Вынести в переменную
//ResponseArea = template.Host!.ResponseArea!.Name,
//ЗО берем РГ а не хоста
ResponseArea = template.Unit!.BaseFields!.ResponseArea!,
////ЗО берем РГ а не хоста
//ResponseArea = template.Unit!.BaseFields!.ResponseArea!,
ResponseArea = template.Job.ResponseAreaMask,
Duration = template.Job.Group.TemplateDuration,
EK = template.Unit.Name,
EK = template.Unit!.Name,
FullDescription = template.Job.Group.FullDescription,
Solution = template.Job.Group.Solution,
Process = template.Job.Tnk!.Subprocess!.Process!.Name,