From b722a9b90e241b3847a7d874fc7e11c89f45ab75 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Fri, 9 Feb 2024 19:25:12 +0300 Subject: [PATCH] =?UTF-8?q?extdb-importer=20http://jira.mfd.msk:8088/brows?= =?UTF-8?q?e/CLS-641=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BE=D0=BF=D0=B5=D1=87=D0=B0=D1=82=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../importer/services/ExtDBImporterService.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 05da3be52..68bee3fa4 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 @@ -58,7 +58,7 @@ public class ExtDBImporterService { public synchronized void process(boolean byCommand) { log.debug("Start process import SCrossRate from DB. byCommand={}", byCommand); - String sql = String.format("SELECT * FROM %s.Trades", schema); + String sql = String.format("SELECT * FROM %s.crossRate", schema); Collection crossRatesFromDB = jdbcTemplate.query(sql, (resultSet, i) -> readSCrossRate(resultSet)); Instant currentInstant = Instant.now(); @@ -86,7 +86,7 @@ public class ExtDBImporterService { // В extDb нет таких полей, заполнить: crossRateDb.setGenerationTime(currentInstant); - crossRateDb.setGenerationId(makeGenerationId(sCrossRate.getDate(), sCrossRate.getCurrCode())); + crossRateDb.setGenerationId(makeGenerationId(crossRateDb.getDate(), crossRateDb.getCurrCode())); } else { log.warn(messageResolver.resolve(new EnumMessage(crossRateNotValid, crossRateDb.getCurrCode()))); } @@ -98,7 +98,7 @@ public class ExtDBImporterService { } else { log.debug("Successfully import SCrossRate from DB by scheduled."); } -// STradesImportedRequest importRequest = new STradesImportedRequest(); +// CrossRatesImportedRequest importRequest = new CrossRatesImportedRequest(); // kafka.get().sendRequestToQueue(Consts.S_CROSS_RATES_IMPORTED, importRequest); } else { log.debug("No SCrossRate were created or updated from DB. Kafka command will not be send"); @@ -145,10 +145,10 @@ public class ExtDBImporterService { SCrossRate object = new SCrossRate(); object.setDate(getLocalDateFromSqlDate(resultSet, "DATE")); object.setCurrency(resultSet.getObject("CURRENCY", String.class)); - object.setCurrCode(resultSet.getObject("CURR_CODE", String.class)); - object.setFaceValue(resultSet.getObject("FACE_VALUE", BigDecimal.class)); + object.setCurrCode(resultSet.getObject("CURRCODE", String.class)); + object.setFaceValue(resultSet.getObject("FACEVALUE", BigDecimal.class)); object.setRate(resultSet.getObject("RATE", BigDecimal.class)); - object.setUnitRate(resultSet.getObject("UNIT_RATE", BigDecimal.class)); + object.setUnitRate(resultSet.getObject("UNITRATE", BigDecimal.class)); return object; }