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:
etreschenkov 2023-10-06 14:26:50 +03:00
parent 76a1b74c4b
commit 0522b3a562
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,8 @@ import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.function.Function; import java.util.function.Function;
import static ru.spcex.platform.enumeration.RegistryTradingParams.*; import static ru.spcex.platform.enumeration.RegistryTradingParams.AM_F;
import static ru.spcex.platform.enumeration.RegistryTradingParams.DM_T;
@Service @Service
public class MoneyExporterService extends AbstractExporterService { public class MoneyExporterService extends AbstractExporterService {
@ -56,17 +57,11 @@ public class MoneyExporterService extends AbstractExporterService {
pb.equals("tradingClearingRegistry", registry.getTradingClearingRegistry()), pb.equals("tradingClearingRegistry", registry.getTradingClearingRegistry()),
pb.equals("securityId", registry.getSecurityId()) pb.equals("securityId", registry.getSecurityId())
); );
Function<Registry, ImdgPredicate> prdctDM_I = registry -> pb.and(
pb.sql(RegistryCodeSqlBuilder.getInstance(DM_I).build()),
pb.equals("tradingClearingRegistry", registry.getTradingClearingRegistry()),
pb.equals("securityId", registry.getSecurityId())
);
for (Registry registry : registriesA) { for (Registry registry : registriesA) {
if (checkNotBlocked(registry)) { if (checkNotBlocked(registry)) {
BigDecimal sumPositive = BigDecimal.ZERO; BigDecimal sumPositive = BigDecimal.ZERO;
if (registry.getTradingClearingRegistry() != null && registry.getSecurityId() != null) { if (registry.getTradingClearingRegistry() != null && registry.getSecurityId() != null) {
sumPositive = sumNegativeABS(registryImdg.getCollectionObjectsByPredicate(prdctDM_I.apply(registry)));
sumPositive = sumPositive.add(sum(registryImdg.getCollectionObjectsByPredicate(prdctDM_T.apply(registry)))); sumPositive = sumPositive.add(sum(registryImdg.getCollectionObjectsByPredicate(prdctDM_T.apply(registry))));
} }
limFileRows.add(getRow(registry, sumPositive)); limFileRows.add(getRow(registry, sumPositive));

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

@ -21,7 +21,7 @@ import java.util.List;
import java.util.function.Function; import java.util.function.Function;
import static ru.spcex.platform.enumeration.RegistryTradingParams.AS_F; import static ru.spcex.platform.enumeration.RegistryTradingParams.AS_F;
import static ru.spcex.platform.enumeration.RegistryTradingParams.DS_I; import static ru.spcex.platform.enumeration.RegistryTradingParams.DS_T;
@Service @Service
public class SecurityExporterService extends AbstractExporterService { public class SecurityExporterService extends AbstractExporterService {
@ -50,7 +50,7 @@ public class SecurityExporterService extends AbstractExporterService {
ImdgPredicateBuilder pb = registryImdg.predicateBuilder(); ImdgPredicateBuilder pb = registryImdg.predicateBuilder();
Function<Registry, ImdgPredicate> prdct = registry -> pb.and( Function<Registry, ImdgPredicate> prdct = registry -> pb.and(
pb.sql(RegistryCodeSqlBuilder.getInstance(DS_I).build()), pb.sql(RegistryCodeSqlBuilder.getInstance(DS_T).build()),
pb.equals("registryStatus", RegistryStatus.PROC.getKey()), pb.equals("registryStatus", RegistryStatus.PROC.getKey()),
pb.equals("companyId", registry.getCompanyId()), pb.equals("companyId", registry.getCompanyId()),
pb.equals("tradingClearingRegistry", registry.getTradingClearingRegistry()), pb.equals("tradingClearingRegistry", registry.getTradingClearingRegistry()),

5
platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/RegistryTradingParams.java
View file

@ -92,6 +92,7 @@ public record RegistryTradingParams(RegistryDesignation registryDesignation,
public final static RegistryTradingParams A__T; public final static RegistryTradingParams A__T;
public final static RegistryTradingParams AS_T; public final static RegistryTradingParams AS_T;
public final static RegistryTradingParams DS_I; public final static RegistryTradingParams DS_I;
public final static RegistryTradingParams DS_T;
public final static RegistryTradingParams AS_B; public final static RegistryTradingParams AS_B;
public final static RegistryTradingParams AS_F; public final static RegistryTradingParams AS_F;
public final static RegistryTradingParams CM_T; public final static RegistryTradingParams CM_T;
@ -227,6 +228,10 @@ public record RegistryTradingParams(RegistryDesignation registryDesignation,
RegistryInstrumentType.S, RegistryInstrumentType.S,
null, null,
RegistryUnit.I); RegistryUnit.I);
DS_T = new RegistryTradingParams(RegistryDesignation.D,
RegistryInstrumentType.S,
null,
RegistryUnit.T);
D__I = new RegistryTradingParams(RegistryDesignation.D, D__I = new RegistryTradingParams(RegistryDesignation.D,
null, null,
null, null,