From 4be350ad19fc48b0f83d23c9c0ecc6a9ca4ec840 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Thu, 27 Mar 2025 13:50:00 +0300 Subject: [PATCH] =?UTF-8?q?trade-importer=20http://jira.mfd.msk:8088/brows?= =?UTF-8?q?e/CLS-820=20=D0=B8=20CLS-821=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20=D0=BE=D0=BF=D1=86=D0=B8=D0=BE=D0=BD=D0=B0?= =?UTF-8?q?=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5=20=D0=BA=D0=B0=D0=B2=D1=8B=D1=87?= =?UTF-8?q?=D0=BA=D0=B8,=20=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D1=83=20=D0=BD=D0=B5=D0=BE=D0=B1?= =?UTF-8?q?=D1=8F=D0=B7=D0=B0=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE=20=D0=BF=D0=BE=D0=BB=D1=8F=20ClassName=20(=D0=B2=20?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=BE=D0=B9=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8?= =?UTF-8?q?=D0=B8=20=D0=B5=D0=B3=D0=BE=20=D0=BD=D0=B5=D1=82)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../importer/services/ExtDBImporterService.java | 2 +- .../src/main/resources/application.properties | 5 ++--- .../importer/services/TradeImporterService.java | 13 +++++++++++-- .../src/main/resources/application.properties | 4 ++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/services/ExtDBImporterService.java b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/services/ExtDBImporterService.java index a2e73012a..7c710fe33 100644 --- a/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/services/ExtDBImporterService.java +++ b/clearing-parent/extdb-importer/src/main/java/ru/spcex/clearing/extdb/importer/services/ExtDBImporterService.java @@ -40,7 +40,7 @@ public class ExtDBImporterService { private final Supplier kafka; private final IMessageResolver messageResolver; - @Value("${extdb-importer.database.schema:dbo}") + @Value("${extdb-importer.database.schema:dbo}") // default: dbo for mssql, public for postgresql private String schema; diff --git a/clearing-parent/extdb-importer/src/main/resources/application.properties b/clearing-parent/extdb-importer/src/main/resources/application.properties index da543f422..6c2a5b680 100644 --- a/clearing-parent/extdb-importer/src/main/resources/application.properties +++ b/clearing-parent/extdb-importer/src/main/resources/application.properties @@ -10,9 +10,8 @@ extdb-importer.cron.load-from-db-cron=0 0/5 * * * ? #extdb-importer.database.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver extdb-importer.database.login=clearing extdb-importer.database.password=Aa111111 -extdb-importer.database.schema=CBRInfo -#extdb-importer.database.schema=public -extdb-importer.database.url=jdbc:postgresql://10.200.200.133:5432/clearing?currentSchema=CBRInfo +extdb-importer.database.schema=public +extdb-importer.database.url=jdbc:postgresql://10.200.200.133:5432/clearing extdb-importer.database.driver=org.postgresql.Driver extdb-importer.hazelcast.cluster-members=127.0.0.1:5701 diff --git a/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/services/TradeImporterService.java b/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/services/TradeImporterService.java index fc3eed521..0c9e0742d 100644 --- a/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/services/TradeImporterService.java +++ b/clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/services/TradeImporterService.java @@ -13,6 +13,7 @@ import java.time.Instant; import java.time.LocalDate; import java.util.Arrays; import java.util.Collection; +import java.util.Locale; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; import java.util.function.Consumer; @@ -91,7 +92,15 @@ public class TradeImporterService { AtomicLong minCreatedId = new AtomicLong(Long.MAX_VALUE); final long logProgressTime = 60_000L; // интервал вывода в лог каждую минуту AtomicLong logTime = new AtomicLong(System.currentTimeMillis() + logProgressTime); - String query = String.format("SELECT * FROM \"%s\".\"Trades\"", schema); + String query; + if (org.apache.commons.lang3.StringUtils.isEmpty(schema)) { + query = "SELECT * FROM \"Trades\""; + } else { + if (!schema.contains("\"") && !schema.toLowerCase(Locale.ROOT).equals(schema)) { // PostgreSQL style with quote + schema = "\"" + schema + "\""; + } + query = String.format("SELECT * FROM %s.\"Trades\"", schema); + } log.debug("Load from DB STrades. Query: {}", query); Instant currentInstant = Instant.now(); jdbcTemplate.query(query, resultSet -> { @@ -302,7 +311,7 @@ public class TradeImporterService { sTrades.setFirmName(resultSet.getObject("FirmName", String.class)); sTrades.setCpFirmId(resultSet.getObject("CPFirmId", String.class)); sTrades.setCpFirmName(resultSet.getObject("CPFirmName", String.class)); - sTrades.setClassName(resultSet.getObject("ClassName", String.class)); + // sTrades.setClassName(resultSet.getString("ClassName")); в новой базе нет поля sTrades.setSecName(resultSet.getObject("SecName", String.class)); sTrades.setSettleDate(getLocalDateFromSqlDate(resultSet, "SettleDate")); sTrades.setSettleCurrency(resultSet.getObject("SettleCurrency", String.class)); diff --git a/clearing-parent/trade-importer/src/main/resources/application.properties b/clearing-parent/trade-importer/src/main/resources/application.properties index f5facf6d0..54d1b7c89 100644 --- a/clearing-parent/trade-importer/src/main/resources/application.properties +++ b/clearing-parent/trade-importer/src/main/resources/application.properties @@ -10,8 +10,8 @@ trade-importer.cron.load-from-db-cron=0 0/5 * * * ? #trade-importer.database.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver trade-importer.database.login=clearing trade-importer.database.password=Aa111111 -trade-importer.database.schema=CBRInfo -trade-importer.database.url=jdbc:postgresql://10.200.200.133:5432/clearing?currentSchema=CBRInfo +trade-importer.database.schema=public +trade-importer.database.url=jdbc:postgresql://10.200.200.133:5432/clearing trade-importer.database.driver=org.postgresql.Driver trade-importer.hazelcast.cluster-members=127.0.0.1:5701