backend-api classes http://jira.mfd.msk:8088/browse/CLS-639 поправил created/updated
This commit is contained in:
parent
1f2f70d301
commit
8ee172b075
6 changed files with 13 additions and 28 deletions
|
|
@ -1,6 +1,6 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
"version": "3.10.0.74",
|
"version": "3.10.0.75",
|
||||||
|
|
||||||
"enums": {
|
"enums": {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!--?xml-stylesheet type="text/xsl" href="\..\corp-reports\src\data\meta\meta.server.xslt"?-->
|
<!--?xml-stylesheet type="text/xsl" href="\..\corp-reports\src\data\meta\meta.server.xslt"?-->
|
||||||
<meta version="3.10.0.74">
|
<meta version="3.10.0.75">
|
||||||
<!-- _xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" _xsi:noNamespaceSchemaLocation="file:///E:/d/projects/meta/from/meta.xsd" -->
|
<!-- _xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" _xsi:noNamespaceSchemaLocation="file:///E:/d/projects/meta/from/meta.xsd" -->
|
||||||
<!--Здесь словари-->
|
<!--Здесь словари-->
|
||||||
<enums>
|
<enums>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
"version": "3.10.0.74",
|
"version": "3.10.0.75",
|
||||||
|
|
||||||
"enums": {
|
"enums": {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
package ru.clearing.classes.statics.data.misc;
|
package ru.clearing.classes.statics.data.misc;
|
||||||
|
|
||||||
import ru.clearing.classes.ConstSerializable;
|
import ru.clearing.classes.ConstSerializable;
|
||||||
|
import ru.clearing.classes.objects.BusinessObject;
|
||||||
import ru.spcex.platform.classes.base.SpcexObjectBase;
|
import ru.spcex.platform.classes.base.SpcexObjectBase;
|
||||||
|
|
||||||
import ru.clearing.classes.ConstSerializable;
|
import ru.clearing.classes.ConstSerializable;
|
||||||
|
|
@ -15,7 +16,7 @@ import java.time.LocalDate;
|
||||||
*
|
*
|
||||||
* DB table: S_CROSS_RATE
|
* DB table: S_CROSS_RATE
|
||||||
**/
|
**/
|
||||||
public class SCrossRate extends SpcexObjectBase {
|
public class SCrossRate extends BusinessObject {
|
||||||
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
|
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
|
||||||
|
|
||||||
// (in parent) private Long id;
|
// (in parent) private Long id;
|
||||||
|
|
@ -27,8 +28,6 @@ public class SCrossRate extends SpcexObjectBase {
|
||||||
private BigDecimal unitRate;
|
private BigDecimal unitRate;
|
||||||
private Instant generationTime;
|
private Instant generationTime;
|
||||||
private Long generationId;
|
private Long generationId;
|
||||||
private Instant createdAt;
|
|
||||||
private Instant updatedAt;
|
|
||||||
|
|
||||||
public LocalDate getDate() {
|
public LocalDate getDate() {
|
||||||
return date;
|
return date;
|
||||||
|
|
@ -86,18 +85,4 @@ public class SCrossRate extends SpcexObjectBase {
|
||||||
this.generationId=value;
|
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -73,8 +73,8 @@ public class ExtDBImporterService {
|
||||||
if (sCrossRate != null && byCommand) {
|
if (sCrossRate != null && byCommand) {
|
||||||
// Обновление всех полей объекта из БД
|
// Обновление всех полей объекта из БД
|
||||||
crossRateDb.setId(sCrossRate.getId());
|
crossRateDb.setId(sCrossRate.getId());
|
||||||
crossRateDb.setCreatedAt(sCrossRate.getCreatedAt());
|
crossRateDb.setCreated(sCrossRate.getCreated());
|
||||||
crossRateDb.setUpdatedAt(currentInstant);
|
crossRateDb.setUpdated(currentInstant);
|
||||||
// В extDb нет таких полей, оставляем как есть:
|
// В extDb нет таких полей, оставляем как есть:
|
||||||
crossRateDb.setGenerationTime(sCrossRate.getGenerationTime());
|
crossRateDb.setGenerationTime(sCrossRate.getGenerationTime());
|
||||||
crossRateDb.setGenerationId(sCrossRate.getGenerationId());
|
crossRateDb.setGenerationId(sCrossRate.getGenerationId());
|
||||||
|
|
@ -82,8 +82,8 @@ public class ExtDBImporterService {
|
||||||
updated++;
|
updated++;
|
||||||
} else if (sCrossRate == null) {
|
} else if (sCrossRate == null) {
|
||||||
// Создание объекта из БД
|
// Создание объекта из БД
|
||||||
crossRateDb.setCreatedAt(currentInstant);
|
crossRateDb.setCreated(currentInstant);
|
||||||
crossRateDb.setUpdatedAt(currentInstant);
|
crossRateDb.setUpdated(currentInstant);
|
||||||
sCrossRateImdg.insert(crossRateDb);
|
sCrossRateImdg.insert(crossRateDb);
|
||||||
created++;
|
created++;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -48,8 +48,8 @@ public class SCrossRateMapStore extends TemplateMapStore<SCrossRate> {
|
||||||
object.setUnitRate(resultSet.getObject("UNIT_RATE", BigDecimal.class));
|
object.setUnitRate(resultSet.getObject("UNIT_RATE", BigDecimal.class));
|
||||||
object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME"));
|
object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME"));
|
||||||
object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class));
|
object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class));
|
||||||
object.setCreatedAt(getInstantFromTimestamp(resultSet, "CREATED_AT"));
|
object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT"));
|
||||||
object.setUpdatedAt(getInstantFromTimestamp(resultSet, "UPDATED_AT"));
|
object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT"));
|
||||||
return object;
|
return object;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -65,8 +65,8 @@ public class SCrossRateMapStore extends TemplateMapStore<SCrossRate> {
|
||||||
object.getUnitRate(),
|
object.getUnitRate(),
|
||||||
TimeUtil.toDateFromInstant(object.getGenerationTime()),
|
TimeUtil.toDateFromInstant(object.getGenerationTime()),
|
||||||
object.getGenerationId(),
|
object.getGenerationId(),
|
||||||
TimeUtil.toDateFromInstant(object.getCreatedAt()),
|
TimeUtil.toDateFromInstant(object.getCreated()),
|
||||||
TimeUtil.toDateFromInstant(object.getUpdatedAt())
|
TimeUtil.toDateFromInstant(object.getUpdated())
|
||||||
};
|
};
|
||||||
return args;
|
return args;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue