treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://jira.mfd.msk:8088/browse/CLS-280

Browse source 
---
refactor
This commit is contained in:
aalehin 2023-06-20 19:04:50 +03:00
parent 4382cc5572
commit 7a685c8f0c
7 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoBalanceRegisterService.java
View file

@ -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.BaseRequest;
import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest; import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest;
import ru.spcex.clearing.platform.messaging.service.QueueConsumer; 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.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;
@ -50,7 +49,7 @@ public class DepoBalanceRegisterService extends QueueConsumer implements Initial
public void depoBalanceRegisterNew(BaseRequest<LauncherCommandRequest> userRequest) { public void depoBalanceRegisterNew(BaseRequest<LauncherCommandRequest> userRequest) {
log.debug("LauncherCommandRequest received from {}", createRegistry_GRRT.topic()); log.debug("LauncherCommandRequest received from {}", createRegistry_GRRT.topic());
String sqlForRegistries = getSqlForRegistries(); String sqlForRegistries = getSqlForRegistries(userRequest.getRequestPayload().getCompanyId());
Collection<Registry> registries = registryMap.getCollectionObjectsBySQL(sqlForRegistries); Collection<Registry> registries = registryMap.getCollectionObjectsBySQL(sqlForRegistries);
log.trace("Started searching depoBalanceRegister in register by companyId, sessionId..."); log.trace("Started searching depoBalanceRegister in register by companyId, sessionId...");
if (registries == null) { if (registries == null) {
@ -84,9 +83,8 @@ public class DepoBalanceRegisterService extends QueueConsumer implements Initial
log.debug("inserted successfully DepoBalanceRegister entity with id: {}", depoBalanceRegister.getId()); 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..."); log.trace("Started generating sql predicate for registries...");
return String.format("accountType = '%s'", return String.format("companyId = '%s' registryCode LIKE 'AS_T'", companyId);
AccountType.Depo.getKey());
} }
} }

4
clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterService.java
View file

@ -24,8 +24,8 @@ import java.util.Collection;
import java.util.Map; import java.util.Map;
import static ru.spcex.clearing.registry.util.FieldValuesValidator.getFieldValuesOrThrowException; 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_GORR;
import static ru.spcex.platform.enumeration.Task.createRegistry_GRRT;
@Service @Service
public class DepoPaymentInstructionRegisterService extends QueueConsumer implements InitializingBean { public class DepoPaymentInstructionRegisterService extends QueueConsumer implements InitializingBean {
@ -52,7 +52,7 @@ public class DepoPaymentInstructionRegisterService extends QueueConsumer impleme
public void afterPropertiesSet() { public void afterPropertiesSet() {
callback(LauncherCommandRequest.class) callback(LauncherCommandRequest.class)
.setConsumer(this::depoPaymentInstructionRegisterNew) .setConsumer(this::depoPaymentInstructionRegisterNew)
.forDestination(createRegistry_GRRT.topic(), callbacks::put); .forDestination(createRegistry_GORD.topic(), callbacks::put);
init(); init();
} }

7
clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExcludeLiabilitiesRegisterService.java
View file

@ -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.registry.ExcludeLiabilitiesRegisterNewRequest;
import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest; import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest;
import ru.spcex.clearing.platform.messaging.service.QueueConsumer; 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.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;
import ru.spcex.platform.utils.time.TimeUtil; import ru.spcex.platform.utils.time.TimeUtil;
@ -113,14 +116,12 @@ public class ExcludeLiabilitiesRegisterService extends QueueConsumer implements
private String getSqlForRegistries() { private String getSqlForRegistries() {
return String.format("registryDesignation = '%s' and " + return String.format("registryDesignation = '%s' and " +
"registryInstrumentType in ('%s','%s') and " + "registryInstrumentType in ('%s','%s') and " +
"registryCapacity = '%s' and " +
"registryUnit = '%s' and " + "registryUnit = '%s' and " +
"registryStatus = '%s'" "registryStatus = '%s'"
, ,
RegistryDesignation.O.getKey(), RegistryDesignation.O.getKey(),
RegistryInstrumentType.S.getKey(), RegistryInstrumentType.S.getKey(),
RegistryInstrumentType.M.getKey(), RegistryInstrumentType.M.getKey(),
RegistryCapacity.P.getKey(),
RegistryCode.T.getKey(), RegistryCode.T.getKey(),
RegistryStatus.FAIL.getKey()); RegistryStatus.FAIL.getKey());
} }

2
clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExecutionRegisterService.java
View file

@ -62,7 +62,7 @@ public class ExecutionRegisterService extends QueueConsumer implements Initializ
} }
public void executionRegisterNew(BaseRequest<LauncherCommandRequest> userRequest) { public void executionRegisterNew(BaseRequest<LauncherCommandRequest> userRequest) {
String localDateNow = LocalDate.now().toString(); LocalDate localDateNow = LocalDate.now();
log.debug("ExecutionRegisterNewRequest received"); log.debug("ExecutionRegisterNewRequest received");
Collection<ExecutionFond> collectionFond = executionFondMap.getCollectionObjectsByFieldValues(Map.of("clearingDate", localDateNow)); Collection<ExecutionFond> collectionFond = executionFondMap.getCollectionObjectsByFieldValues(Map.of("clearingDate", localDateNow));
Collection<ExecutionDeposit> collectionDeposit = executionDepositMap.getCollectionObjectsByFieldValues(Map.of("clearingDate", localDateNow)); Collection<ExecutionDeposit> collectionDeposit = executionDepositMap.getCollectionObjectsByFieldValues(Map.of("clearingDate", localDateNow));

3
clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/LiabilitiesRegisterService.java
View file

@ -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.registry.LiabilitiesRegisterNewRequest;
import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest; import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest;
import ru.spcex.clearing.platform.messaging.service.QueueConsumer; 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.RegistryCode;
import ru.spcex.platform.enumeration.RegistryDesignation; import ru.spcex.platform.enumeration.RegistryDesignation;
import ru.spcex.platform.enumeration.RegistryInstrumentType; import ru.spcex.platform.enumeration.RegistryInstrumentType;
@ -125,12 +124,10 @@ public class LiabilitiesRegisterService extends QueueConsumer implements Initial
private String getSqlForRegistries() { private String getSqlForRegistries() {
return String.format("registryDesignation = '%s' and " + return String.format("registryDesignation = '%s' and " +
"registryInstrumentType in ('%s','%s') and " + "registryInstrumentType in ('%s','%s') and " +
"registryCapacity = '%s' and " +
"registryUnit = '%s'", "registryUnit = '%s'",
RegistryDesignation.L.getKey(), RegistryDesignation.L.getKey(),
RegistryInstrumentType.S.getKey(), RegistryInstrumentType.S.getKey(),
RegistryInstrumentType.M.getKey(), RegistryInstrumentType.M.getKey(),
RegistryCapacity.P.getKey(),
RegistryCode.T.getKey()); RegistryCode.T.getKey());
} }
} }

