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

imdg http://jira.mfd.msk:8088/browse/CLS-473 поправил ограничение по дате на ExecutionFondMapStore, рефакторинг

Browse source
This commit is contained in:
AKurakin 2023-08-22 10:50:22 +03:00
parent 91d31132be
commit bc101f6cb4
5 changed files with 9 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/SimpleObjectMapStore.java
View file

@ -126,14 +126,15 @@ public abstract class SimpleObjectMapStore<T extends SpcexObjectBase> implements
* Выгружает ID по таблице по условию dateField >= today
*
* @param dateField поле даты
* @param canBeGreat true - используется условие >= today, иначе строгое =
* @return ID's
*/
public Iterable<Long> defaultLoadAllKeysOnTodayByField(String dateField) {
public Iterable<Long> defaultLoadAllKeysOnTodayByField(String dateField, boolean canBeGreat) {
LocalDate today = LocalDate.now();
log.debug("loadAllKeys from {} on {} >= today {}", getTableName(), dateField, today);
log.debug("loadAllKeys from {} on {} {} today", getTableName(), dateField, canBeGreat ? ">=" : "=");
List<Long> keys;
try {
keys = jdbcTemplate.query("select id from " + getTableName() + " where " + dateField + " >= ?",
keys = jdbcTemplate.query("select id from " + getTableName() + " where " + dateField + (canBeGreat ? " >= ?" : " = ?"),
(resultSet, i) -> resultSet.getLong("id"),
new Object[]{today});
} catch (Throwable e) {
@ -144,7 +145,7 @@ public abstract class SimpleObjectMapStore<T extends SpcexObjectBase> implements
}
public Iterable<Long> defaultLoadAllKeysOnTodayByTradingDate() {
return defaultLoadAllKeysOnTodayByField("trading_date");
return defaultLoadAllKeysOnTodayByField("trading_date", false);
}
protected void batchInsertUpdate(@NonNull String insertStatement, @NonNull List<Object[]> args) {

2
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/ExecutionFondMapStore.java
View file

@ -37,7 +37,7 @@ public class ExecutionFondMapStore extends TemplateMapStore<ExecutionFond> {
@Override
public Iterable<Long> loadAllKeys() {
return defaultLoadAllKeysOnTodayByField("SETTLEMENT_DATE");
return defaultLoadAllKeysOnTodayByField("SETTLEMENT_DATE", true);
}
@Override

12
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/StatementMapStore.java
View file

@ -40,17 +40,7 @@ public class StatementMapStore extends TemplateMapStore<Statement> {
@Override
public Iterable<Long> loadAllKeys() {
log.debug("loadAllKeys from " + getTableName());
List<Long> keys;
try {
keys = jdbcTemplate.query("select id from " + getTableName() + " where clearing_date = ?",
new Object[]{LocalDate.now()},
(resultSet, i) -> resultSet.getLong("id"));
} catch (Throwable e) {
log.error("{}", ExceptionUtils.getStackTrace(e));
throw e;
}
return keys;
return defaultLoadAllKeysOnTodayByField("clearing_date", false);
}
@Override

12
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/NotificationMapStore.java
View file

@ -39,17 +39,7 @@ public class NotificationMapStore extends TemplateMapStore<Notification> {
@Override
public Iterable<Long> loadAllKeys() {
log.debug("loadAllKeys from " + getTableName());
List<Long> keys;
try {
keys = jdbcTemplate.query("select id from " + getTableName() + " where clearing_date = ?",
new Object[]{LocalDate.now()},
(resultSet, i) -> resultSet.getLong("id"));
} catch (Throwable e) {
log.error("{}", ExceptionUtils.getStackTrace(e));
throw e;
}
return keys;
return defaultLoadAllKeysOnTodayByField("clearing_date", false);
}
@Override

12
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/STradesMapStore.java
View file

@ -46,17 +46,7 @@ public class STradesMapStore extends TemplateMapStore<STrades> {
@Override
public Iterable<Long> loadAllKeys() {
log.debug("loadAllKeys from " + getTableName());
List<Long> keys;
try {
keys = jdbcTemplate.query("select id from " + getTableName() + " where trade_date = ?",
new Object[]{LocalDate.now()},
(resultSet, i) -> resultSet.getLong("id"));
} catch (Throwable e) {
log.error("{}", ExceptionUtils.getStackTrace(e));
throw e;
}
return keys;
return defaultLoadAllKeysOnTodayByField("trade_date", false);
}
@Override