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

fix(API,DAL): Восстановлена работа контроллеров RobotTask, TemplateActivator, Template

Browse Source
This commit is contained in:
Mikhail Kuznetsov
2025-06-27 13:42:13 +10:00
parent 03c7852378
commit 91ddd2ae96
12 changed files with 71 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,7 @@ namespace PARR.API.MappingProfiles
#endregion
CreateMap<ApplicationsInWork, TemplateAgentResponse>()
CreateMap<JobGroup, TemplateAgentResponse>()
.ForMember(d => d.IsAgent, o => o.MapFrom(s => s.IsAgent))
.ForMember(d => d.Name, o => o.MapFrom(s => s.AgentName))
.ForMember(d => d.Script, o => o.MapFrom(s => s.AgentScript))
@@ -167,7 +167,7 @@ namespace PARR.API.MappingProfiles
.ForMember(d => d.Initiator, o => o.MapFrom<RobotTaskTemplateInitiatorResolver>())
.ForMember(d => d.Category, o => o.MapFrom<RobotTaskTemplateCategoryResolver>())
.ForMember(d => d.WorkGroup, o => o.MapFrom(s => s.Template!.Unit.BaseFields.WorkGroup))
.ForMember(d => d.Ek, o => o.MapFrom(s => s.Template!.Unit.Name))
.ForMember(d => d.Ek, o => o.MapFrom(s => s.Template!.Unit!.Name))
.ForMember(d => d.Name, o => o.MapFrom(s => s.Template!.Name))
.ForMember(d => d.ProcessName, o => o.MapFrom(s => s.Template!.Job!.Tnk!.Subprocess!.Process!.Name))
.ForMember(d => d.ProcessEsppId, o => o.MapFrom(s => s.Template!.Job!.Tnk!.Subprocess!.Process!.EsppId))

6
PARR.API/MappingProfiles/Resolvers/RobotTaskScheduleSchResolver.cs
View File

@@ -26,13 +26,13 @@ namespace PARR.API.MappingProfiles.Resolvers
public List<RobotTaskScheduleSchResponse>? Resolve(RobotConfiguration source, RobotTaskScheduleResponse destination, List<RobotTaskScheduleSchResponse>? destMember, ResolutionContext context)
{
var appInWorksId = source.Template!.JobId;
var jobGroupId = source.Template!.Job!.GroupId;
var schedule = esppConfigService.GetEsppScheduleDto(appInWorksId);
var schedule = esppConfigService.GetEsppScheduleDto(jobGroupId);
if (schedule == null)
{
logger.LogError($"RobotTaskScheduleSchResolver: Не смог замапить расписание для робота, так как оно null. appInWorksId: {appInWorksId}");
logger.LogError($"RobotTaskScheduleSchResolver: Не смог замапить расписание для робота, так как оно null. jobGroupId: {jobGroupId}");
return null;
}