treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Удалил поиск по clearingDate потому что старые PlannerAllToday не будут сохраняться.

Browse source
This commit is contained in:
psemenkov 2023-08-21 17:21:57 +03:00
parent ae3abdb638
commit 79d52d96ab
5 changed files with 18 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/cleaning-builders/src/main/java/ru/spcex/clearing/scheduler/PlannerAllTodayBuilder.java
View file

@ -33,7 +33,7 @@ public class PlannerAllTodayBuilder {
public PlannerAllTodayBuilder append(PlannerTemplate plannerTemplate) { public PlannerAllTodayBuilder append(PlannerTemplate plannerTemplate) {
this.task = plannerTemplate.getTask(); this.task = plannerTemplate.getTask();
this.taskTime = plannerTemplate.getTaskTime(); this.taskTime = plannerTemplate.getTaskTime();
this.clearingDate = LocalDate.now(); // this.clearingDate = LocalDate.now();
this.market = plannerTemplate.getMarket(); this.market = plannerTemplate.getMarket();
this.taskStatus = plannerTemplate.getTaskStatus(); this.taskStatus = plannerTemplate.getTaskStatus();
this.section = plannerTemplate.getSection(); this.section = plannerTemplate.getSection();

3
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/PlannerAllTodayMaker.java
View file

@ -56,8 +56,7 @@ public class PlannerAllTodayMaker {
}); });
listOfPlannerAllToday.stream() listOfPlannerAllToday.stream()
.filter(plannerAllToday -> null == getFirstObjectByFieldValues(Map.of( .filter(plannerAllToday -> null == getFirstObjectByFieldValues(Map.of(
"parentId", plannerAllToday.getParentId(), "parentId", plannerAllToday.getParentId())))
"clearingDate", plannerAllToday.getClearingDate())))
.forEach(plannerAllToday -> { .forEach(plannerAllToday -> {
plannerAllToday.setId(hazelcastInstance.getIdGenerator(MAP_SEQUENCE_NAME).newId()); plannerAllToday.setId(hazelcastInstance.getIdGenerator(MAP_SEQUENCE_NAME).newId());
plannerAllTodayMap.put(plannerAllToday.getId(), plannerAllToday); plannerAllTodayMap.put(plannerAllToday.getId(), plannerAllToday);

30
clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerService.java
View file

@ -123,7 +123,7 @@ public class PlannerService extends QueueConsumer implements InitializingBean {
LocalDate currentDate = LocalDate.now(); LocalDate currentDate = LocalDate.now();
if (planner.getClearingDate() != null && currentDate.equals(planner.getClearingDate()) if (planner.getClearingDate() != null && currentDate.equals(planner.getClearingDate())
&& !currentDate.equals(req.getClearingDate()) && planner.getTaskStatus() != null) { && !currentDate.equals(req.getClearingDate()) && planner.getTaskStatus() != null) {
cudPlannerAllToday(planner); deletePlannerAllToday(planner);
} }
planner.setUpdated(Instant.now()); planner.setUpdated(Instant.now());
planner.setTask(req.getTask()); planner.setTask(req.getTask());
@ -153,13 +153,7 @@ public class PlannerService extends QueueConsumer implements InitializingBean {
Planner planner = plannerMap.getSingleObjectByID(req.getId()); Planner planner = plannerMap.getSingleObjectByID(req.getId());
plannerMap.delete(planner); plannerMap.delete(planner);
Collection<PlannerAllToday> values = plannerAllTodayMap.getCollectionObjectsByFieldValues(Map.of( deletePlannerAllToday(planner);
"parentId", planner.getId(),
"clearingDate", planner.getClearingDate() != null ? planner.getClearingDate() : LocalDate.now()));
values.forEach(p -> {
plannerAllTodayMap.delete(p);
addToPlannerQueue(TaskManager.Process.delete, p);
});
return null; return null;
} }
@ -168,8 +162,7 @@ public class PlannerService extends QueueConsumer implements InitializingBean {
if (planner.getTaskStatus().equalsIgnoreCase(Status.Active.getKey())) { if (planner.getTaskStatus().equalsIgnoreCase(Status.Active.getKey())) {
PlannerAllToday plannerAllToday = PlannerAllTodayBuilder.builder().append(planner).build(); PlannerAllToday plannerAllToday = PlannerAllTodayBuilder.builder().append(planner).build();
PlannerAllToday oldPlannerAllToday = plannerAllTodayMap.getFirstObjectByFieldValues(Map.of( PlannerAllToday oldPlannerAllToday = plannerAllTodayMap.getFirstObjectByFieldValues(Map.of(
"parentId", planner.getId(), "parentId", planner.getId()));
"clearingDate", planner.getClearingDate()));
if (oldPlannerAllToday != null) { if (oldPlannerAllToday != null) {
plannerAllToday.setId(oldPlannerAllToday.getId()); plannerAllToday.setId(oldPlannerAllToday.getId());
plannerAllTodayMap.insert(plannerAllToday); 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())) { if (planner.getTaskStatus().equalsIgnoreCase(Status.Cancel.getKey()) || planner.getTaskStatus().equalsIgnoreCase(Status.Blocked.getKey())) {
Collection<PlannerAllToday> values = plannerAllTodayMap.getCollectionObjectsByFieldValues(Map.of( deletePlannerAllToday(planner);
"parentId", planner.getId(),
"clearingDate", planner.getClearingDate()));
values.forEach(plannerAllToday -> {
plannerAllTodayMap.delete(plannerAllToday);
addToPlannerQueue(TaskManager.Process.delete, plannerAllToday);
});
} }
} }
private void deletePlannerAllToday(Planner planner){
Collection<PlannerAllToday> values = plannerAllTodayMap.getCollectionObjectsByFieldValues(Map.of(
"parentId", planner.getId()));
values.forEach(p -> {
plannerAllTodayMap.delete(p);
addToPlannerQueue(TaskManager.Process.delete, p);
});
}
} }

6
clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerTemplateService.java
View file

@ -139,8 +139,7 @@ public class PlannerTemplateService extends QueueConsumer implements Initializin
if (todayWorkDay()) { if (todayWorkDay()) {
PlannerAllToday plannerAllToday = PlannerAllTodayBuilder.builder().append(plannerTemplate).build(); PlannerAllToday plannerAllToday = PlannerAllTodayBuilder.builder().append(plannerTemplate).build();
PlannerAllToday oldPlannerAllToday = plannerAllTodayMap.getFirstObjectByFieldValues(Map.of( PlannerAllToday oldPlannerAllToday = plannerAllTodayMap.getFirstObjectByFieldValues(Map.of(
"parentId", plannerTemplate.getId(), "parentId", plannerTemplate.getId()));
"clearingDate", LocalDate.now()));
if (oldPlannerAllToday != null) { if (oldPlannerAllToday != null) {
plannerAllToday.setId(oldPlannerAllToday.getId()); plannerAllToday.setId(oldPlannerAllToday.getId());
plannerAllTodayMap.insert(plannerAllToday); plannerAllTodayMap.insert(plannerAllToday);
@ -167,8 +166,7 @@ public class PlannerTemplateService extends QueueConsumer implements Initializin
if (todayWorkDay()) { if (todayWorkDay()) {
PlannerAllToday plannerAllToday = plannerAllTodayMap.getFirstObjectByFieldValues(Map.of( PlannerAllToday plannerAllToday = plannerAllTodayMap.getFirstObjectByFieldValues(Map.of(
"parentId", plannerTemplate.getId(), "parentId", plannerTemplate.getId()));
"clearingDate", LocalDate.now()));
if (plannerAllToday != null) { if (plannerAllToday != null) {
plannerAllTodayMap.delete(plannerAllToday); plannerAllTodayMap.delete(plannerAllToday);
addToPlannerQueue(TaskManager.Process.delete, plannerAllToday); addToPlannerQueue(TaskManager.Process.delete, plannerAllToday);

2
clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/TaskManager.java
View file

@ -158,7 +158,7 @@ public class TaskManager implements InitializingBean, AutoCloseable {
// --- Планирование задач --- // --- Планирование задач ---
protected void updateScheduler() { protected void updateScheduler() {
Collection<PlannerAllToday> schedulerAllTodays = plannerAllTodayMap.getCollectionObjectsByFieldValues(Map.of("clearingDate", LocalDate.now())); Collection<PlannerAllToday> schedulerAllTodays = plannerAllTodayMap.getAllValues();
Collection<PlannerAllToday> sortedSchedulers = Collection<PlannerAllToday> sortedSchedulers =
schedulerAllTodays.stream().sorted((o1, o2) -> (Active.equalsByKey(o1.getTaskStatus()) && Cancel.equalsByKey(o2.getTaskStatus())) ? -1 : 0) schedulerAllTodays.stream().sorted((o1, o2) -> (Active.equalsByKey(o1.getTaskStatus()) && Cancel.equalsByKey(o2.getTaskStatus())) ? -1 : 0)
.collect(Collectors.toCollection(ArrayList::new)); .collect(Collectors.toCollection(ArrayList::new));