From bc101f6cb4a1f5c4c1f2ad753e45019c94ca3b10 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Tue, 22 Aug 2023 10:50:22 +0300 Subject: [PATCH] =?UTF-8?q?imdg=20http://jira.mfd.msk:8088/browse/CLS-473?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BE?= =?UTF-8?q?=D0=B3=D1=80=D0=B0=D0=BD=D0=B8=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=BF=D0=BE=20=D0=B4=D0=B0=D1=82=D0=B5=20=D0=BD=D0=B0=20Execut?= =?UTF-8?q?ionFondMapStore,=20=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clearing/imdg/base/SimpleObjectMapStore.java | 9 +++++---- .../imdg/businessobject/ExecutionFondMapStore.java | 2 +- .../imdg/businessobject/StatementMapStore.java | 12 +----------- .../clearing/imdg/object/NotificationMapStore.java | 12 +----------- .../spcex/clearing/imdg/object/STradesMapStore.java | 12 +----------- 5 files changed, 9 insertions(+), 38 deletions(-) diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/SimpleObjectMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/SimpleObjectMapStore.java index d6ac4af8b..6a2bd0105 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/SimpleObjectMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/SimpleObjectMapStore.java @@ -126,14 +126,15 @@ public abstract class SimpleObjectMapStore implements * Выгружает ID по таблице по условию dateField >= today * * @param dateField поле даты + * @param canBeGreat true - используется условие >= today, иначе строгое = * @return ID's */ - public Iterable defaultLoadAllKeysOnTodayByField(String dateField) { + public Iterable 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 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 implements } public Iterable defaultLoadAllKeysOnTodayByTradingDate() { - return defaultLoadAllKeysOnTodayByField("trading_date"); + return defaultLoadAllKeysOnTodayByField("trading_date", false); } protected void batchInsertUpdate(@NonNull String insertStatement, @NonNull List args) { diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/ExecutionFondMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/ExecutionFondMapStore.java index 1cee4c879..e240ce865 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/ExecutionFondMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/ExecutionFondMapStore.java @@ -37,7 +37,7 @@ public class ExecutionFondMapStore extends TemplateMapStore { @Override public Iterable loadAllKeys() { - return defaultLoadAllKeysOnTodayByField("SETTLEMENT_DATE"); + return defaultLoadAllKeysOnTodayByField("SETTLEMENT_DATE", true); } @Override diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/StatementMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/StatementMapStore.java index 3aa257d14..b0a10bc88 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/StatementMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/StatementMapStore.java @@ -40,17 +40,7 @@ public class StatementMapStore extends TemplateMapStore { @Override public Iterable loadAllKeys() { - log.debug("loadAllKeys from " + getTableName()); - List 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 diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/NotificationMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/NotificationMapStore.java index 251ca31c1..dd137918d 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/NotificationMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/NotificationMapStore.java @@ -39,17 +39,7 @@ public class NotificationMapStore extends TemplateMapStore { @Override public Iterable loadAllKeys() { - log.debug("loadAllKeys from " + getTableName()); - List 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 diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/STradesMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/STradesMapStore.java index c5f3612e1..6a8c95582 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/STradesMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/STradesMapStore.java @@ -46,17 +46,7 @@ public class STradesMapStore extends TemplateMapStore { @Override public Iterable loadAllKeys() { - log.debug("loadAllKeys from " + getTableName()); - List 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