10
clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java
View file

@ -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.BaseRequest;
import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest; import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest;
import ru.spcex.clearing.platform.messaging.service.QueueConsumer; 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.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;
@ -59,7 +58,7 @@ public class MoneyBalanceRegisterService extends QueueConsumer implements Initia
public void moneyBalanceRegisterNew(BaseRequest<LauncherCommandRequest> userRequest) { public void moneyBalanceRegisterNew(BaseRequest<LauncherCommandRequest> userRequest) {
log.debug("LauncherCommandRequest received from {}", createRegistry_GBRR.topic()); log.debug("LauncherCommandRequest received from {}", createRegistry_GBRR.topic());
String sqlConditionForRegistry = getSqlForRegistries(); String sqlConditionForRegistry = getSqlForRegistries(userRequest.getRequestPayload().getCompanyId());
Collection<Registry> registries = registryMap.getCollectionObjectsBySQL(sqlConditionForRegistry); Collection<Registry> registries = registryMap.getCollectionObjectsBySQL(sqlConditionForRegistry);
if (registries == null) { if (registries == null) {
log.debug("No registry with such conditions {}", sqlConditionForRegistry); 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()); log.debug("inserted successfully MoneyBalanceRegister entity with id: {}", moneyBalanceRegister.getId());
} }
private String getSqlForRegistries() { private String getSqlForRegistries(Long companyId) {
return String.format("accountType in ('%s','%s')", log.trace("Started generating sql predicate for registries...");
AccountType.Info.getKey(), return String.format("companyId = '%s' registryCode LIKE 'AM__'", companyId);
AccountType.Clrn.getKey());
} }
} }

2
clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyPaymentInstructionRegisterService.java
View file

@ -59,7 +59,7 @@ public class MoneyPaymentInstructionRegisterService extends QueueConsumer implem
Collection<PaymentInstruction> paymentInstructionBySessionId = Collection<PaymentInstruction> paymentInstructionBySessionId =
paymentInstructionMap.getCollectionObjectsByFieldValues(fieldValuesSessionId); paymentInstructionMap.getCollectionObjectsByFieldValues(fieldValuesSessionId);
for (PaymentInstruction paymentInstruction : paymentInstructionBySessionId) { for (PaymentInstruction paymentInstruction : paymentInstructionBySessionId) {
Map<String, ? extends Comparable<?>> fieldValuesCompanyIdSessionId = getFieldValuesOrThrowException(Map.of("companyId", paymentInstruction.getSenderId(), "sessionId", paymentInstruction.getSessionId())); Map<String, ? extends Comparable<?>> fieldValuesCompanyIdSessionId = getFieldValuesOrThrowException(Map.of("senderId", paymentInstruction.getSenderId(), "date", paymentInstruction.getClearingDate()));
MoneyPaymentInstructionRegister moneyPaymentInstructionRegister = moneyPaymentInstructionRegisterMap.getSingleObjectByFieldValues(fieldValuesCompanyIdSessionId); MoneyPaymentInstructionRegister moneyPaymentInstructionRegister = moneyPaymentInstructionRegisterMap.getSingleObjectByFieldValues(fieldValuesCompanyIdSessionId);
if (moneyPaymentInstructionRegister == null) { if (moneyPaymentInstructionRegister == null) {
insertMoneyPaymentInstructionRegister(paymentInstruction); insertMoneyPaymentInstructionRegister(paymentInstruction);