diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoBalanceRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoBalanceRegisterService.java index 712b065f8..70eab9abb 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoBalanceRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoBalanceRegisterService.java @@ -13,7 +13,6 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest; import ru.spcex.clearing.platform.messaging.service.QueueConsumer; -import ru.spcex.platform.enumeration.AccountType; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; @@ -50,7 +49,7 @@ public class DepoBalanceRegisterService extends QueueConsumer implements Initial public void depoBalanceRegisterNew(BaseRequest userRequest) { log.debug("LauncherCommandRequest received from {}", createRegistry_GRRT.topic()); - String sqlForRegistries = getSqlForRegistries(); + String sqlForRegistries = getSqlForRegistries(userRequest.getRequestPayload().getCompanyId()); Collection registries = registryMap.getCollectionObjectsBySQL(sqlForRegistries); log.trace("Started searching depoBalanceRegister in register by companyId, sessionId..."); if (registries == null) { @@ -84,9 +83,8 @@ public class DepoBalanceRegisterService extends QueueConsumer implements Initial log.debug("inserted successfully DepoBalanceRegister entity with id: {}", depoBalanceRegister.getId()); } - private String getSqlForRegistries() { + private String getSqlForRegistries(Long companyId) { log.trace("Started generating sql predicate for registries..."); - return String.format("accountType = '%s'", - AccountType.Depo.getKey()); + return String.format("companyId = '%s' registryCode LIKE 'AS_T'", companyId); } } \ No newline at end of file diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterService.java index edfb78671..5b8f04416 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterService.java @@ -24,8 +24,8 @@ import java.util.Collection; import java.util.Map; import static ru.spcex.clearing.registry.util.FieldValuesValidator.getFieldValuesOrThrowException; +import static ru.spcex.platform.enumeration.Task.createRegistry_GORD; import static ru.spcex.platform.enumeration.Task.createRegistry_GORR; -import static ru.spcex.platform.enumeration.Task.createRegistry_GRRT; @Service public class DepoPaymentInstructionRegisterService extends QueueConsumer implements InitializingBean { @@ -52,7 +52,7 @@ public class DepoPaymentInstructionRegisterService extends QueueConsumer impleme public void afterPropertiesSet() { callback(LauncherCommandRequest.class) .setConsumer(this::depoPaymentInstructionRegisterNew) - .forDestination(createRegistry_GRRT.topic(), callbacks::put); + .forDestination(createRegistry_GORD.topic(), callbacks::put); init(); } diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExcludeLiabilitiesRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExcludeLiabilitiesRegisterService.java index 5546df5ab..919bba9b0 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExcludeLiabilitiesRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExcludeLiabilitiesRegisterService.java @@ -17,7 +17,10 @@ import ru.spcex.clearing.platform.messaging.domain.Consts; import ru.spcex.clearing.platform.messaging.domain.cud.registry.ExcludeLiabilitiesRegisterNewRequest; import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest; import ru.spcex.clearing.platform.messaging.service.QueueConsumer; -import ru.spcex.platform.enumeration.*; +import ru.spcex.platform.enumeration.RegistryCode; +import ru.spcex.platform.enumeration.RegistryDesignation; +import ru.spcex.platform.enumeration.RegistryInstrumentType; +import ru.spcex.platform.enumeration.RegistryStatus; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.utils.time.TimeUtil; @@ -113,14 +116,12 @@ public class ExcludeLiabilitiesRegisterService extends QueueConsumer implements private String getSqlForRegistries() { return String.format("registryDesignation = '%s' and " + "registryInstrumentType in ('%s','%s') and " + - "registryCapacity = '%s' and " + "registryUnit = '%s' and " + "registryStatus = '%s'" , RegistryDesignation.O.getKey(), RegistryInstrumentType.S.getKey(), RegistryInstrumentType.M.getKey(), - RegistryCapacity.P.getKey(), RegistryCode.T.getKey(), RegistryStatus.FAIL.getKey()); } diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExecutionRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExecutionRegisterService.java index 6ba8f190f..f0f6de0d4 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExecutionRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExecutionRegisterService.java @@ -62,7 +62,7 @@ public class ExecutionRegisterService extends QueueConsumer implements Initializ } public void executionRegisterNew(BaseRequest userRequest) { - String localDateNow = LocalDate.now().toString(); + LocalDate localDateNow = LocalDate.now(); log.debug("ExecutionRegisterNewRequest received"); Collection collectionFond = executionFondMap.getCollectionObjectsByFieldValues(Map.of("clearingDate", localDateNow)); Collection collectionDeposit = executionDepositMap.getCollectionObjectsByFieldValues(Map.of("clearingDate", localDateNow)); diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/LiabilitiesRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/LiabilitiesRegisterService.java index c42e48ba4..703033ae7 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/LiabilitiesRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/LiabilitiesRegisterService.java @@ -18,7 +18,6 @@ import ru.spcex.clearing.platform.messaging.domain.Consts; import ru.spcex.clearing.platform.messaging.domain.cud.registry.LiabilitiesRegisterNewRequest; import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest; import ru.spcex.clearing.platform.messaging.service.QueueConsumer; -import ru.spcex.platform.enumeration.RegistryCapacity; import ru.spcex.platform.enumeration.RegistryCode; import ru.spcex.platform.enumeration.RegistryDesignation; import ru.spcex.platform.enumeration.RegistryInstrumentType; @@ -125,12 +124,10 @@ public class LiabilitiesRegisterService extends QueueConsumer implements Initial private String getSqlForRegistries() { return String.format("registryDesignation = '%s' and " + "registryInstrumentType in ('%s','%s') and " + - "registryCapacity = '%s' and " + "registryUnit = '%s'", RegistryDesignation.L.getKey(), RegistryInstrumentType.S.getKey(), RegistryInstrumentType.M.getKey(), - RegistryCapacity.P.getKey(), RegistryCode.T.getKey()); } } diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java index 259ebc713..0dc17aa56 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java @@ -16,7 +16,6 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest; import ru.spcex.clearing.platform.messaging.service.QueueConsumer; -import ru.spcex.platform.enumeration.AccountType; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; @@ -59,7 +58,7 @@ public class MoneyBalanceRegisterService extends QueueConsumer implements Initia public void moneyBalanceRegisterNew(BaseRequest userRequest) { log.debug("LauncherCommandRequest received from {}", createRegistry_GBRR.topic()); - String sqlConditionForRegistry = getSqlForRegistries(); + String sqlConditionForRegistry = getSqlForRegistries(userRequest.getRequestPayload().getCompanyId()); Collection registries = registryMap.getCollectionObjectsBySQL(sqlConditionForRegistry); if (registries == null) { log.debug("No registry with such conditions {}", sqlConditionForRegistry); @@ -114,10 +113,9 @@ public class MoneyBalanceRegisterService extends QueueConsumer implements Initia log.debug("inserted successfully MoneyBalanceRegister entity with id: {}", moneyBalanceRegister.getId()); } - private String getSqlForRegistries() { - return String.format("accountType in ('%s','%s')", - AccountType.Info.getKey(), - AccountType.Clrn.getKey()); + private String getSqlForRegistries(Long companyId) { + log.trace("Started generating sql predicate for registries..."); + return String.format("companyId = '%s' registryCode LIKE 'AM__'", companyId); } } diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyPaymentInstructionRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyPaymentInstructionRegisterService.java index 6b705b6da..6abcc94d9 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyPaymentInstructionRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyPaymentInstructionRegisterService.java @@ -59,7 +59,7 @@ public class MoneyPaymentInstructionRegisterService extends QueueConsumer implem Collection paymentInstructionBySessionId = paymentInstructionMap.getCollectionObjectsByFieldValues(fieldValuesSessionId); for (PaymentInstruction paymentInstruction : paymentInstructionBySessionId) { - Map> fieldValuesCompanyIdSessionId = getFieldValuesOrThrowException(Map.of("companyId", paymentInstruction.getSenderId(), "sessionId", paymentInstruction.getSessionId())); + Map> fieldValuesCompanyIdSessionId = getFieldValuesOrThrowException(Map.of("senderId", paymentInstruction.getSenderId(), "date", paymentInstruction.getClearingDate())); MoneyPaymentInstructionRegister moneyPaymentInstructionRegister = moneyPaymentInstructionRegisterMap.getSingleObjectByFieldValues(fieldValuesCompanyIdSessionId); if (moneyPaymentInstructionRegister == null) { insertMoneyPaymentInstructionRegister(paymentInstruction);