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

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

Browse source
This commit is contained in:
akulikov 2023-12-07 18:52:46 +03:00
parent 2a81e33b78
commit 49b3191a63
5 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoBalanceRegisterService.java
View file

@ -89,6 +89,7 @@ public class DepoBalanceRegisterService extends QueueConsumer implements Initial
}
private ImdgPredicate getPredicateForRegistries(Long companyId) {
Instant now = Instant.now().truncatedTo(ChronoUnit.DAYS);
ImdgPredicateBuilder pb = registryHistoryMap.predicateBuilder();
RegistryCodeSqlBuilder codeSql = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.AS_T);
ImdgPredicate registryPredicate;
@ -102,11 +103,11 @@ public class DepoBalanceRegisterService extends QueueConsumer implements Initial
}
ImdgPredicate finalPredicate = pb.and(
registryPredicate,
pb.equals("object.diffBalance", 0),
pb.zero("object.diffBalance"),
pb.notNull("object.tradingClearingRegistry"),
pb.and(
pb.greatEqual("eventTime", Instant.now().truncatedTo(ChronoUnit.DAYS)),
pb.less("eventTime", Instant.now().plus(1, ChronoUnit.DAYS))
pb.greatEqual("eventTime", now),
pb.less("eventTime", now.plus(1, ChronoUnit.DAYS))
)
);

7
clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java
View file

@ -98,6 +98,7 @@ public class MoneyBalanceRegisterService extends QueueConsumer implements Initia
}
protected ImdgPredicate getSqlForRegistryHistory(Long companyId) {
Instant now = Instant.now().truncatedTo(ChronoUnit.DAYS);
ImdgPredicateBuilder pb = registryHistoryMap.predicateBuilder();
RegistryCodeSqlBuilder codeSql = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.AM_T);
ImdgPredicate registryPredicate;
@ -111,11 +112,11 @@ public class MoneyBalanceRegisterService extends QueueConsumer implements Initia
}
ImdgPredicate finalPredicate = pb.and(
registryPredicate,
pb.equals("object.diffBalance", 0),
pb.zero("object.diffBalance"),
pb.notNull("object.tradingClearingRegistry"),
pb.and(
pb.greatEqual("eventTime", Instant.now().truncatedTo(ChronoUnit.DAYS)),
pb.less("eventTime", Instant.now().plus(1, ChronoUnit.DAYS))
pb.greatEqual("eventTime", now),
pb.less("eventTime", now.plus(1, ChronoUnit.DAYS))
)
);

5
platform-parent/platform-imdg-api-hazelcast-impl/src/main/java/ru/spcex/platform/imdg/iml/hazelcast/adapter/predicate/ImdgPredicateBuilderHazelcast.java
View file

@ -112,4 +112,9 @@ public class ImdgPredicateBuilderHazelcast implements ImdgPredicateBuilder {
public ImdgPredicate alwaysFalse() {
return new ImdgPredicateHazelcast(Predicates.alwaysFalse());
}
@Override
public ImdgPredicate zero(String key) {
return new ImdgPredicateHazelcast(Predicates.between(key, -0.000000000001, 0.000000000001));
}
}

1
platform-parent/platform-imdg-api/src/main/java/ru/spcex/platform/imdg/api/predicate/ImdgPredicateBuilder.java
View file

@ -22,4 +22,5 @@ public interface ImdgPredicateBuilder {
ImdgPredicate alwaysTrue();
ImdgPredicate alwaysFalse();
ImdgPredicate zero(String key);
}

5
platform-parent/platform-imdg-api/src/main/java/ru/spcex/platform/imdg/api/predicate/sql/ImdgPredicateBuilderSqlMock.java
View file

@ -105,6 +105,11 @@ public class ImdgPredicateBuilderSqlMock implements ImdgPredicateBuilder {
return sql("false");
}
@Override
public ImdgPredicate zero(String key) {
return sql(key + " > -0.0000000000001 and " + key + " < 0.0000000000001");
}
static class SimpleSQLPredicate implements ImdgPredicate {
protected String sql;