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

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

Browse source 
Исправил ошибки.
This commit is contained in:
psemenkov 2023-05-12 14:02:43 +03:00
parent ceb52616b0
commit 32b63823fc
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java
View file

@ -45,8 +45,9 @@ public abstract class AbstractExporterService {
public abstract String getTargetFileName(); public abstract String getTargetFileName();
public void process() { public void process() {
log.debug("Start export {} Lim file", getTargetFileName());
String fileName = getTargetFileName(); String fileName = getTargetFileName();
log.debug("Start export {} Lim file", fileName);
File limFile = new File(fileName); File limFile = new File(fileName);
Path limFilePath = limFile.toPath(); Path limFilePath = limFile.toPath();
@ -78,7 +79,7 @@ public abstract class AbstractExporterService {
return result.toString(); return result.toString();
} }
protected boolean checkNotBloked(Registry registry) { protected boolean checkNotBlocked(Registry registry) {
if (registry.getTradingClearingRegistryId() == null) return false; if (registry.getTradingClearingRegistryId() == null) return false;
TradingClearingRegistry tradingClearingRegistry = tradingClearingRegistryImdg.getSingleObjectByID(registry.getTradingClearingRegistryId()); TradingClearingRegistry tradingClearingRegistry = tradingClearingRegistryImdg.getSingleObjectByID(registry.getTradingClearingRegistryId());
if (tradingClearingRegistry != null && StringUtils.hasText(tradingClearingRegistry.getStatus())) { if (tradingClearingRegistry != null && StringUtils.hasText(tradingClearingRegistry.getStatus())) {

2
clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterService.java
View file

@ -55,7 +55,7 @@ public class MoneyExporterService extends AbstractExporterService {
List<Registry> registriesListA = entryA.getValue(); List<Registry> registriesListA = entryA.getValue();
List<Registry> registriesListB = byTcrD.get(entryA.getKey()); List<Registry> registriesListB = byTcrD.get(entryA.getKey());
for (Registry registryA : registriesListA) { for (Registry registryA : registriesListA) {
if (checkNotBloked(registryA)) { if (checkNotBlocked(registryA)) {
Registry registryD = findRegistryBySecurityId(registryA.getSecurityId(), registriesListB); Registry registryD = findRegistryBySecurityId(registryA.getSecurityId(), registriesListB);
limFileRows.add(getRow(registryA, registryD)); limFileRows.add(getRow(registryA, registryD));
} }

2
clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/SecurityExporterService.java
View file

@ -41,7 +41,7 @@ public class SecurityExporterService extends AbstractExporterService {
"registryCode", "T", "registryCode", "T",
"clearingDate", currentDate)); "clearingDate", currentDate));
for (Registry registry : registries) { for (Registry registry : registries) {
if (checkNotBloked(registry)) { if (checkNotBlocked(registry)) {
limFileRows.add(getRow(registry)); limFileRows.add(getRow(registry));
} }
} }

2
z-distr/src/main/resources/distr/bin/lim-exporter.sh
View file

@ -4,7 +4,7 @@
CLEARING_HOME=/opt/mfd/clearing/ CLEARING_HOME=/opt/mfd/clearing/
cd $CLEARING_HOME/bin 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 & $CMD >/dev/null 2>&1 &