From 79d52d96abff254bc8ac7d1998f745a97d6c2e68 Mon Sep 17 00:00:00 2001 From: psemenkov Date: Mon, 21 Aug 2023 17:21:57 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B8=D1=81=D0=BA=20=D0=BF=D0=BE=20clearingDate=20=D0=BF?= =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=BC=D1=83=20=D1=87=D1=82=D0=BE=20=D1=81?= =?UTF-8?q?=D1=82=D0=B0=D1=80=D1=8B=D0=B5=20PlannerAllToday=20=D0=BD=D0=B5?= =?UTF-8?q?=20=D0=B1=D1=83=D0=B4=D1=83=D1=82=20=D1=81=D0=BE=D1=85=D1=80?= =?UTF-8?q?=D0=B0=D0=BD=D1=8F=D1=82=D1=8C=D1=81=D1=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scheduler/PlannerAllTodayBuilder.java | 2 +- .../imdg/services/PlannerAllTodayMaker.java | 3 +- .../scheduler/service/PlannerService.java | 30 ++++++++----------- .../service/PlannerTemplateService.java | 6 ++-- .../scheduler/service/TaskManager.java | 2 +- 5 files changed, 18 insertions(+), 25 deletions(-) diff --git a/clearing-parent/cleaning-builders/src/main/java/ru/spcex/clearing/scheduler/PlannerAllTodayBuilder.java b/clearing-parent/cleaning-builders/src/main/java/ru/spcex/clearing/scheduler/PlannerAllTodayBuilder.java index 9454d9389..7949803d8 100644 --- a/clearing-parent/cleaning-builders/src/main/java/ru/spcex/clearing/scheduler/PlannerAllTodayBuilder.java +++ b/clearing-parent/cleaning-builders/src/main/java/ru/spcex/clearing/scheduler/PlannerAllTodayBuilder.java @@ -33,7 +33,7 @@ public class PlannerAllTodayBuilder { public PlannerAllTodayBuilder append(PlannerTemplate plannerTemplate) { this.task = plannerTemplate.getTask(); this.taskTime = plannerTemplate.getTaskTime(); - this.clearingDate = LocalDate.now(); +// this.clearingDate = LocalDate.now(); this.market = plannerTemplate.getMarket(); this.taskStatus = plannerTemplate.getTaskStatus(); this.section = plannerTemplate.getSection(); 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 02abf6f49..6ab61d4ac 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 @@ -56,8 +56,7 @@ public class PlannerAllTodayMaker { }); listOfPlannerAllToday.stream() .filter(plannerAllToday -> null == getFirstObjectByFieldValues(Map.of( - "parentId", plannerAllToday.getParentId(), - "clearingDate", plannerAllToday.getClearingDate()))) + "parentId", plannerAllToday.getParentId()))) .forEach(plannerAllToday -> { plannerAllToday.setId(hazelcastInstance.getIdGenerator(MAP_SEQUENCE_NAME).newId()); plannerAllTodayMap.put(plannerAllToday.getId(), plannerAllToday); diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerService.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerService.java index 26eb83536..80aca5e96 100644 --- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerService.java +++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerService.java @@ -123,7 +123,7 @@ public class PlannerService extends QueueConsumer implements InitializingBean { LocalDate currentDate = LocalDate.now(); if (planner.getClearingDate() != null && currentDate.equals(planner.getClearingDate()) && !currentDate.equals(req.getClearingDate()) && planner.getTaskStatus() != null) { - cudPlannerAllToday(planner); + deletePlannerAllToday(planner); } planner.setUpdated(Instant.now()); planner.setTask(req.getTask()); @@ -153,13 +153,7 @@ public class PlannerService extends QueueConsumer implements InitializingBean { Planner planner = plannerMap.getSingleObjectByID(req.getId()); plannerMap.delete(planner); - Collection values = plannerAllTodayMap.getCollectionObjectsByFieldValues(Map.of( - "parentId", planner.getId(), - "clearingDate", planner.getClearingDate() != null ? planner.getClearingDate() : LocalDate.now())); - values.forEach(p -> { - plannerAllTodayMap.delete(p); - addToPlannerQueue(TaskManager.Process.delete, p); - }); + deletePlannerAllToday(planner); return null; } @@ -168,8 +162,7 @@ public class PlannerService extends QueueConsumer implements InitializingBean { if (planner.getTaskStatus().equalsIgnoreCase(Status.Active.getKey())) { PlannerAllToday plannerAllToday = PlannerAllTodayBuilder.builder().append(planner).build(); PlannerAllToday oldPlannerAllToday = plannerAllTodayMap.getFirstObjectByFieldValues(Map.of( - "parentId", planner.getId(), - "clearingDate", planner.getClearingDate())); + "parentId", planner.getId())); if (oldPlannerAllToday != null) { plannerAllToday.setId(oldPlannerAllToday.getId()); plannerAllTodayMap.insert(plannerAllToday); @@ -182,13 +175,16 @@ public class PlannerService extends QueueConsumer implements InitializingBean { } if (planner.getTaskStatus().equalsIgnoreCase(Status.Cancel.getKey()) || planner.getTaskStatus().equalsIgnoreCase(Status.Blocked.getKey())) { - Collection values = plannerAllTodayMap.getCollectionObjectsByFieldValues(Map.of( - "parentId", planner.getId(), - "clearingDate", planner.getClearingDate())); - values.forEach(plannerAllToday -> { - plannerAllTodayMap.delete(plannerAllToday); - addToPlannerQueue(TaskManager.Process.delete, plannerAllToday); - }); + deletePlannerAllToday(planner); } } + + private void deletePlannerAllToday(Planner planner){ + Collection values = plannerAllTodayMap.getCollectionObjectsByFieldValues(Map.of( + "parentId", planner.getId())); + values.forEach(p -> { + plannerAllTodayMap.delete(p); + addToPlannerQueue(TaskManager.Process.delete, p); + }); + } } diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerTemplateService.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerTemplateService.java index 1a22df51b..62fecb1bc 100644 --- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerTemplateService.java +++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerTemplateService.java @@ -139,8 +139,7 @@ public class PlannerTemplateService extends QueueConsumer implements Initializin if (todayWorkDay()) { PlannerAllToday plannerAllToday = PlannerAllTodayBuilder.builder().append(plannerTemplate).build(); PlannerAllToday oldPlannerAllToday = plannerAllTodayMap.getFirstObjectByFieldValues(Map.of( - "parentId", plannerTemplate.getId(), - "clearingDate", LocalDate.now())); + "parentId", plannerTemplate.getId())); if (oldPlannerAllToday != null) { plannerAllToday.setId(oldPlannerAllToday.getId()); plannerAllTodayMap.insert(plannerAllToday); @@ -167,8 +166,7 @@ public class PlannerTemplateService extends QueueConsumer implements Initializin if (todayWorkDay()) { PlannerAllToday plannerAllToday = plannerAllTodayMap.getFirstObjectByFieldValues(Map.of( - "parentId", plannerTemplate.getId(), - "clearingDate", LocalDate.now())); + "parentId", plannerTemplate.getId())); if (plannerAllToday != null) { plannerAllTodayMap.delete(plannerAllToday); addToPlannerQueue(TaskManager.Process.delete, plannerAllToday); 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 40e37dce1..628c289f0 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 @@ -158,7 +158,7 @@ public class TaskManager implements InitializingBean, AutoCloseable { // --- Планирование задач --- protected void updateScheduler() { - Collection schedulerAllTodays = plannerAllTodayMap.getCollectionObjectsByFieldValues(Map.of("clearingDate", LocalDate.now())); + Collection schedulerAllTodays = plannerAllTodayMap.getAllValues(); Collection sortedSchedulers = schedulerAllTodays.stream().sorted((o1, o2) -> (Active.equalsByKey(o1.getTaskStatus()) && Cancel.equalsByKey(o2.getTaskStatus())) ? -1 : 0) .collect(Collectors.toCollection(ArrayList::new));