diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/settings/AccountServiceSettings.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/settings/AccountServiceSettings.java index 1848ace41..ff1cde091 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/settings/AccountServiceSettings.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/settings/AccountServiceSettings.java @@ -3,6 +3,7 @@ package ru.spcex.clearing.account.config.settings; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.PropertySource; import org.springframework.stereotype.Component; +import ru.spcex.clearing.account.config.settings.elem.AppSettings; import ru.spcex.clearing.platform.messaging.config.element.KafkaConsumerSettings; import ru.spcex.clearing.platform.messaging.config.element.KafkaProducerSettings; import ru.spcex.platform.imdg.iml.hazelcast.config.HazelcastClientParams; @@ -14,6 +15,7 @@ public class AccountServiceSettings { private HazelcastClientParams hazelcast; private KafkaConsumerSettings kafkaConsumer; private KafkaProducerSettings kafkaProducer; + private AppSettings app; public HazelcastClientParams getHazelcast() { return hazelcast; @@ -38,4 +40,12 @@ public class AccountServiceSettings { public void setKafkaProducer(KafkaProducerSettings kafkaProducer) { this.kafkaProducer = kafkaProducer; } + + public AppSettings getApp() { + return app; + } + + public void setApp(AppSettings app) { + this.app = app; + } } diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/settings/elem/AppSettings.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/settings/elem/AppSettings.java new file mode 100644 index 000000000..399cba941 --- /dev/null +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/settings/elem/AppSettings.java @@ -0,0 +1,13 @@ +package ru.spcex.clearing.account.config.settings.elem; + +public class AppSettings { + private String registryUnit = "T"; + + public String getRegistryUnit() { + return registryUnit; + } + + public void setRegistryUnit(String registryUnit) { + this.registryUnit = registryUnit; + } +} diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java index 236093a02..ab24a91f1 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java @@ -27,6 +27,7 @@ import ru.clearing.classes.statics.data.company.CompanySymbols; import ru.clearing.classes.statics.data.company.relation.Relation; import ru.clearing.classes.statics.data.registry.TradingClearingRegistry; import ru.clearing.classes.statics.data.registry.TradingClearingRegistryList; +import ru.spcex.clearing.account.config.settings.AccountServiceSettings; import ru.spcex.clearing.account.errors.AccountError; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; @@ -93,6 +94,7 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini private final IMessageResolver messageResolver; private final Producer kafkaProducer; private final KafkaSender kafkaSender; + private final AccountServiceSettings accountServiceSettings; public TradingClearingRegistryService(Consumer kafkaQueue, Producer kafkaProducer, @@ -107,7 +109,7 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini @Qualifier("tradingClearingRegistryUpdateRequest") Function tradingClearingRegistryUpdateRequestValidator, @Qualifier("tradingClearingRegistryBlockRequest") - Function tradingClearingRegistryBlockRequestValidator) { + Function tradingClearingRegistryBlockRequestValidator, AccountServiceSettings accountServiceSettings) { super(kafkaQueue, kafkaProducer); this.kafkaProducer = kafkaProducer; this.kafkaSender = kafkaSender; @@ -131,6 +133,7 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini this.tradingClearingRegistryUpdateRequestValidator = tradingClearingRegistryUpdateRequestValidator; this.tradingClearingRegistryBlockRequestValidator = tradingClearingRegistryBlockRequestValidator; this.messageResolver = messageResolver; + this.accountServiceSettings = accountServiceSettings; } @Override @@ -444,7 +447,7 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini code = "%4s".formatted(code).replace(' ', '0'); // code += registryPurpose.getKey(); // C / M / ... code += "C";//пока ставим всегда С, возможно придется откатить - String trType = tradingRegistryType + "T"; // 2 символа + String trType = tradingRegistryType + accountServiceSettings.getApp().getRegistryUnit(); // 2 символа code += trType; String sId = "%5s".formatted(id).replace(' ', '0'); if (sId.length() > 5) diff --git a/clearing-parent/account-service/src/main/resources/application.properties b/clearing-parent/account-service/src/main/resources/application.properties index b778da132..3592d4db7 100644 --- a/clearing-parent/account-service/src/main/resources/application.properties +++ b/clearing-parent/account-service/src/main/resources/application.properties @@ -16,4 +16,6 @@ account-service.kafka-producer.acks=all account-service.kafka-producer.retries=0 account-service.kafka-producer.batch-size=16384 account-service.kafka-producer.linger-ms=1 -account-service.kafka-producer.buffer-memory=33554432 \ No newline at end of file +account-service.kafka-producer.buffer-memory=33554432 + +account-service.app.registry-unit=L \ No newline at end of file