From 4463f9479f662569c10cf1565b766756b9c77623 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Thu, 10 Aug 2023 14:05:12 +0300 Subject: [PATCH] =?UTF-8?q?imdg=20classes=20http://jira.mfd.msk:8088/brows?= =?UTF-8?q?e/CLS-405=20ddl=20=D0=B8=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D1=8B?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/execution/ExecutionCommon.java | 11 ++++++ .../classes/statics/data/sdf/SDf20.java | 35 +++++++++++++++++++ .../classes/statics/data/sdf/SDf21.java | 17 +++++++++ .../classes/statics/data/sdf/SDf53.java | 8 +++++ .../ExecutionDepositHistoryMapStore.java | 6 ++-- .../ExecutionFondHistoryMapStore.java | 6 ++-- .../businessobject/ExecutionFondMapStore.java | 7 ++-- .../imdg/object/ExecutionDepositMapStore.java | 7 ++-- .../clearing/imdg/object/SDf20MapStore.java | 13 +++++-- .../clearing/imdg/object/SDf21MapStore.java | 8 +++-- .../clearing/imdg/object/SDf53MapStore.java | 6 ++-- 11 files changed, 110 insertions(+), 14 deletions(-) diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/execution/ExecutionCommon.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/execution/ExecutionCommon.java index 10d252baa..d34504a70 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/execution/ExecutionCommon.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/execution/ExecutionCommon.java @@ -1,5 +1,6 @@ package ru.clearing.classes.statics.data.execution; +import ru.clearing.classes.ConstSerializable; import ru.clearing.classes.objects.BusinessObject; import ru.spcex.platform.classes.base.interfaces.ExecutionType; import ru.spcex.platform.classes.base.interfaces.IExecution; @@ -9,6 +10,8 @@ import java.time.Instant; import java.time.LocalDate; public abstract class ExecutionCommon extends BusinessObject implements IExecution { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + protected Long exchangeExecutionId; protected Instant exchangeExecutionTime; protected LocalDate tradingDate; @@ -29,6 +32,7 @@ public abstract class ExecutionCommon extends BusinessObject implements IExecuti protected String coverageStatus; protected Long sessionId; protected LocalDate clearingDate; + protected Long counterPartyTradingClearingRegistryId; public abstract ExecutionType type(); @@ -192,4 +196,11 @@ public abstract class ExecutionCommon extends BusinessObject implements IExecuti this.sessionId = value; } + public Long getCounterPartyTradingClearingRegistryId() { + return counterPartyTradingClearingRegistryId; + } + + public void setCounterPartyTradingClearingRegistryId(Long counterPartyTradingClearingRegistryId) { + this.counterPartyTradingClearingRegistryId = counterPartyTradingClearingRegistryId; + } } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf20.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf20.java index edbfc006d..b350cace0 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf20.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf20.java @@ -26,6 +26,10 @@ public class SDf20 extends SpcexObjectBase { private String fileName; private Instant generationTime; private Long generationId; + private String securityName; + private String securityType; + private String nameCl; + private String transactionNumber; public String getOutDocument() { return outDocument; @@ -131,4 +135,35 @@ public class SDf20 extends SpcexObjectBase { this.generationId = value; } + public String getSecurityName() { + return securityName; + } + + public void setSecurityName(String securityName) { + this.securityName = securityName; + } + + public String getSecurityType() { + return securityType; + } + + public void setSecurityType(String securityType) { + this.securityType = securityType; + } + + public String getNameCl() { + return nameCl; + } + + public void setNameCl(String nameCl) { + this.nameCl = nameCl; + } + + public String getTransactionNumber() { + return transactionNumber; + } + + public void setTransactionNumber(String transactionNumber) { + this.transactionNumber = transactionNumber; + } } \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf21.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf21.java index 54b3e5bd7..ba561acc0 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf21.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf21.java @@ -29,6 +29,8 @@ public class SDf21 extends SpcexObjectBase { private String fileName; private Instant generationTime; private Long generationId; + private String comment; + private String transactionNumber; public String getOutDocument() { return outDocument; @@ -158,4 +160,19 @@ public class SDf21 extends SpcexObjectBase { this.generationId = value; } + public String getComment() { + return comment; + } + + public void setComment(String comment) { + this.comment = comment; + } + + public String getTransactionNumber() { + return transactionNumber; + } + + public void setTransactionNumber(String transactionNumber) { + this.transactionNumber = transactionNumber; + } } \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf53.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf53.java index 3f833bb8a..f80e5094c 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf53.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf53.java @@ -21,6 +21,7 @@ public class SDf53 extends SpcexObjectBase { private Instant generationTime; private Long generationId; private Long inSDfId; + private String accName; public String getAccount() { return account; @@ -78,4 +79,11 @@ public class SDf53 extends SpcexObjectBase { this.inSDfId = value; } + public String getAccName() { + return accName; + } + + public void setAccName(String accName) { + this.accName = accName; + } } \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/ExecutionDepositHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/ExecutionDepositHistoryMapStore.java index 6aa6cfe82..4107f8779 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/ExecutionDepositHistoryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/ExecutionDepositHistoryMapStore.java @@ -33,7 +33,8 @@ public class ExecutionDepositHistoryMapStore extends TemplateEventMapStore { "TRADING_DATE", "SECURITY_SYMBOL", "SECURITY_ID", "INTEREST_AMOUNT", "EXCHANGE_ORDER_ID", "PRICE", "SETTLEMENT_AMOUNT", "LOTS", "QUANTITY", "EXCHANGE_EXECUTION_TIME", "DURATION", "TRADING_CLEARING_REGISTRY_ID", "COMMENT", "CLIENT_CODE_ID", "SETTLEMENT_CODE", "COMPANY_ID", "COUNTER_PARTY_ID", "SECURITY_FULL_NAME", - "SETTLEMENT_DATE", "SETTLEMENT_CURRENCY", "EXCHANGE_EXECUTION_MICROSECONDS", "COVERAGE_STATUS", "SESSION_ID" + "SETTLEMENT_DATE", "SETTLEMENT_CURRENCY", "EXCHANGE_EXECUTION_MICROSECONDS", "COVERAGE_STATUS", "SESSION_ID", + "COUNTER_PARTY_TRADING_CLEARING_REGISTRY_ID" }; } @@ -90,6 +91,7 @@ public class ExecutionFondMapStore extends TemplateMapStore { object.setExchangeExecutionMicroseconds(getInstantFromTimestamp(resultSet, "EXCHANGE_EXECUTION_MICROSECONDS")); object.setCoverageStatus(resultSet.getObject("COVERAGE_STATUS", String.class)); object.setSessionId(resultSet.getObject("SESSION_ID", Long.class)); + object.setCounterPartyTradingClearingRegistryId(resultSet.getObject("COUNTER_PARTY_TRADING_CLEARING_REGISTRY_ID", Long.class)); return object; } @@ -125,7 +127,8 @@ public class ExecutionFondMapStore extends TemplateMapStore { object.getSettlementCurrency(), TimeUtil.toDateFromInstant(object.getExchangeExecutionMicroseconds()), object.getCoverageStatus(), - object.getSessionId() + object.getSessionId(), + object.getCounterPartyTradingClearingRegistryId() }; return args; } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ExecutionDepositMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ExecutionDepositMapStore.java index 909d4283f..a3735c83e 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ExecutionDepositMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ExecutionDepositMapStore.java @@ -42,7 +42,8 @@ public class ExecutionDepositMapStore extends TemplateMapStore "MARKET", "PRICE", "LOTS", "QUANTITY", "FIRST_LEG_AMOUNT", "SECOND_LEG_AMOUNT", "INTEREST_AMOUNT", "SIDE", "SETTLEMENT_CURRENCY", "COMPANY_ID", "DURATION", "FIRST_LEG_SETTLEMENT_DATE", "SECOND_LEG_SETTLEMENT_DATE", "FIRST_LEG_SETTLEMENT_CODE", "SECOND_LEG_SETTLEMENT_CODE", "SECURITY_FULL_NAME", "SECURITY_SYMBOL", - "SECURITY_CODE", "SECURITY_ID", "CONTRACT", "COUNTER_PARTY_ID", "COVERAGE_STATUS", "SESSION_ID", "CLEARING_DATE" + "SECURITY_CODE", "SECURITY_ID", "CONTRACT", "COUNTER_PARTY_ID", "COVERAGE_STATUS", "SESSION_ID", "CLEARING_DATE", + "COUNTER_PARTY_TRADING_CLEARING_REGISTRY_ID" }; } @@ -95,6 +96,7 @@ public class ExecutionDepositMapStore extends TemplateMapStore object.setCoverageStatus(resultSet.getObject("COVERAGE_STATUS", String.class)); object.setSessionId(resultSet.getObject("SESSION_ID", Long.class)); object.setClearingDate(getLocalDateFromSqlDate(resultSet, "CLEARING_DATE")); + object.setCounterPartyTradingClearingRegistryId(resultSet.getObject("COUNTER_PARTY_TRADING_CLEARING_REGISTRY_ID", Long.class)); return object; } @@ -131,7 +133,8 @@ public class ExecutionDepositMapStore extends TemplateMapStore object.getCounterPartyId(), object.getCoverageStatus(), object.getSessionId(), - TimeUtil.toDateFromLocalDate(object.getClearingDate()) + TimeUtil.toDateFromLocalDate(object.getClearingDate()), + object.getCounterPartyTradingClearingRegistryId() }; return args; } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf20MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf20MapStore.java index 374dbc9b1..8e7faf6de 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf20MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf20MapStore.java @@ -33,7 +33,8 @@ public class SDf20MapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "OUT_DOCUMENT", "IN_DOCUMENT", "SECURITY", "OPEN_BALANCE", "DEPO_CODE_CL", "QUANTITY", "OPERATION_CODE", "DEPO_CODE_CORR", "OPERATION_DATE", "CLOSE_BALANCE", "FILE_NAME", "GENERATION_TIME", "GENERATION_ID" + "ID", "OUT_DOCUMENT", "IN_DOCUMENT", "SECURITY", "OPEN_BALANCE", "DEPO_CODE_CL", "QUANTITY", "OPERATION_CODE", "DEPO_CODE_CORR", "OPERATION_DATE", "CLOSE_BALANCE", "FILE_NAME", "GENERATION_TIME", "GENERATION_ID", + "SECURITY_NAME", "SECURITY_TYPE", "NAME_CL", "TRANSACTION_NUMBER" }; } @@ -69,6 +70,10 @@ public class SDf20MapStore extends TemplateMapStore { object.setFileName(resultSet.getObject("FILE_NAME", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); + object.setSecurityName(resultSet.getObject("SECURITY_NAME", String.class)); + object.setSecurityType(resultSet.getObject("SECURITY_TYPE", String.class)); + object.setNameCl(resultSet.getObject("NAME_CL", String.class)); + object.setTransactionNumber(resultSet.getObject("TRANSACTION_NUMBER", String.class)); return object; } @@ -88,7 +93,11 @@ public class SDf20MapStore extends TemplateMapStore { object.getCloseBalance(), object.getFileName(), TimeUtil.toDateFromInstant(object.getGenerationTime()), - object.getGenerationId() + object.getGenerationId(), + object.getSecurityName(), + object.getSecurityType(), + object.getNameCl(), + object.getTransactionNumber() }; return args; } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf21MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf21MapStore.java index 827001a7d..55e286a3d 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf21MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf21MapStore.java @@ -33,7 +33,7 @@ public class SDf21MapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "OUT_DOCUMENT", "IN_DOCUMENT", "SECURITY_CODE", "SECURITY_NAME", "SECURITY_TYPE", "OPEN_BALANCE", "DEPO_CODE_CL", "NAME_CL", "QUANTITY", "OPERATION_CODE", "DEPO_CODE_CORR", "OPERATION_DATE", "CLOSE_BALANCE", "FILE_NAME", "GENERATION_TIME", "GENERATION_ID" + "ID", "OUT_DOCUMENT", "IN_DOCUMENT", "SECURITY_CODE", "SECURITY_NAME", "SECURITY_TYPE", "OPEN_BALANCE", "DEPO_CODE_CL", "NAME_CL", "QUANTITY", "OPERATION_CODE", "DEPO_CODE_CORR", "OPERATION_DATE", "CLOSE_BALANCE", "FILE_NAME", "GENERATION_TIME", "GENERATION_ID", "COMMENT", "TRANSACTION_NUMBER" }; } @@ -72,6 +72,8 @@ public class SDf21MapStore extends TemplateMapStore { object.setFileName(resultSet.getObject("FILE_NAME", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); + object.setComment(resultSet.getObject("COMMENT", String.class)); + object.setTransactionNumber(resultSet.getObject("TRANSACTION_NUMBER", String.class)); return object; } @@ -94,7 +96,9 @@ public class SDf21MapStore extends TemplateMapStore { object.getCloseBalance(), object.getFileName(), TimeUtil.toDateFromInstant(object.getGenerationTime()), - object.getGenerationId() + object.getGenerationId(), + object.getComment(), + object.getTransactionNumber() }; return args; } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf53MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf53MapStore.java index 7dc2b9943..190851d9e 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf53MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf53MapStore.java @@ -33,7 +33,7 @@ public class SDf53MapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "ACCOUNT", "DEAL", "STATUS", "RESULT", "GENERATION_TIME", "GENERATION_ID", "IN_S_DF_ID" + "ID", "ACCOUNT", "DEAL", "STATUS", "RESULT", "GENERATION_TIME", "GENERATION_ID", "IN_S_DF_ID", "ACC_NAME" }; } @@ -63,6 +63,7 @@ public class SDf53MapStore extends TemplateMapStore { object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); object.setInSDfId(resultSet.getObject("IN_S_DF_ID", Long.class)); + object.setAccName(resultSet.getObject("ACC_NAME", String.class)); return object; } @@ -76,7 +77,8 @@ public class SDf53MapStore extends TemplateMapStore { object.getResult(), TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId(), - object.getInSDfId() + object.getInSDfId(), + object.getAccName() }; return args; }