diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java index 1b78c208f..5d9b341d8 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java @@ -25,8 +25,8 @@ import ru.spcex.clearing.session.stage.impl.FormingPaymentInstructionAssets; import ru.spcex.clearing.session.stage.impl.FormingPaymentInstructionReturnMkr; import ru.spcex.clearing.session.stage.impl.FormingRegistersOnOS; import ru.spcex.clearing.session.stage.impl.InclusionObligations; -import ru.spcex.clearing.session.stage.impl.InspectionObligations; import ru.spcex.clearing.session.stage.impl.InspectionObligationsDepositReturn; +import ru.spcex.clearing.session.stage.impl.InspectionObligationsV2; import ru.spcex.clearing.session.stage.impl.ObligationAdmission; import ru.spcex.clearing.session.stage.impl.PaymentInfo; import ru.spcex.clearing.session.stage.impl.RequirementsAndObligationCreation; @@ -61,7 +61,7 @@ public class FinalMkrSession extends AbstractSession implements InitializingBean private final InclusionObligations inclusionObligations; private final InspectionObligationsDepositReturn inspectionObligationsReturn; - private final InspectionObligations inspectionObligations; + private final InspectionObligationsV2 inspectionObligations; private final FormingRegistersOnOS formingRegistersOnOS; private final FormingPaymentInstructionReturnMkr formingPaymentInstructionReturn; private final FormingPaymentInstructionAssets formingPaymentInstructionDeals; @@ -84,7 +84,7 @@ public class FinalMkrSession extends AbstractSession implements InitializingBean RequirementsAndObligationCreation requirementsAndObligationCreation, ObligationAdmission obligationsAdmission, InclusionObligations inclusionObligations, - InspectionObligations inspectionObligations, FormingRegistersOnOS formingRegistersOnOS, + InspectionObligationsV2 inspectionObligations, FormingRegistersOnOS formingRegistersOnOS, FormingPaymentInstructionReturnMkr formingPaymentInstructionReturn, FormingPaymentInstructionAssets formingPaymentInstructionDeals, UnlockResources unlockResources, FinishingSession finishingSession, diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/IntermediateMkrSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/IntermediateMkrSession.java index 35f20ce72..dd68d0c0d 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/IntermediateMkrSession.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/IntermediateMkrSession.java @@ -23,7 +23,7 @@ import ru.spcex.clearing.session.stage.impl.FinishingSession; import ru.spcex.clearing.session.stage.impl.FormingPaymentInstructionAssets; import ru.spcex.clearing.session.stage.impl.FormingRegistersOnOS; import ru.spcex.clearing.session.stage.impl.InclusionObligations; -import ru.spcex.clearing.session.stage.impl.InspectionObligations; +import ru.spcex.clearing.session.stage.impl.InspectionObligationsV2; import ru.spcex.clearing.session.stage.impl.ObligationAdmission; import ru.spcex.clearing.session.stage.impl.PaymentInfo; import ru.spcex.clearing.session.stage.impl.RequirementsAndObligationCreation; @@ -57,7 +57,7 @@ public class IntermediateMkrSession extends AbstractSession implements Initializ private final ObligationAdmission obligationsAdmission; private final InclusionObligations inclusionObligations; - private final InspectionObligations inspectionObligations; + private final InspectionObligationsV2 inspectionObligations; private final FormingRegistersOnOS formingRegistersOnOS; private final FormingPaymentInstructionAssets formingPaymentInstructionDeals; private final UnlockResources unlockResources; @@ -80,7 +80,7 @@ public class IntermediateMkrSession extends AbstractSession implements Initializ RequirementsAndObligationCreation requirementsAndObligationCreation, ObligationAdmission obligationsAdmission, InclusionObligations inclusionObligations, - InspectionObligations inspectionObligations, FormingRegistersOnOS formingRegistersOnOS, + InspectionObligationsV2 inspectionObligations, FormingRegistersOnOS formingRegistersOnOS, FormingPaymentInstructionAssets formingPaymentInstructionDeals, UnlockResources unlockResources, FinishingSession finishingSession, diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java index c9940200f..e7915c227 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java @@ -23,7 +23,7 @@ import ru.spcex.clearing.session.stage.impl.FinishingSession; import ru.spcex.clearing.session.stage.impl.FormingPaymentInstructionSecurities; import ru.spcex.clearing.session.stage.impl.FormingRegistersOnOS; import ru.spcex.clearing.session.stage.impl.InclusionObligations; -import ru.spcex.clearing.session.stage.impl.InspectionObligations; +import ru.spcex.clearing.session.stage.impl.InspectionObligationsV2; import ru.spcex.clearing.session.stage.impl.ObligationAdmission; import ru.spcex.clearing.session.stage.impl.RequirementsAndObligationCreation; import ru.spcex.clearing.session.stage.impl.UnlockResources; @@ -55,7 +55,7 @@ public class PrimaryAuctionB0Session extends AbstractSession implements Initiali private final ObligationAdmission obligationsAdmission; private final InclusionObligations inclusionObligations; - private final InspectionObligations inspectionObligations; + private final InspectionObligationsV2 inspectionObligations; private final FormingRegistersOnOS formingRegistersOnOS; private final FormingPaymentInstructionSecurities formingPaymentInstruction; //TODO CLRNWORM @@ -86,7 +86,7 @@ public class PrimaryAuctionB0Session extends AbstractSession implements Initiali FinishingSession finishingSession, EndStageNotification endStageNotification, IMessageResolver messageResolver, - InspectionObligations inspectionObligations, + InspectionObligationsV2 inspectionObligations, @Qualifier("marketCodesForBn") Supplier> marketCodes) { super(imdgProvider, messageResolver); this.balanceRevise = balanceRevise; diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java index 815bcd903..074014ad5 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java @@ -23,7 +23,7 @@ import ru.spcex.clearing.session.stage.impl.FinishingSession; import ru.spcex.clearing.session.stage.impl.FormingPaymentInstructionSecurities; import ru.spcex.clearing.session.stage.impl.FormingRegistersOnOS; import ru.spcex.clearing.session.stage.impl.InclusionObligations; -import ru.spcex.clearing.session.stage.impl.InspectionObligations; +import ru.spcex.clearing.session.stage.impl.InspectionObligationsV2; import ru.spcex.clearing.session.stage.impl.ObligationAdmission; import ru.spcex.clearing.session.stage.impl.RequirementsAndObligationCreation; import ru.spcex.clearing.session.stage.impl.UnlockResources; @@ -55,7 +55,7 @@ public class PrimaryAuctionBnSession extends AbstractSession implements Initiali private final ObligationAdmission obligationsAdmission; private final InclusionObligations inclusionObligations; - private final InspectionObligations inspectionObligations; + private final InspectionObligationsV2 inspectionObligations; private final FormingRegistersOnOS formingRegistersOnOS; private final FormingPaymentInstructionSecurities formingPaymentInstruction; // private final FormingPaymentInstruction formingPaymentInstruction; @@ -86,7 +86,7 @@ public class PrimaryAuctionBnSession extends AbstractSession implements Initiali FinishingSession finishingSession, EndStageNotification endStageNotification, IMessageResolver messageResolver, - InspectionObligations inspectionObligations, + InspectionObligationsV2 inspectionObligations, @Qualifier("marketCodesForBn") Supplier> marketCodes) { super(imdgProvider, messageResolver); this.balanceRevise = balanceRevise; diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java index b69820f76..136b442f7 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java @@ -23,7 +23,7 @@ import ru.spcex.clearing.session.stage.impl.FinishingSession; import ru.spcex.clearing.session.stage.impl.FormingPaymentInstructionSecurities; import ru.spcex.clearing.session.stage.impl.FormingRegistersOnOS; import ru.spcex.clearing.session.stage.impl.InclusionObligations; -import ru.spcex.clearing.session.stage.impl.InspectionObligations; +import ru.spcex.clearing.session.stage.impl.InspectionObligationsV2; import ru.spcex.clearing.session.stage.impl.ObligationAdmission; import ru.spcex.clearing.session.stage.impl.RequirementsAndObligationCreation; import ru.spcex.clearing.session.stage.impl.UnlockResources; @@ -55,7 +55,7 @@ public class PrimaryAuctionT0Session extends AbstractSession implements Initiali private final ObligationAdmission obligationsAdmission; private final InclusionObligations inclusionObligations; - private final InspectionObligations inspectionObligations; + private final InspectionObligationsV2 inspectionObligations; private final FormingRegistersOnOS formingRegistersOnOS; private final FormingPaymentInstructionSecurities formingPaymentInstruction; // private final FormingPaymentInstruction formingPaymentInstruction; @@ -86,7 +86,7 @@ public class PrimaryAuctionT0Session extends AbstractSession implements Initiali FinishingSession finishingSession, EndStageNotification endStageNotification, IMessageResolver messageResolver, - InspectionObligations inspectionObligations, + InspectionObligationsV2 inspectionObligations, @Qualifier("marketCodesForT0Primary") Supplier> marketCodes) { super(imdgProvider, messageResolver); this.balanceRevise = balanceRevise; diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/UnitedSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/UnitedSession.java index dcdb06879..965f55d8b 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/UnitedSession.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/UnitedSession.java @@ -21,8 +21,8 @@ import ru.spcex.clearing.session.stage.impl.FinishingSession; import ru.spcex.clearing.session.stage.impl.FormingPaymentInstructionAssets; import ru.spcex.clearing.session.stage.impl.FormingRegistersOnOS; import ru.spcex.clearing.session.stage.impl.InclusionObligations; -import ru.spcex.clearing.session.stage.impl.InspectionObligations; import ru.spcex.clearing.session.stage.impl.InspectionObligationsDepositReturn; +import ru.spcex.clearing.session.stage.impl.InspectionObligationsV2; import ru.spcex.clearing.session.stage.impl.ObligationAdmission; import ru.spcex.clearing.session.stage.impl.PaymentInfo; import ru.spcex.clearing.session.stage.impl.RequirementsAndObligationCreationCompound; @@ -59,8 +59,7 @@ public class UnitedSession extends AbstractSession implements InitializingBean { private final ObligationAdmission obligationsAdmission; private final InclusionObligations inclusionObligations; - private final InspectionObligationsDepositReturn inspectionObligationsReturn; - private final InspectionObligations inspectionObligations; + private final InspectionObligationsV2 inspectionObligations; private final FormingRegistersOnOS formingRegistersOnOS; private final FormingPaymentInstructionAssets formingPaymentInstructionAssets; @@ -90,7 +89,7 @@ public class UnitedSession extends AbstractSession implements InitializingBean { FinishingSession finishingSession, EndStageNotification endStageNotification, IMessageResolver messageResolver, - InspectionObligations inspectionObligations, + InspectionObligationsV2 inspectionObligations, @Qualifier("marketCodesForCurr") Supplier> marketCodesCurr, @Qualifier("marketCodesForT0") Supplier> marketCodesTrdt) { super(imdgProvider, messageResolver); @@ -101,7 +100,6 @@ public class UnitedSession extends AbstractSession implements InitializingBean { this.requirementsAndObligationCreation = requirementsAndObligationCreation; this.obligationsAdmission = obligationsAdmission; this.inclusionObligations = inclusionObligations; - this.inspectionObligationsReturn = inspectionObligationsReturn; this.formingRegistersOnOS = formingRegistersOnOS; this.formingPaymentInstructionAssets = formingPaymentInstructionAssets; this.unlockResources = unlockResources; @@ -118,11 +116,8 @@ public class UnitedSession extends AbstractSession implements InitializingBean { { dealsPrepareCurrency.searchForExecutions(ExecutionType.ExecutionCurrency); ImdgPredicateBuilder pb = executionFondImdg.predicateBuilder(); - dealsPrepareCurrency.addExecutionFondCondition(pb.regex("settlementCode", "^T0.*$")); - dealsPrepareCurrency.addExecutionFondCondition(pb.in("market", marketCodesCurr.get().toArray(new String[0]))); - //dealsPrepareCurrency.addExecutionCurrencyCondition(pb.regex("settlementCode", "^T0.*$")); - //dealsPrepareCurrency.addExecutionCurrencyCondition(pb.in("market", marketCodesCurr.get().toArray(new String[0]))); - + dealsPrepareCurrency.addExecutionCurrencyCondition(pb.regex("settlementCode", "^T0.*$")); + dealsPrepareCurrency.addExecutionCurrencyCondition(pb.in("market", marketCodesCurr.get().toArray(new String[0]))); dealsPrepareTRDT.searchForExecutions(ExecutionType.ExecutionFond); ImdgPredicateBuilder execFondPb = executionFondImdg.predicateBuilder(); dealsPrepareTRDT.addExecutionFondCondition(execFondPb.regex("settlementCode", "^T0.*$")); @@ -133,7 +128,6 @@ public class UnitedSession extends AbstractSession implements InitializingBean { } //1 шаг deals prepare вызываем 3 раза с разными параметрами объединяемых сессий inclusionObligations.setSessionType(sessionType()); - inspectionObligationsReturn.setSessionType(sessionType()); inspectionObligations.setSection(section()); inspectionObligations.setSessionType(sessionType()); formingPaymentInstructionAssets.setSessionType(sessionType()); @@ -228,8 +222,6 @@ public class UnitedSession extends AbstractSession implements InitializingBean { InspectionPoolPayload companyIdPayload = new InspectionPoolPayload(); companyIdPayload.setSessionId(currSession.getId()); companyIdPayload.setProcessedCompanyId(currSession.getCompanyId()); - //fixme checks inside the stages - //runStage(TaskType.InspectionObligations, companyIdPayload, inspectionObligationsReturn); runStage(TaskType.InspectionObligations, companyIdPayload, inspectionObligations); } diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RequirementsAndObligationCreation.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RequirementsAndObligationCreation.java index bc7f356e6..3ef9a7889 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RequirementsAndObligationCreation.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RequirementsAndObligationCreation.java @@ -67,7 +67,7 @@ public class RequirementsAndObligationCreation implements ISessionStage { private final Logger log = LoggerFactory.getLogger(getClass()); private final Imdg registryImdg; private final ImdgProvider imdgProvider; - private final RequirementsAndObligationCreationCash cash; + protected final RequirementsAndObligationCreationCash cash; @Autowired @@ -342,18 +342,18 @@ public class RequirementsAndObligationCreation implements ISessionStage { void accept(T1 t1, T2 t2, T3 t3); } - private static class RequirementsAndObligationCreationCash extends CashCloser { - private final CashV2 cmpCash; - private final CashV2 tcrCash; - private final CashV2 accCash; - private final CashV2 dpAccCash; - private final CashV2ById scrtCash; - private final CashV2 currCash; - private final CashV2 clrAccCash; - private final CashV2 ssnCash; - private final CashV2 currPairCash; - private final CashV2 currPairDictCash; - private final CashV2ByIdAndString tcrListCash; + protected static class RequirementsAndObligationCreationCash extends CashCloser { + protected final CashV2 cmpCash; + protected final CashV2 tcrCash; + protected final CashV2 accCash; + protected final CashV2 dpAccCash; + protected final CashV2ById scrtCash; + protected final CashV2 currCash; + protected final CashV2 clrAccCash; + protected final CashV2 ssnCash; + protected final CashV2 currPairCash; + protected final CashV2 currPairDictCash; + protected final CashV2ByIdAndString tcrListCash; public RequirementsAndObligationCreationCash() { cashes = new ArrayList<>(); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RequirementsAndObligationCreationCompound.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RequirementsAndObligationCreationCompound.java index e41c4b54e..8d6bcdd3b 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RequirementsAndObligationCreationCompound.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RequirementsAndObligationCreationCompound.java @@ -39,7 +39,7 @@ public class RequirementsAndObligationCreationCompound extends RequirementsAndOb @Override public StageResult submit(Task task) { if (task.getTaskType() == TaskType.RequirementsAndObligationsCreate) { - try { + try (cash) { return mergeReqsAndClaims((RequirementsAndObligationCreationCompoundPayload) task.getData()); } finally { this.doRgsSearch = null;