diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/FinalSessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/FinalSessionStateMachineConfig.java index cbc68c747..245078c2b 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/FinalSessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/FinalSessionStateMachineConfig.java @@ -42,6 +42,7 @@ import ru.spcex.clearing.session.state.guard.StashedRegistriesPresentGuard; import ru.spcex.clearing.session.state.listener.MachineMonitoringListener; import ru.spcex.clearing.util.StateMachineUtil; import static ru.spcex.clearing.util.StateMachineUtil.chain; +import static ru.spcex.clearing.util.StateMachineUtil.invert; import ru.spcex.platform.classes.base.interfaces.ExecutionType; import ru.spcex.platform.enumeration.RegistryStatus; import ru.spcex.platform.enumeration.Section; @@ -195,7 +196,7 @@ public class FinalSessionStateMachineConfig .and() .withExternal() .source(TaskType.ObligationsAdmission).target(TaskType.InclusionToPool) - .guard(ctx -> false) /* invert(oblAdmGuard) */ + .guard(invert(oblAdmGuard)) .action(chain(obligationAdmissionContinueAction, inclusionToPoolAction)) .and() .withExternal() diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/guard/StashedRegistriesPresentGuard.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/guard/StashedRegistriesPresentGuard.java index 22d2c5001..cc89cadfd 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/guard/StashedRegistriesPresentGuard.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/guard/StashedRegistriesPresentGuard.java @@ -1,7 +1,9 @@ package ru.spcex.clearing.session.state.guard; +import java.util.Map; import org.springframework.statemachine.StateContext; import org.springframework.statemachine.guard.Guard; +import ru.clearing.classes.statics.data.registry.Registry; import ru.spcex.clearing.session.stage.TaskType; import ru.spcex.clearing.session.state.DataEnum; import ru.spcex.clearing.session.state.SsnEvent; @@ -15,13 +17,8 @@ public class StashedRegistriesPresentGuard implements Guard @Override public boolean evaluate(StateContext ctx) { - TaskType target = ctx.getTarget().getId(); - return target == TaskType.PSEUDO_waitingForObligationAdmission; -// if (target == TaskType.PSEUDO_waitingForObligationAdmission) { -// return true; -// } -// @SuppressWarnings("unchecked") -// Map rgss = ctx.getExtendedState().get(dataEnum, Map.class); -// return rgss != null && !rgss.isEmpty(); + @SuppressWarnings("unchecked") + Map rgss = ctx.getExtendedState().get(dataEnum, Map.class); + return rgss != null && !rgss.isEmpty(); } } \ No newline at end of file