This commit is contained in:
AKurakin 2023-08-10 14:05:12 +03:00
parent bcd0f1a85a
commit 4463f9479f
11 changed files with 110 additions and 14 deletions

View file

@ -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;
}
}

View file

@ -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;
}
}

View file

@ -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;
}
}

View file

@ -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;
}
}

View file

@ -33,7 +33,8 @@ public class ExecutionDepositHistoryMapStore extends TemplateEventMapStore<Execu
"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"
"COUNTER_PARTY_ID", "COVERAGE_STATUS", "SESSION_ID", "CLEARING_DATE",
"COUNTER_PARTY_TRADING_CLEARING_REGISTRY_ID"
};
}
@ -76,7 +77,8 @@ public class ExecutionDepositHistoryMapStore extends TemplateEventMapStore<Execu
object.getCounterPartyId(),
object.getCoverageStatus(),
object.getSessionId(),
TimeUtil.toDateFromLocalDate(object.getClearingDate())
TimeUtil.toDateFromLocalDate(object.getClearingDate()),
object.getCounterPartyTradingClearingRegistryId()
};
return args;
}

View file

@ -28,7 +28,8 @@ public class ExecutionFondHistoryMapStore extends TemplateEventMapStore<Executio
@Override
public String[] getFields() {
return new String[]{"ID", "EVENT_TIME", "EVENT_USER_ID", "EVENT_TYPE",
"EXECUTION_FOND_ID", "CREATED_AT", "UPDATED_AT", "CLEARING_DATE", "EXCHANGE_EXECUTION_ID", "SIDE", "MARKET", "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"
"EXECUTION_FOND_ID", "CREATED_AT", "UPDATED_AT", "CLEARING_DATE", "EXCHANGE_EXECUTION_ID", "SIDE", "MARKET", "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",
"COUNTER_PARTY_TRADING_CLEARING_REGISTRY_ID"
};
}
@ -70,7 +71,8 @@ public class ExecutionFondHistoryMapStore extends TemplateEventMapStore<Executio
object.getSettlementCurrency(),
TimeUtil.toDateFromInstant(object.getExchangeExecutionMicroseconds()),
object.getCoverageStatus(),
object.getSessionId()
object.getSessionId(),
object.getCounterPartyTradingClearingRegistryId()
};
return args;
}

View file

@ -38,7 +38,8 @@ public class ExecutionFondMapStore extends TemplateMapStore<ExecutionFond> {
"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<ExecutionFond> {
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<ExecutionFond> {
object.getSettlementCurrency(),
TimeUtil.toDateFromInstant(object.getExchangeExecutionMicroseconds()),
object.getCoverageStatus(),
object.getSessionId()
object.getSessionId(),
object.getCounterPartyTradingClearingRegistryId()
};
return args;
}

View file

@ -42,7 +42,8 @@ public class ExecutionDepositMapStore extends TemplateMapStore<ExecutionDeposit>
"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<ExecutionDeposit>
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<ExecutionDeposit>
object.getCounterPartyId(),
object.getCoverageStatus(),
object.getSessionId(),
TimeUtil.toDateFromLocalDate(object.getClearingDate())
TimeUtil.toDateFromLocalDate(object.getClearingDate()),
object.getCounterPartyTradingClearingRegistryId()
};
return args;
}

View file

@ -33,7 +33,8 @@ public class SDf20MapStore extends TemplateMapStore<SDf20> {
@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<SDf20> {
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<SDf20> {
object.getCloseBalance(),
object.getFileName(),
TimeUtil.toDateFromInstant(object.getGenerationTime()),
object.getGenerationId()
object.getGenerationId(),
object.getSecurityName(),
object.getSecurityType(),
object.getNameCl(),
object.getTransactionNumber()
};
return args;
}

View file

@ -33,7 +33,7 @@ public class SDf21MapStore extends TemplateMapStore<SDf21> {
@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<SDf21> {
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<SDf21> {
object.getCloseBalance(),
object.getFileName(),
TimeUtil.toDateFromInstant(object.getGenerationTime()),
object.getGenerationId()
object.getGenerationId(),
object.getComment(),
object.getTransactionNumber()
};
return args;
}

View file

@ -33,7 +33,7 @@ public class SDf53MapStore extends TemplateMapStore<SDf53> {
@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<SDf53> {
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<SDf53> {
object.getResult(),
TimeUtil.toDateFromInstant(object.getGenerationTime()),
object.getGenerationId(),
object.getInSDfId()
object.getInSDfId(),
object.getAccName()
};
return args;
}