diff --git a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java index 5384a6358..81013af4c 100644 --- a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java +++ b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java @@ -45,8 +45,9 @@ public abstract class AbstractExporterService { public abstract String getTargetFileName(); public void process() { - log.debug("Start export {} Lim file", getTargetFileName()); String fileName = getTargetFileName(); + log.debug("Start export {} Lim file", fileName); + File limFile = new File(fileName); Path limFilePath = limFile.toPath(); @@ -78,7 +79,7 @@ public abstract class AbstractExporterService { return result.toString(); } - protected boolean checkNotBloked(Registry registry) { + protected boolean checkNotBlocked(Registry registry) { if (registry.getTradingClearingRegistryId() == null) return false; TradingClearingRegistry tradingClearingRegistry = tradingClearingRegistryImdg.getSingleObjectByID(registry.getTradingClearingRegistryId()); if (tradingClearingRegistry != null && StringUtils.hasText(tradingClearingRegistry.getStatus())) { 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 324feffe2..5a9d14b9f 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 @@ -55,7 +55,7 @@ public class MoneyExporterService extends AbstractExporterService { List registriesListA = entryA.getValue(); List registriesListB = byTcrD.get(entryA.getKey()); for (Registry registryA : registriesListA) { - if (checkNotBloked(registryA)) { + if (checkNotBlocked(registryA)) { Registry registryD = findRegistryBySecurityId(registryA.getSecurityId(), registriesListB); limFileRows.add(getRow(registryA, registryD)); } diff --git a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/SecurityExporterService.java b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/SecurityExporterService.java index 46bc2f382..bece85a3c 100644 --- a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/SecurityExporterService.java +++ b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/SecurityExporterService.java @@ -41,7 +41,7 @@ public class SecurityExporterService extends AbstractExporterService { "registryCode", "T", "clearingDate", currentDate)); for (Registry registry : registries) { - if (checkNotBloked(registry)) { + if (checkNotBlocked(registry)) { limFileRows.add(getRow(registry)); } } diff --git a/z-distr/src/main/resources/distr/bin/lim-exporter.sh b/z-distr/src/main/resources/distr/bin/lim-exporter.sh index 656f44ce2..3aca98abb 100644 --- a/z-distr/src/main/resources/distr/bin/lim-exporter.sh +++ b/z-distr/src/main/resources/distr/bin/lim-exporter.sh @@ -4,7 +4,7 @@ CLEARING_HOME=/opt/mfd/clearing/ cd $CLEARING_HOME/bin -CMD="java -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=7090 -jar lim-exporter.jar --spring.config.location=$CLEARING_HOME/settings/lim-exporter/" +CMD="java -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=7110 -jar lim-exporter.jar --spring.config.location=$CLEARING_HOME/settings/lim-exporter/" $CMD >/dev/null 2>&1 &