diff --git a/PARR.JobAutoControl/JobAutoControlManager.cs b/PARR.JobAutoControl/JobAutoControlManager.cs index ac16e8f2..ebc12ada 100644 --- a/PARR.JobAutoControl/JobAutoControlManager.cs +++ b/PARR.JobAutoControl/JobAutoControlManager.cs @@ -140,7 +140,7 @@ namespace PARR.JobAutoControl var request = new TemplateActivatorMq { Action = TemplateActivatorActionsEnum.DeactivateAllForAutoControl, - ApplicationInWorkId = applicationInWorkId, + JobId = applicationInWorkId, HistoryInitiator = new HistoryInitiator { InitiatorComment = "Запрос на деактивацию с авто-контроля", InitiatorParrComponentId = ParrComponentsEnum.JobAutoControl } }; @@ -179,7 +179,7 @@ namespace PARR.JobAutoControl var request = new TemplateActivatorMq { Action = TemplateActivatorActionsEnum.ActivateAllForAutoControl, - ApplicationInWorkId = applicationInWorkId, + JobId = applicationInWorkId, HistoryInitiator = new HistoryInitiator { InitiatorComment = "Запрос на активацию с авто-контроля", InitiatorParrComponentId = ParrComponentsEnum.JobAutoControl } }; diff --git a/PARR.TemplateActivator/MqTemplateActivator.cs b/PARR.TemplateActivator/MqTemplateActivator.cs index d65e814a..c5ea3d4f 100644 --- a/PARR.TemplateActivator/MqTemplateActivator.cs +++ b/PARR.TemplateActivator/MqTemplateActivator.cs @@ -47,9 +47,9 @@ internal class MqTemplateActivator : IMqTemplateActivator if (query == null) return; - if (!await validatorService.IsValidApplicationInWorkAsync(query.ApplicationInWorkId)) + if (!await validatorService.IsValidApplicationInWorkAsync(query.JobId)) { - logger.LogError($"{this.GetType().Name}. Некорректные параметры регламентной работы {nameof(query.ApplicationInWorkId)}: {query.ApplicationInWorkId}"); + logger.LogError($"{this.GetType().Name}. Некорректные параметры регламентной работы {nameof(query.JobId)}: {query.JobId}"); return; } @@ -59,7 +59,7 @@ internal class MqTemplateActivator : IMqTemplateActivator if (service == null) throw new Exception($"{this.GetType().Name}. Не найден сервис: {nameof(service.GetType)}"); - await service.ChangeStateAsync(query.ApplicationInWorkId, query.Action, query.HistoryInitiator); + await service.ChangeStateAsync(query.JobId, query.Action, query.HistoryInitiator); } }