From ccddd98cd6b0ca8e3c3f8b5f745aed36def38ce3 Mon Sep 17 00:00:00 2001 From: psemenkov Date: Tue, 25 Apr 2023 13:59:10 +0300 Subject: [PATCH] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-268=20?= =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D0=BE=D0=BF=D1=82=D0=B8?= =?UTF-8?q?=D0=BC=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8E=20=D0=BA=D0=BE=D0=B4?= =?UTF-8?q?=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../imdg/services/PlannerAllTodayMaker.java | 2 +- clearing-parent/scheduler-service/pom.xml | 4 ++++ .../scheduler/config/PlannerQueueConfig.java | 6 +++--- .../ClearingCalendarValidationConfig.java | 4 ++-- .../validation/PlannerTemplateValidationConfig.java | 8 ++++---- .../config/validation/PlannerValidationConfig.java | 8 ++++---- .../scheduler/service/ClearingCalendarService.java | 6 +++--- .../clearing/scheduler/service/TaskManager.java | 13 ------------- 8 files changed, 21 insertions(+), 30 deletions(-) diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/PlannerAllTodayMaker.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/PlannerAllTodayMaker.java index 4b74e1c97..dde451334 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/PlannerAllTodayMaker.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/PlannerAllTodayMaker.java @@ -62,7 +62,7 @@ public class PlannerAllTodayMaker { List res = new ArrayList<>(); if (needAddFromPlannerTemplate(currentDate, clearingCalendarMap.values())){ - plannerTemplateMap.values().stream().filter(plannerTemplate -> Status.Active.getKey().equals(plannerTemplate.getTaskStatus())) + plannerTemplateMap.values().stream().filter(plannerTemplate -> Status.Active.equalsByKey(plannerTemplate.getTaskStatus())) .forEach(plannerTemplate -> res.add(PlannerAllTodayBuilder.builder().append(plannerTemplate).build())); } return res; diff --git a/clearing-parent/scheduler-service/pom.xml b/clearing-parent/scheduler-service/pom.xml index d607fa83e..c8cfbbc0c 100644 --- a/clearing-parent/scheduler-service/pom.xml +++ b/clearing-parent/scheduler-service/pom.xml @@ -40,6 +40,10 @@ ru.spcex.clearing clearing-validation + + org.springframework.boot + spring-boot-starter-validation + ru.spcex.clearing security-util diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/PlannerQueueConfig.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/PlannerQueueConfig.java index 30b904f93..f7b76882c 100644 --- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/PlannerQueueConfig.java +++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/PlannerQueueConfig.java @@ -8,6 +8,7 @@ import ru.clearing.classes.statics.data.scheduler.PlannerAllToday; import ru.spcex.clearing.scheduler.service.TaskManager; import ru.spcex.platform.utils.log.ExceptionUtils; +import javax.validation.constraints.NotNull; import java.util.Map; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; @@ -16,15 +17,14 @@ import java.util.concurrent.LinkedBlockingQueue; public class PlannerQueueConfig { private static final Logger log = LoggerFactory.getLogger(TaskManager.class); - private static BlockingQueue> plannerQueue; + private final static BlockingQueue> plannerQueue = new LinkedBlockingQueue<>(); @Bean(name = "plannerQueue") public BlockingQueue> plannerQueue() { - plannerQueue = new LinkedBlockingQueue<>(); return plannerQueue; } - public static void addToPlannerQueue(TaskManager.Process process, PlannerAllToday plannerAllToday) { + public static void addToPlannerQueue(@NotNull TaskManager.Process process, @NotNull PlannerAllToday plannerAllToday) { try { plannerQueue.put(Map.entry(process, plannerAllToday)); } catch (InterruptedException e) { diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/validation/ClearingCalendarValidationConfig.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/validation/ClearingCalendarValidationConfig.java index 20728668d..3d7327714 100644 --- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/validation/ClearingCalendarValidationConfig.java +++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/validation/ClearingCalendarValidationConfig.java @@ -43,7 +43,7 @@ public class ClearingCalendarValidationConfig { IMDGDistributedNames.Map_Company, Company.class, ValidationError.CompanyNotFound, - company -> WorkflowStatus.Active.getKey().equals(company.getWorkflowStatus()) ? null : ValidationError.CompanyNotActive), + company -> WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? null : ValidationError.CompanyNotActive), DictionaryPresentRule.instance("dayStatus", ClearingCalendarNewRequest::getDayStatus, IMDGDistributedNames.Map_DayStatusDictionary, @@ -74,7 +74,7 @@ public class ClearingCalendarValidationConfig { IMDGDistributedNames.Map_Company, Company.class, ValidationError.CompanyNotFound, - company -> WorkflowStatus.Active.getKey().equals(company.getWorkflowStatus()) ? null : ValidationError.CompanyNotActive), + company -> WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? null : ValidationError.CompanyNotActive), DictionaryPresentRule.instance("dayStatus", ClearingCalendarUpdateRequest::getDayStatus, IMDGDistributedNames.Map_DayStatusDictionary, diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/validation/PlannerTemplateValidationConfig.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/validation/PlannerTemplateValidationConfig.java index b63fe45b4..e0390eab6 100644 --- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/validation/PlannerTemplateValidationConfig.java +++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/validation/PlannerTemplateValidationConfig.java @@ -55,13 +55,13 @@ public class PlannerTemplateValidationConfig { IMDGDistributedNames.Map_Company, Company.class, ValidationError.CompanyNotFound, - company -> WorkflowStatus.Active.getKey().equals(company.getWorkflowStatus()) ? null : ValidationError.CompanyNotActive), + company -> WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? null : ValidationError.CompanyNotActive), IdPresentRule.instance("securityId", PlannerTemplateNewRequest::getSecurityId, IMDGDistributedNames.Map_Security, Security.class, ValidationError.SecurityNotFound, - security -> WorkflowStatus.Active.getKey().equals(security.getWorkflowStatus()) ? null : ValidationError.SecurityNotActive) + security -> WorkflowStatus.Active.equalsByKey(security.getWorkflowStatus()) ? null : ValidationError.SecurityNotActive) ); }; } @@ -102,14 +102,14 @@ public class PlannerTemplateValidationConfig { Company.class, ValidationError.CompanyNotFound, false, - company -> WorkflowStatus.Active.getKey().equals(company.getWorkflowStatus()) ? null : ValidationError.CompanyNotActive), + company -> WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? null : ValidationError.CompanyNotActive), IdPresentRule.instance("securityId", PlannerTemplateUpdateRequest::getSecurityId, IMDGDistributedNames.Map_Security, Security.class, ValidationError.SecurityNotFound, false, - security -> WorkflowStatus.Active.getKey().equals(security.getWorkflowStatus()) ? null : ValidationError.SecurityNotActive) + security -> WorkflowStatus.Active.equalsByKey(security.getWorkflowStatus()) ? null : ValidationError.SecurityNotActive) ); }; } diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/validation/PlannerValidationConfig.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/validation/PlannerValidationConfig.java index 05e77caf6..c60e0d628 100644 --- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/validation/PlannerValidationConfig.java +++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/validation/PlannerValidationConfig.java @@ -62,13 +62,13 @@ public class PlannerValidationConfig { IMDGDistributedNames.Map_Company, Company.class, ValidationError.CompanyNotFound, - company -> WorkflowStatus.Active.getKey().equals(company.getWorkflowStatus()) ? null : ValidationError.CompanyNotActive), + company -> WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? null : ValidationError.CompanyNotActive), IdPresentRule.instance("securityId", PlannerNewRequest::getSecurityId, IMDGDistributedNames.Map_Security, Security.class, ValidationError.SecurityNotFound, - security -> WorkflowStatus.Active.getKey().equals(security.getWorkflowStatus()) ? null : ValidationError.SecurityNotActive) + security -> WorkflowStatus.Active.equalsByKey(security.getWorkflowStatus()) ? null : ValidationError.SecurityNotActive) ); }; } @@ -117,14 +117,14 @@ public class PlannerValidationConfig { Company.class, ValidationError.CompanyNotFound, false, - company -> WorkflowStatus.Active.getKey().equals(company.getWorkflowStatus()) ? null : ValidationError.CompanyNotActive), + company -> WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? null : ValidationError.CompanyNotActive), IdPresentRule.instance("securityId", PlannerUpdateRequest::getSecurityId, IMDGDistributedNames.Map_Security, Security.class, ValidationError.SecurityNotFound, false, - security -> WorkflowStatus.Active.getKey().equals(security.getWorkflowStatus()) ? null : ValidationError.SecurityNotActive) + security -> WorkflowStatus.Active.equalsByKey(security.getWorkflowStatus()) ? null : ValidationError.SecurityNotActive) ); }; } diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/ClearingCalendarService.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/ClearingCalendarService.java index d53bec1bb..0a8f91cce 100644 --- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/ClearingCalendarService.java +++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/ClearingCalendarService.java @@ -103,7 +103,7 @@ public class ClearingCalendarService extends QueueConsumer implements Initializi clearingCalendarMap.insert(clearingCalendar); log.debug("successfully processed, new id {}", clearingCalendar.getId()); //если clearingCalendar.getClearingDate() сегодняшний день необходимо проверить/добавить plannerTemplate - updateFromPlannerAllTodayMap(clearingCalendar); + createPlannerAllTodayFromPlannerTemplateIfIsValidWorkday(clearingCalendar); return null; } @@ -125,7 +125,7 @@ public class ClearingCalendarService extends QueueConsumer implements Initializi clearingCalendarMap.update(clearingCalendar); log.debug("successfully processed, new id {}", clearingCalendar.getId()); //если clearingCalendar.getClearingDate() сегодняшний день необходимо проверить/добавить plannerTemplate - updateFromPlannerAllTodayMap(clearingCalendar); + createPlannerAllTodayFromPlannerTemplateIfIsValidWorkday(clearingCalendar); return null; } @@ -145,7 +145,7 @@ public class ClearingCalendarService extends QueueConsumer implements Initializi return null; } - private void updateFromPlannerAllTodayMap(ClearingCalendar clearingCalendar) { + private void createPlannerAllTodayFromPlannerTemplateIfIsValidWorkday(ClearingCalendar clearingCalendar) { LocalDate currentDate = LocalDate.now(); if (clearingCalendar.getClearingDate() == null || !clearingCalendar.getClearingDate().equals(currentDate)) return; diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/TaskManager.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/TaskManager.java index fc4e3f3ce..9aed3335e 100644 --- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/TaskManager.java +++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/TaskManager.java @@ -5,7 +5,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.lang.NonNull; import org.springframework.scheduling.TaskScheduler; import org.springframework.stereotype.Service; import ru.clearing.classes.statics.data.scheduler.Launcher; @@ -95,18 +94,6 @@ public class TaskManager implements InitializingBean, AutoCloseable { }); } - private static LocalDateTime dateOldTypeConvert(@NonNull Date oldDate) { - return LocalDateTime.ofInstant(oldDate.toInstant(), ZoneId.systemDefault()); - } - - private static LocalDate dateTypeConvert(@NonNull Date oldDate) { - return dateOldTypeConvert(oldDate).toLocalDate(); - } - - private static LocalTime timeTypeConvert(@NonNull Date oldDate) { - return dateOldTypeConvert(oldDate).toLocalTime(); - } - // --- Обработчики PlannerAllToday --- public void entryAdded(PlannerAllToday task) { String taskStatus = task.getTaskStatus();