diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/IRegistryBuilder.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/IRegistryBuilder.java index ce13fed8f..6ba960df5 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/IRegistryBuilder.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/IRegistryBuilder.java @@ -17,6 +17,7 @@ import ru.spcex.platform.enumeration.RegistryDesignation; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.iml.hazelcast.adapter.CashV2; import ru.spcex.platform.imdg.iml.hazelcast.adapter.CashV2ById; +import ru.spcex.platform.imdg.iml.hazelcast.adapter.CashV2ByIdAndString; public interface IRegistryBuilder { @@ -33,7 +34,7 @@ public interface IRegistryBuilder { default IRegistryBuilder currCash(CashV2 currCash) {return this;}//CashV2 currCash; default IRegistryBuilder clrAccCash(CashV2 clrAccCash) {return this;}//CashV2 clrAccCash; default IRegistryBuilder ssnCash(CashV2 ssnCash) {return this;}//CashV2 clrAccCash; - default IRegistryBuilder tcrListCash(CashV2 tcrListCash) {return this;} + default IRegistryBuilder tcrListCash(CashV2ByIdAndString tcrListCash) {return this;} default IRegistryBuilder currPairCash(CashV2 currPairCash) {return this;} default IRegistryBuilder currPairDictCash(CashV2 currPairDictCash) {return this;} } diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RegistryCurrBuilder.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RegistryCurrBuilder.java index c43ab9673..eb2717f6d 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RegistryCurrBuilder.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RegistryCurrBuilder.java @@ -37,12 +37,13 @@ import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.predicate.ImdgPredicate; import ru.spcex.platform.imdg.iml.hazelcast.adapter.CashV2; +import ru.spcex.platform.imdg.iml.hazelcast.adapter.CashV2ByIdAndString; public class RegistryCurrBuilder implements IRegistryBuilder { private CashV2 cmpCash; private CashV2 ssnCash; private CashV2 tcrCash; - private CashV2 tcrListCash; + private CashV2ByIdAndString tcrListCash; private CashV2 accCash; private CashV2 currCash; private CashV2 currPairCash; @@ -73,7 +74,7 @@ public class RegistryCurrBuilder implements IRegistryBuilder { this.companyImdg = imdgProvider.getCashingImdg(IMDGDistributedNames.Map_Company, Company.class, cmpCash); this.tradingClearingRegistryImdg = imdgProvider.getCashingImdg(IMDGDistributedNames.Map_TradingClearingRegistry, TradingClearingRegistry.class, tcrCash); Imdg tcrListImdg = imdgProvider.getCashingImdg( - IMDGDistributedNames.Map_TradingClearingRegistryList, TradingClearingRegistryList.class, tcrListCash + IMDGDistributedNames.Map_TradingClearingRegistryList, TradingClearingRegistryList.class, null ); Imdg accountImdg = imdgProvider.getCashingImdg(IMDGDistributedNames.Map_Account, Account.class, accCash); this.sessionImdg = imdgProvider.getCashingImdg(IMDGDistributedNames.Map_Session, Session.class, ssnCash); @@ -82,6 +83,7 @@ public class RegistryCurrBuilder implements IRegistryBuilder { this.currPairDictImdg = imdgProvider.getCashingImdg(IMDGDistributedNames.Map_CurrencyPairDictionary, CurrencyPairDictionary.class, currPairDictCash); this.currencyImdg = imdgProvider.getCashingImdg(IMDGDistributedNames.Map_Currency, Currency.class, null); this.tcrSearcher = new TcrSearcher(tradingClearingRegistryImdg, tcrListImdg, companyImdg, accountImdg); + this.tcrSearcher.setTcrListCash(tcrListCash); return this; } @@ -287,7 +289,7 @@ public class RegistryCurrBuilder implements IRegistryBuilder { } @Override - public IRegistryBuilder tcrListCash(CashV2 tcrListCash) { + public IRegistryBuilder tcrListCash(CashV2ByIdAndString tcrListCash) { this.tcrListCash = tcrListCash; return this; } 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 55d8e2e32..bc7f356e6 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 @@ -54,6 +54,7 @@ import ru.spcex.platform.imdg.api.predicate.specific.RegistryCodeSqlBuilder; import ru.spcex.platform.imdg.iml.hazelcast.adapter.CashCloser; import ru.spcex.platform.imdg.iml.hazelcast.adapter.CashV2; import ru.spcex.platform.imdg.iml.hazelcast.adapter.CashV2ById; +import ru.spcex.platform.imdg.iml.hazelcast.adapter.CashV2ByIdAndString; import ru.spcex.platform.imdg.iml.hazelcast.adapter.CashV2ByString; import ru.spcex.platform.utils.collection.Pair; @@ -352,7 +353,7 @@ public class RequirementsAndObligationCreation implements ISessionStage { private final CashV2 ssnCash; private final CashV2 currPairCash; private final CashV2 currPairDictCash; - private final CashV2 tcrListCash; + private final CashV2ByIdAndString tcrListCash; public RequirementsAndObligationCreationCash() { cashes = new ArrayList<>(); @@ -366,7 +367,7 @@ public class RequirementsAndObligationCreation implements ISessionStage { ssnCash = add(new CashV2ById<>("ssnCash")); currPairCash = add(new CashV2ById<>("currPairCash")); currPairDictCash = add(new CashV2ById<>("currPairDictCash")); - tcrListCash = add(new CashV2ById<>("tcrListCash")); + tcrListCash = add(new CashV2ByIdAndString<>("tcrListCash", tcrList -> new CashV2ByIdAndString.CustomKey(tcrList.getTradingClearingRegistryId(), tcrList.getCurrency()))); } } }