diff --git a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/CurrencyExporterService.java b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/CurrencyExporterService.java index 9e63b1bbb..50fc9551c 100644 --- a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/CurrencyExporterService.java +++ b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/CurrencyExporterService.java @@ -28,13 +28,18 @@ public class CurrencyExporterService extends AbstractExporterService { private final Logger log = LoggerFactory.getLogger(getClass()); private boolean includeCK; + private String moneyLimitTag; public CurrencyExporterService(SFTPConfig.LimGateway gateway, KafkaSender kafkaSender, ImdgProvider imdgProvider, - @Value("${export-lim-service.include-ck:false}") String includeCKStrValue) { + @Value("${export-lim-service.include-ck:false}") String includeCKStrValue, + @Value("${export-lim-service.money-limit-tag:SPVB}") String moneyLimitTag + ) { super(gateway, kafkaSender, imdgProvider); includeCK = Boolean.parseBoolean(includeCKStrValue); + this.moneyLimitTag = moneyLimitTag.trim(); + log.debug("Configured moneyLimitTag={}", this.moneyLimitTag); } @Override @@ -141,7 +146,7 @@ public class CurrencyExporterService extends AbstractExporterService { row.append("MONEY: FIRM_ID = "); row.append(registryA.getTradingCode()); - row.append("; TAG = SPVB"); + row.append("; TAG = ").append(moneyLimitTag); // default SPVB row.append("; CURR_CODE = "); row.append(registryA.getSecuritySymbol()); diff --git a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterService.java b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterService.java index 68db0c706..54dea16af 100644 --- a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterService.java +++ b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterService.java @@ -28,13 +28,17 @@ public class MoneyExporterService extends AbstractExporterService { private final Logger log = LoggerFactory.getLogger(getClass()); private boolean includeCK; + private String moneyLimitTag; public MoneyExporterService(SFTPConfig.LimGateway gateway, KafkaSender kafkaSender, ImdgProvider imdgProvider, - @Value("${export-lim-service.include-ck:false}") String includeCKStrValue) { + @Value("${export-lim-service.include-ck:false}") String includeCKStrValue, + @Value("${export-lim-service.money-limit-tag:SPVB}") String moneyLimitTag) { super(gateway, kafkaSender, imdgProvider); includeCK = Boolean.parseBoolean(includeCKStrValue); + this.moneyLimitTag = moneyLimitTag.trim(); + log.debug("Configured moneyLimitTag={}", this.moneyLimitTag); } @Override @@ -144,7 +148,7 @@ public class MoneyExporterService extends AbstractExporterService { row.append("MONEY: FIRM_ID = "); row.append(registryA.getTradingCode()); - row.append("; TAG = SPVB"); + row.append("; TAG = ").append(moneyLimitTag); // default SPVB row.append("; CURR_CODE = "); row.append(registryA.getSecuritySymbol()); diff --git a/clearing-parent/lim-exporter/src/main/resources/application.properties b/clearing-parent/lim-exporter/src/main/resources/application.properties index c04988f10..228eb716e 100644 --- a/clearing-parent/lim-exporter/src/main/resources/application.properties +++ b/clearing-parent/lim-exporter/src/main/resources/application.properties @@ -28,4 +28,5 @@ export-lim-service.kafka-producer.batch-size=16384 export-lim-service.kafka-producer.linger-ms=1 export-lim-service.kafka-producer.buffer-memory=33554432 -export-lim-service.include-ck=true \ No newline at end of file +export-lim-service.include-ck=true +export-lim-service.money-limit-tag=SPVB \ No newline at end of file diff --git a/clearing-parent/lim-exporter/src/test/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterServiceTest.java b/clearing-parent/lim-exporter/src/test/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterServiceTest.java index b309ec410..363de8faa 100644 --- a/clearing-parent/lim-exporter/src/test/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterServiceTest.java +++ b/clearing-parent/lim-exporter/src/test/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterServiceTest.java @@ -12,7 +12,7 @@ class AbstractExporterServiceTest extends AbstractServiceTest { @Test void sendLimExportedNotification() { - AbstractExporterService moneyExporterService = new MoneyExporterService(null, kafkaSender, imdgProvider, "true"); + AbstractExporterService moneyExporterService = new MoneyExporterService(null, kafkaSender, imdgProvider, "true", "SPVB"); String fileName = "limits_money_202305241832.lim"; moneyExporterService.sendLimExportedNotification(fileName); diff --git a/clearing-parent/lim-exporter/src/test/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterServiceTest.java b/clearing-parent/lim-exporter/src/test/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterServiceTest.java index 49034cf85..78c3eb05a 100644 --- a/clearing-parent/lim-exporter/src/test/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterServiceTest.java +++ b/clearing-parent/lim-exporter/src/test/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterServiceTest.java @@ -63,7 +63,7 @@ class MoneyExporterServiceTest extends AbstractServiceTest { registryImdg.insert(registryT_2); - MoneyExporterService moneyExporterService = new MoneyExporterService(null, kafkaSender, imdgProvider, "true"); + MoneyExporterService moneyExporterService = new MoneyExporterService(null, kafkaSender, imdgProvider, "true", "SPVB"); Collection limFileRows = moneyExporterService.getLimFileRows(); assertEquals(0, limFileRows.size());