From e77407a28eb4df4966f41f6f599c58e9ee47bbec Mon Sep 17 00:00:00 2001 From: Mikhail Trubnikov Date: Thu, 13 Jun 2024 09:01:02 +1000 Subject: [PATCH] =?UTF-8?q?feat(api,=20generatorTemplates):=20=D0=B2=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D1=80=D0=BE=D1=81=20=D1=81=D0=BE=D0=B7=D0=B4?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2,=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BF=D0=BE=D0=BB=D1=8F=20IsActiveTemplate,=20I?= =?UTF-8?q?sActiveSchedule?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Contracts/V1/Requests/GeneratorTemplateRequest.cs | 10 ++++++++++ PARR.API/Controllers/V1/GeneratorTemplateController.cs | 4 +++- PARR.BLL/Domain/Mq/GeneratorTemplateMq.cs | 10 ++++++++++ PARR.GeneratorTemplates/Services/TemplateManager.cs | 8 ++++++-- 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/PARR.API/Contracts/V1/Requests/GeneratorTemplateRequest.cs b/PARR.API/Contracts/V1/Requests/GeneratorTemplateRequest.cs index 554a8d7f..88a7ca25 100644 --- a/PARR.API/Contracts/V1/Requests/GeneratorTemplateRequest.cs +++ b/PARR.API/Contracts/V1/Requests/GeneratorTemplateRequest.cs @@ -26,5 +26,15 @@ /// Статус ЭК. 0 - все статусы, 1,2,3,4,5,6,7,9 /// public int Status { get; set; } + + /// + /// При создании, активировать шаблон + /// + public bool? IsActiveTemplate { get; set; } + + /// + /// При создании, активировать расписание + /// + public bool? IsActiveSchedule { get; set; } } } diff --git a/PARR.API/Controllers/V1/GeneratorTemplateController.cs b/PARR.API/Controllers/V1/GeneratorTemplateController.cs index 663bed66..c621d254 100644 --- a/PARR.API/Controllers/V1/GeneratorTemplateController.cs +++ b/PARR.API/Controllers/V1/GeneratorTemplateController.cs @@ -52,7 +52,9 @@ namespace PARR.API.Controllers.V1 ApplicationId = request.ApplicationId, Ek = request.Ek, WorkId = request.WorkId, - StatusEk = request.Status + StatusEk = request.Status, + IsActiveTemplate = request.IsActiveTemplate, + IsActiveSchedule = request.IsActiveSchedule }; var msg = JsonSerializer.Serialize(obj); diff --git a/PARR.BLL/Domain/Mq/GeneratorTemplateMq.cs b/PARR.BLL/Domain/Mq/GeneratorTemplateMq.cs index b34ff976..82bb432d 100644 --- a/PARR.BLL/Domain/Mq/GeneratorTemplateMq.cs +++ b/PARR.BLL/Domain/Mq/GeneratorTemplateMq.cs @@ -29,5 +29,15 @@ /// Статус ЭК. Допустимые значения: 0 - все статусы, 1,2,3,4,5,6,7,9 /// public int StatusEk { get; set; } + + /// + /// Активировать шаблон + /// + public bool? IsActiveTemplate { get; set; } + + /// + /// Активировать расписание + /// + public bool? IsActiveSchedule { get; set; } } } diff --git a/PARR.GeneratorTemplates/Services/TemplateManager.cs b/PARR.GeneratorTemplates/Services/TemplateManager.cs index af550c6e..a513afbc 100644 --- a/PARR.GeneratorTemplates/Services/TemplateManager.cs +++ b/PARR.GeneratorTemplates/Services/TemplateManager.cs @@ -113,8 +113,10 @@ namespace PARR.GeneratorTemplates.Services //TODO:!!! //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)), - IsActiveTemplate = true, - IsActiveSchedule = true, + //IsActiveTemplate = true, + //IsActiveSchedule = true, + IsActiveTemplate = query.IsActiveTemplate ?? false, + IsActiveSchedule = query.IsActiveSchedule ?? false, ApplicationInWorkId = appInWork.Id, HostId = host.Id }; @@ -133,6 +135,8 @@ namespace PARR.GeneratorTemplates.Services public async Task DeactivateTemplates(GeneratorTemplateMq query) { + //TODO: !!! тут не учитываются поля query.IsActiveTemplate, query.IsActiveSchedule, просто все деактивируется. !!! + //В таблице AppInWork находим РР, и смотрим ее рабочие группы. Затем по ним будем фильтровать хосты var appInWorkWg = await applicationsInWorkService.Get() .Include(t => t.WorkGroups)