From 8ee172b0757d4b38c1a72d7abec05c9afa5ab9d9 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Fri, 9 Feb 2024 11:44:30 +0300 Subject: [PATCH] =?UTF-8?q?backend-api=20classes=20http://jira.mfd.msk:808?= =?UTF-8?q?8/browse/CLS-639=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20created/updated?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/meta/meta.json | 2 +- .../src/main/resources/meta/meta.xml | 2 +- .../backend-api/src/test/resources/meta.json | 2 +- .../classes/statics/data/misc/SCrossRate.java | 19 ++----------------- .../services/ExtDBImporterService.java | 8 ++++---- .../imdg/object/SCrossRateMapStore.java | 8 ++++---- 6 files changed, 13 insertions(+), 28 deletions(-) diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.json b/clearing-parent/backend-api/src/main/resources/meta/meta.json index 6401fbe64..d679a5311 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.json +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.json @@ -1,6 +1,6 @@ { - "version": "3.10.0.74", + "version": "3.10.0.75", "enums": { diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.xml b/clearing-parent/backend-api/src/main/resources/meta/meta.xml index ca3f819e7..8c7c8d064 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml @@ -1,6 +1,6 @@ - + diff --git a/clearing-parent/backend-api/src/test/resources/meta.json b/clearing-parent/backend-api/src/test/resources/meta.json index 6401fbe64..d679a5311 100644 --- a/clearing-parent/backend-api/src/test/resources/meta.json +++ b/clearing-parent/backend-api/src/test/resources/meta.json @@ -1,6 +1,6 @@ { - "version": "3.10.0.74", + "version": "3.10.0.75", "enums": { diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/SCrossRate.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/SCrossRate.java index cf7a36ce9..c1af7490b 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/SCrossRate.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/SCrossRate.java @@ -1,6 +1,7 @@ package ru.clearing.classes.statics.data.misc; import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessObject; import ru.spcex.platform.classes.base.SpcexObjectBase; import ru.clearing.classes.ConstSerializable; @@ -15,7 +16,7 @@ import java.time.LocalDate; * * DB table: S_CROSS_RATE **/ -public class SCrossRate extends SpcexObjectBase { +public class SCrossRate extends BusinessObject { private static final long serialVersionUID = ConstSerializable.serialVersionUID; // (in parent) private Long id; @@ -27,8 +28,6 @@ public class SCrossRate extends SpcexObjectBase { private BigDecimal unitRate; private Instant generationTime; private Long generationId; - private Instant createdAt; - private Instant updatedAt; public LocalDate getDate() { return date; @@ -86,18 +85,4 @@ public class SCrossRate extends SpcexObjectBase { this.generationId=value; } - public Instant getCreatedAt() { - return createdAt; - } - public void setCreatedAt(Instant value) { - this.createdAt=value; - } - - public Instant getUpdatedAt() { - return updatedAt; - } - public void setUpdatedAt(Instant value) { - this.updatedAt=value; - } - } \ No newline at end of file diff --git a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/services/ExtDBImporterService.java b/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/services/ExtDBImporterService.java index cc27f1b97..6ea45bf99 100644 --- a/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/services/ExtDBImporterService.java +++ b/clearing-parent/extdb-importer/src/main/java/ru/spex/clearing/extdb/importer/services/ExtDBImporterService.java @@ -73,8 +73,8 @@ public class ExtDBImporterService { if (sCrossRate != null && byCommand) { // Обновление всех полей объекта из БД crossRateDb.setId(sCrossRate.getId()); - crossRateDb.setCreatedAt(sCrossRate.getCreatedAt()); - crossRateDb.setUpdatedAt(currentInstant); + crossRateDb.setCreated(sCrossRate.getCreated()); + crossRateDb.setUpdated(currentInstant); // В extDb нет таких полей, оставляем как есть: crossRateDb.setGenerationTime(sCrossRate.getGenerationTime()); crossRateDb.setGenerationId(sCrossRate.getGenerationId()); @@ -82,8 +82,8 @@ public class ExtDBImporterService { updated++; } else if (sCrossRate == null) { // Создание объекта из БД - crossRateDb.setCreatedAt(currentInstant); - crossRateDb.setUpdatedAt(currentInstant); + crossRateDb.setCreated(currentInstant); + crossRateDb.setUpdated(currentInstant); sCrossRateImdg.insert(crossRateDb); created++; } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SCrossRateMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SCrossRateMapStore.java index 0ebae7b81..e9a0b523e 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SCrossRateMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SCrossRateMapStore.java @@ -48,8 +48,8 @@ public class SCrossRateMapStore extends TemplateMapStore { object.setUnitRate(resultSet.getObject("UNIT_RATE", BigDecimal.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); - object.setCreatedAt(getInstantFromTimestamp(resultSet, "CREATED_AT")); - object.setUpdatedAt(getInstantFromTimestamp(resultSet, "UPDATED_AT")); + object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT")); + object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT")); return object; } @@ -65,8 +65,8 @@ public class SCrossRateMapStore extends TemplateMapStore { object.getUnitRate(), TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId(), - TimeUtil.toDateFromInstant(object.getCreatedAt()), - TimeUtil.toDateFromInstant(object.getUpdatedAt()) + TimeUtil.toDateFromInstant(object.getCreated()), + TimeUtil.toDateFromInstant(object.getUpdated()) }; return args; }