diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/ReturnDepositSessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/ReturnDepositSessionStateMachineConfig.java index 2d693e0e9..f0e495e62 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/ReturnDepositSessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/ReturnDepositSessionStateMachineConfig.java @@ -14,35 +14,27 @@ import org.springframework.statemachine.config.EnumStateMachineConfigurerAdapter import org.springframework.statemachine.config.builders.StateMachineConfigurationConfigurer; import org.springframework.statemachine.config.builders.StateMachineStateConfigurer; import org.springframework.statemachine.config.builders.StateMachineTransitionConfigurer; -import org.springframework.statemachine.guard.Guard; import org.springframework.statemachine.listener.StateMachineListenerAdapter; import ru.clearing.classes.statics.data.misc.Session; import ru.clearing.classes.statics.data.registry.Registry; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.session.stage.TaskType; -import ru.spcex.clearing.session.state.DataEnum; import ru.spcex.clearing.session.state.SsnEvent; import ru.spcex.clearing.session.state.action.CreateSessionAction; -import ru.spcex.clearing.session.state.action.DiscardRegistriesAction; import ru.spcex.clearing.session.state.action.EndStageNotificationAction; import ru.spcex.clearing.session.state.action.FinishingSessionAction; import ru.spcex.clearing.session.state.action.FormingPaymentInstructionDepositReturnAction; import ru.spcex.clearing.session.state.action.InclusionToPoolAction; import ru.spcex.clearing.session.state.action.InspectionObligationsDepositReturnAction; -import ru.spcex.clearing.session.state.action.ObligationAdmissionAction; -import ru.spcex.clearing.session.state.action.RequirementAndObligationCreationAction; import ru.spcex.clearing.session.state.action.ReviseStage1Action; -import ru.spcex.clearing.session.state.action.SaveRegistriesAndContinueAction; import ru.spcex.clearing.session.state.action.Sdf56Action; import ru.spcex.clearing.session.state.action.SdfReceivedAction; import ru.spcex.clearing.session.state.guard.PaymentsWereCreatedListGuard; import ru.spcex.clearing.session.state.guard.PaymentsWereNotCreatedListGuard; import ru.spcex.clearing.session.state.guard.SdfGuard; import ru.spcex.clearing.session.state.guard.SdfGuardExtractorAfterAssets; -import ru.spcex.clearing.session.state.guard.StashedRegistriesPresentGuard; import ru.spcex.clearing.session.state.listener.MachineMonitoringListener; import static ru.spcex.clearing.util.StateMachineUtil.chain; -import static ru.spcex.clearing.util.StateMachineUtil.guardCheckCtxForFlag; import ru.spcex.platform.enumeration.RegistryStatus; import ru.spcex.platform.enumeration.Section; import ru.spcex.platform.enumeration.SessionType; @@ -58,49 +50,30 @@ public class ReturnDepositSessionStateMachineConfig private final Imdg sessionImdg; private final Sdf56Action sendSdf56Action; private final ReviseStage1Action reviseStage1Action; - private final RequirementAndObligationCreationAction reqAndOblAction; - private final ObligationAdmissionAction obligationAdmissionAction; private final InclusionToPoolAction inclusionToPoolAction; private final InspectionObligationsDepositReturnAction inspectionObligationsDepositReturnAction; private final FormingPaymentInstructionDepositReturnAction formingPaymentInstructionDepositReturnAction; private final FinishingSessionAction finishingSessionAction; private final EndStageNotificationAction endStageNotificationAction; - - private final SaveRegistriesAndContinueAction obligationAdmissionContinueAction; - private final DiscardRegistriesAction discardOblAdmStash = - new DiscardRegistriesAction(DataEnum.obligationAdmissionStashedRgs); - private final StashedRegistriesPresentGuard oblAdmGuard = new StashedRegistriesPresentGuard( - DataEnum.obligationAdmissionStashedRgs - ); - private final Guard reviseSuccessGuard = guardCheckCtxForFlag(DataEnum.againReviseSuccess); - private final SessionType SESSION_TYPE = SessionType.XDEP; - @Autowired public ReturnDepositSessionStateMachineConfig( ImdgProvider imdgProvider, Sdf56Action sendSdf56Action, ReviseStage1Action reviseStage1Action, - @Qualifier("requirementAndObligationCreationAction") - RequirementAndObligationCreationAction reqAndOblAction, - ObligationAdmissionAction obligationAdmissionAction, InclusionToPoolAction inclusionToPoolAction, - FinishingSessionAction finishingSessionAction, EndStageNotificationAction endStageNotificationAction, SaveRegistriesAndContinueAction obligationAdmissionContinueAction, @Qualifier("marketCodesForBn") Supplier> marketCodes, InspectionObligationsDepositReturnAction inspectionObligationsDepositReturnAction, FormingPaymentInstructionDepositReturnAction formingPaymentInstructionDepositReturnAction + FinishingSessionAction finishingSessionAction, EndStageNotificationAction endStageNotificationAction, @Qualifier("marketCodesForBn") Supplier> marketCodes, InspectionObligationsDepositReturnAction inspectionObligationsDepositReturnAction, FormingPaymentInstructionDepositReturnAction formingPaymentInstructionDepositReturnAction ) { this.sendSdf56Action = sendSdf56Action; this.sessionImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Session, Session.class); - this.obligationAdmissionContinueAction = obligationAdmissionContinueAction; this.reviseStage1Action = reviseStage1Action; - this.reqAndOblAction = reqAndOblAction; - this.obligationAdmissionAction = obligationAdmissionAction; this.inclusionToPoolAction = inclusionToPoolAction; this.inspectionObligationsDepositReturnAction = inspectionObligationsDepositReturnAction; this.formingPaymentInstructionDepositReturnAction = formingPaymentInstructionDepositReturnAction; this.finishingSessionAction = finishingSessionAction; this.endStageNotificationAction = endStageNotificationAction; this.finishingSessionAction.setPr("4"); - this.obligationAdmissionContinueAction.setDataEnum(DataEnum.obligationAdmissionStashedRgs); Imdg rgsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Registry, Registry.class); ImdgPredicateBuilder rgsPb = rgsImdg.predicateBuilder(); @@ -113,7 +86,6 @@ public class ReturnDepositSessionStateMachineConfig rgsPb.less("valueDate", LocalDate.now()) ) ); - //stages settings: } @Override @@ -139,7 +111,6 @@ public class ReturnDepositSessionStateMachineConfig .end(TaskType.EndStageNotification); } - @Override public void configure(StateMachineTransitionConfigurer transitions) throws Exception { transitions @@ -200,7 +171,6 @@ public class ReturnDepositSessionStateMachineConfig } } - @Override public void configure(StateMachineConfigurationConfigurer config) throws Exception { StateMachineListenerAdapter loggingChangeStateListener