From 1c4df656b7c2f2b65175a1d436eb791b4592d043 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Wed, 26 Mar 2025 18:47:57 +0300 Subject: [PATCH] =?UTF-8?q?extdb-importer=20http://jira.mfd.msk:8088/brows?= =?UTF-8?q?e/CLS-821=20=D1=82=D0=B0=D0=BC=20=D0=B2=D1=8C=D1=8E,=20=D0=B1?= =?UTF-8?q?=D0=B5=D0=B7=20=D0=BA=D0=B0=D0=B2=D1=8B=D1=87=D0=B5=D0=BA=20?= =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../importer/services/ExtDBImporterService.java | 12 +++++++++++- .../src/main/resources/application.properties | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) 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 d49b56dff..a2e73012a 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 @@ -25,6 +25,7 @@ import java.time.Instant; import java.time.LocalDate; import java.util.Collection; import java.util.HashMap; +import java.util.Locale; import java.util.Map; import java.util.function.Supplier; @@ -73,7 +74,16 @@ public class ExtDBImporterService { log.warn("maxDate={} too high, set current date", maxDate); maxDate = LocalDate.now(); } - return String.format("SELECT * FROM \"%s\".\"Crossrate\" where \"Date\">='%s'", + if (schema != null) { + if (!schema.contains("\"") && !schema.toLowerCase(Locale.ROOT).equals(schema)) { // PostgreSQL style with quote + schema = "\"" + schema + "\""; + } + } + if (org.apache.commons.lang3.StringUtils.isEmpty(schema)) { + return String.format("SELECT * FROM crossrate where Date>='%s'", + maxDate); + } + return String.format("SELECT * FROM %s.crossrate where Date>='%s'", schema, maxDate); } diff --git a/clearing-parent/extdb-importer/src/main/resources/application.properties b/clearing-parent/extdb-importer/src/main/resources/application.properties index b5c8d9414..da543f422 100644 --- a/clearing-parent/extdb-importer/src/main/resources/application.properties +++ b/clearing-parent/extdb-importer/src/main/resources/application.properties @@ -11,6 +11,7 @@ extdb-importer.cron.load-from-db-cron=0 0/5 * * * ? 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.driver=org.postgresql.Driver