* DB table: ACCOUNT_BALANCE_HISTORY
**/
+@Deprecated
public class AccountBalanceHistory extends BusinessEvent
- * DB table: ACCOUNT_ROUTING
- **/
-public class AccountRouting extends SpcexObjectBase {
- @Serial
- private static final long serialVersionUID = ConstSerializable.serialVersionUID;
-
- private Long destinationId;
- private Long relationId;
- private Long sourceId;
-
- public Long getDestinationId() {
- return destinationId;
- }
-
- public void setDestinationId(Long value) {
- this.destinationId = value;
- }
-
- public Long getRelationId() {
- return relationId;
- }
-
- public void setRelationId(Long value) {
- this.relationId = value;
- }
-
- public Long getSourceId() {
- return sourceId;
- }
-
- public void setSourceId(Long value) {
- this.sourceId = value;
- }
-
-}
\ No newline at end of file
diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/ClearingAccount.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/ClearingAccount.java
index 1157575b4..68fdebd2d 100644
--- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/ClearingAccount.java
+++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/ClearingAccount.java
@@ -12,21 +12,30 @@ public class ClearingAccount extends SpcexObjectBase {
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private Long accountId;
- private String account;
+ private String clearingAccountType;
+ private Long companyId;
public Long getAccountId() {
return accountId;
}
- public void setAccountId(Long value) {
- this.accountId = value;
+ public void setAccountId(Long accountId) {
+ this.accountId = accountId;
}
- public String getAccount() {
- return account;
+ public String getClearingAccountType() {
+ return clearingAccountType;
}
- public void setAccount(String account) {
- this.account = account;
+ public void setClearingAccountType(String clearingAccountType) {
+ this.clearingAccountType = clearingAccountType;
+ }
+
+ public Long getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Long companyId) {
+ this.companyId = companyId;
}
}
\ No newline at end of file
diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/ClientCode.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/ClientCode.java
new file mode 100644
index 000000000..af4a3890d
--- /dev/null
+++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/ClientCode.java
@@ -0,0 +1,71 @@
+package ru.clearing.classes.statics.data.account;
+
+import ru.clearing.classes.ConstSerializable;
+import ru.clearing.classes.objects.BusinessObject;
+
+import java.time.Instant;
+
+/**
+ * Коды клиентов компании
+ *
+ * DB table: CLIENT_CODE
+ **/
+public class ClientCode extends BusinessObject {
+ private static final long serialVersionUID = ConstSerializable.serialVersionUID;
+
+ private Long companyId;
+ private String code;
+ private Long tradingClearingRegistryId;
+ private Long moneyAccountId;
+ private Long depoAccountId;
+ private String status;
+
+ public Long getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Long value) {
+ this.companyId = value;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String value) {
+ this.code = value;
+ }
+
+ public Long getTradingClearingRegistryId() {
+ return tradingClearingRegistryId;
+ }
+
+ public void setTradingClearingRegistryId(Long value) {
+ this.tradingClearingRegistryId = value;
+ }
+
+ public Long getMoneyAccountId() {
+ return moneyAccountId;
+ }
+
+ public void setMoneyAccountId(Long value) {
+ this.moneyAccountId = value;
+ }
+
+ public Long getDepoAccountId() {
+ return depoAccountId;
+ }
+
+ public void setDepoAccountId(Long value) {
+ this.depoAccountId = value;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String value) {
+ this.status = value;
+ }
+
+}
\ No newline at end of file
diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/ClientCodeHistory.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/ClientCodeHistory.java
new file mode 100644
index 000000000..7b6df9819
--- /dev/null
+++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/ClientCodeHistory.java
@@ -0,0 +1,28 @@
+package ru.clearing.classes.statics.data.account;
+
+import ru.clearing.classes.ConstSerializable;
+import ru.clearing.classes.objects.BusinessEvent;
+
+import java.io.Serial;
+
+/**
+ * Изменение состояния объекта Коды клиентов компании
+ *
+ * DB table: CLIENT_CODE_HISTORY
+ **/
+public class ClientCodeHistory extends BusinessEvent
+ * DB table: DEPO_ACCOUNT
+ **/
+public class DepoAccount extends SpcexObjectBase {
+ private static final long serialVersionUID = ConstSerializable.serialVersionUID;
+
+ private Long accountId;
+ private String depoAccountType;
+ private Long companyId;
+
+ public Long getAccountId() {
+ return accountId;
+ }
+
+ public void setAccountId(Long value) {
+ this.accountId = value;
+ }
+
+ public String getDepoAccountType() {
+ return depoAccountType;
+ }
+
+ public void setDepoAccountType(String value) {
+ this.depoAccountType = value;
+ }
+
+ public Long getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Long value) {
+ this.companyId = value;
+ }
+
+}
\ No newline at end of file
diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/AccountRoutingHistory.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/DepoAccountHistory.java
similarity index 51%
rename from clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/AccountRoutingHistory.java
rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/DepoAccountHistory.java
index f2212cd15..eb14cf879 100644
--- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/AccountRoutingHistory.java
+++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/DepoAccountHistory.java
@@ -1,26 +1,28 @@
-package ru.clearing.classes.statics.data.account;
-
-import ru.clearing.classes.ConstSerializable;
-import ru.clearing.classes.objects.BusinessEvent;
-import java.io.Serial;
-/**
- * Изменение состояния объекта Маршрутизация счета
- *
- * DB table: ACCOUNT_ROUTING_UPDATE
- **/
-public class AccountRoutingHistory extends BusinessEvent
+ * DB table: DEPO_ACCOUNT_HISTORY
+ **/
+public class DepoAccountHistory extends BusinessEvent
+ * DB table: REGISTRY
+ **/
+public class Registry extends SpcexObjectBase {
+ private static final long serialVersionUID = ConstSerializable.serialVersionUID;
+
+ private Long companyId;
+ private String tradingCode;
+ private String clearingCode;
+ private String shortName;
+ private String fullName;
+ private Long accountId;
+ private String accountType;
+ private String account;
+ private String registryDesignation;
+ private String registryInstrumentType;
+ private String registryCapacity;
+ private String registryUnit;
+ private String registryCode;
+ private Long tradingClearingRegistryId;
+ private String tradingClearingRegistry;
+ private String registryStatus;
+ private Long securityId;
+ private BigDecimal balance;
+ private BigDecimal openBalance;
+ private BigDecimal closeBalance;
+ private BigDecimal credit;
+ private BigDecimal debit;
+ private BigDecimal settledCredit;
+ private BigDecimal settledDebit;
+ private BigDecimal checkBalance;
+ private BigDecimal diffBalance;
+ private BigDecimal planBalance;
+ private String balanceDimension;
+ private LocalDate settlementDate;
+ private String settlementCode;
+ private LocalDate tradingDate;
+ private LocalDate clearingDate;
+ private LocalDate refundDate;
+ private LocalDate valueDate;
+ private BigDecimal price;
+ private String contract;
+ private Long counterPartyId;
+ private String comment;
+ private Long parentId;
+ private Long groupId;
+ private Long sessionId;
+ private Long paymentId;
+ private Long refundPaymentId;
+ // (in parent) private Long id;
+ private Instant createdAt;
+ private Instant updatedAt;
+
+ public Long getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Long value) {
+ this.companyId = value;
+ }
+
+ public String getTradingCode() {
+ return tradingCode;
+ }
+
+ public void setTradingCode(String value) {
+ this.tradingCode = value;
+ }
+
+ public String getClearingCode() {
+ return clearingCode;
+ }
+
+ public void setClearingCode(String value) {
+ this.clearingCode = value;
+ }
+
+ public String getShortName() {
+ return shortName;
+ }
+
+ public void setShortName(String value) {
+ this.shortName = value;
+ }
+
+ public String getFullName() {
+ return fullName;
+ }
+
+ public void setFullName(String value) {
+ this.fullName = value;
+ }
+
+ public Long getAccountId() {
+ return accountId;
+ }
+
+ public void setAccountId(Long value) {
+ this.accountId = value;
+ }
+
+ public String getAccountType() {
+ return accountType;
+ }
+
+ public void setAccountType(String value) {
+ this.accountType = value;
+ }
+
+ public String getAccount() {
+ return account;
+ }
+
+ public void setAccount(String value) {
+ this.account = value;
+ }
+
+ public String getRegistryDesignation() {
+ return registryDesignation;
+ }
+
+ public void setRegistryDesignation(String value) {
+ this.registryDesignation = value;
+ }
+
+ public String getRegistryInstrumentType() {
+ return registryInstrumentType;
+ }
+
+ public void setRegistryInstrumentType(String value) {
+ this.registryInstrumentType = value;
+ }
+
+ public String getRegistryCapacity() {
+ return registryCapacity;
+ }
+
+ public void setRegistryCapacity(String value) {
+ this.registryCapacity = value;
+ }
+
+ public String getRegistryUnit() {
+ return registryUnit;
+ }
+
+ public void setRegistryUnit(String value) {
+ this.registryUnit = value;
+ }
+
+ public String getRegistryCode() {
+ return registryCode;
+ }
+
+ public void setRegistryCode(String value) {
+ this.registryCode = value;
+ }
+
+ public Long getTradingClearingRegistryId() {
+ return tradingClearingRegistryId;
+ }
+
+ public void setTradingClearingRegistryId(Long value) {
+ this.tradingClearingRegistryId = value;
+ }
+
+ public String getTradingClearingRegistry() {
+ return tradingClearingRegistry;
+ }
+
+ public void setTradingClearingRegistry(String value) {
+ this.tradingClearingRegistry = value;
+ }
+
+ public String getRegistryStatus() {
+ return registryStatus;
+ }
+
+ public void setRegistryStatus(String value) {
+ this.registryStatus = value;
+ }
+
+ public Long getSecurityId() {
+ return securityId;
+ }
+
+ public void setSecurityId(Long value) {
+ this.securityId = value;
+ }
+
+ public BigDecimal getBalance() {
+ return balance;
+ }
+
+ public void setBalance(BigDecimal value) {
+ this.balance = value;
+ }
+
+ public BigDecimal getOpenBalance() {
+ return openBalance;
+ }
+
+ public void setOpenBalance(BigDecimal value) {
+ this.openBalance = value;
+ }
+
+ public BigDecimal getCloseBalance() {
+ return closeBalance;
+ }
+
+ public void setCloseBalance(BigDecimal value) {
+ this.closeBalance = value;
+ }
+
+ public BigDecimal getCredit() {
+ return credit;
+ }
+
+ public void setCredit(BigDecimal value) {
+ this.credit = value;
+ }
+
+ public BigDecimal getDebit() {
+ return debit;
+ }
+
+ public void setDebit(BigDecimal value) {
+ this.debit = value;
+ }
+
+ public BigDecimal getSettledCredit() {
+ return settledCredit;
+ }
+
+ public void setSettledCredit(BigDecimal value) {
+ this.settledCredit = value;
+ }
+
+ public BigDecimal getSettledDebit() {
+ return settledDebit;
+ }
+
+ public void setSettledDebit(BigDecimal value) {
+ this.settledDebit = value;
+ }
+
+ public BigDecimal getCheckBalance() {
+ return checkBalance;
+ }
+
+ public void setCheckBalance(BigDecimal value) {
+ this.checkBalance = value;
+ }
+
+ public BigDecimal getDiffBalance() {
+ return diffBalance;
+ }
+
+ public void setDiffBalance(BigDecimal value) {
+ this.diffBalance = value;
+ }
+
+ public BigDecimal getPlanBalance() {
+ return planBalance;
+ }
+
+ public void setPlanBalance(BigDecimal value) {
+ this.planBalance = value;
+ }
+
+ public String getBalanceDimension() {
+ return balanceDimension;
+ }
+
+ public void setBalanceDimension(String value) {
+ this.balanceDimension = value;
+ }
+
+ public LocalDate getSettlementDate() {
+ return settlementDate;
+ }
+
+ public void setSettlementDate(LocalDate value) {
+ this.settlementDate = value;
+ }
+
+ public String getSettlementCode() {
+ return settlementCode;
+ }
+
+ public void setSettlementCode(String value) {
+ this.settlementCode = value;
+ }
+
+ public LocalDate getTradingDate() {
+ return tradingDate;
+ }
+
+ public void setTradingDate(LocalDate value) {
+ this.tradingDate = value;
+ }
+
+ public LocalDate getClearingDate() {
+ return clearingDate;
+ }
+
+ public void setClearingDate(LocalDate value) {
+ this.clearingDate = value;
+ }
+
+ public LocalDate getRefundDate() {
+ return refundDate;
+ }
+
+ public void setRefundDate(LocalDate value) {
+ this.refundDate = value;
+ }
+
+ public LocalDate getValueDate() {
+ return valueDate;
+ }
+
+ public void setValueDate(LocalDate value) {
+ this.valueDate = value;
+ }
+
+ public BigDecimal getPrice() {
+ return price;
+ }
+
+ public void setPrice(BigDecimal value) {
+ this.price = value;
+ }
+
+ public String getContract() {
+ return contract;
+ }
+
+ public void setContract(String value) {
+ this.contract = value;
+ }
+
+ public Long getCounterPartyId() {
+ return counterPartyId;
+ }
+
+ public void setCounterPartyId(Long value) {
+ this.counterPartyId = value;
+ }
+
+ public String getComment() {
+ return comment;
+ }
+
+ public void setComment(String value) {
+ this.comment = value;
+ }
+
+ public Long getParentId() {
+ return parentId;
+ }
+
+ public void setParentId(Long value) {
+ this.parentId = value;
+ }
+
+ public Long getGroupId() {
+ return groupId;
+ }
+
+ public void setGroupId(Long value) {
+ this.groupId = value;
+ }
+
+ public Long getSessionId() {
+ return sessionId;
+ }
+
+ public void setSessionId(Long value) {
+ this.sessionId = value;
+ }
+
+ public Long getPaymentId() {
+ return paymentId;
+ }
+
+ public void setPaymentId(Long value) {
+ this.paymentId = value;
+ }
+
+ public Long getRefundPaymentId() {
+ return refundPaymentId;
+ }
+
+ public void setRefundPaymentId(Long value) {
+ this.refundPaymentId = 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;
+ }
+
+}
diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/registry/RegistryHistory.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/registry/RegistryHistory.java
new file mode 100644
index 000000000..5650de6cf
--- /dev/null
+++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/registry/RegistryHistory.java
@@ -0,0 +1,28 @@
+package ru.clearing.classes.statics.data.registry;
+
+import ru.clearing.classes.ConstSerializable;
+import ru.clearing.classes.objects.BusinessEvent;
+
+import java.io.Serial;
+
+/**
+ * Изменение состояния объекта Регистр активов, обязательств и требований УК
+ *
+ * DB table: REGISTRY_HISTORY
+ **/
+public class RegistryHistory extends BusinessEvent
+ * DB table: TRADING_CLEARING_REGISTRY
+ **/
+public class TradingClearingRegistry extends BusinessObject {
+ private static final long serialVersionUID = ConstSerializable.serialVersionUID;
+
+ private Long companyId;
+ private String code;
+ private Long moneyAccountId;
+ private Long depoAaccountId;
+ private String tradingClearingRegistryType;
+ private String tradingClearingRegistryLevel;
+ private String tradingClearingRegistryPurpose;
+ private String status;
+
+ public Long getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Long value) {
+ this.companyId = value;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String value) {
+ this.code = value;
+ }
+
+ public Long getMoneyAccountId() {
+ return moneyAccountId;
+ }
+
+ public void setMoneyAccountId(Long value) {
+ this.moneyAccountId = value;
+ }
+
+ public Long getDepoAaccountId() {
+ return depoAaccountId;
+ }
+
+ public void setDepoAaccountId(Long value) {
+ this.depoAaccountId = value;
+ }
+
+ public String getTradingClearingRegistryType() {
+ return tradingClearingRegistryType;
+ }
+
+ public void setTradingClearingRegistryType(String value) {
+ this.tradingClearingRegistryType = value;
+ }
+
+ public String getTradingClearingRegistryLevel() {
+ return tradingClearingRegistryLevel;
+ }
+
+ public void setTradingClearingRegistryLevel(String value) {
+ this.tradingClearingRegistryLevel = value;
+ }
+
+ public String getTradingClearingRegistryPurpose() {
+ return tradingClearingRegistryPurpose;
+ }
+
+ public void setTradingClearingRegistryPurpose(String value) {
+ this.tradingClearingRegistryPurpose = value;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String value) {
+ this.status = value;
+ }
+
+}
\ No newline at end of file
diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/registry/TradingClearingRegistryHistory.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/registry/TradingClearingRegistryHistory.java
new file mode 100644
index 000000000..a8b77b902
--- /dev/null
+++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/registry/TradingClearingRegistryHistory.java
@@ -0,0 +1,28 @@
+package ru.clearing.classes.statics.data.registry;
+
+import ru.clearing.classes.ConstSerializable;
+import ru.clearing.classes.objects.BusinessEvent;
+
+import java.io.Serial;
+
+/**
+ * Изменение состояния объекта Торгово-клиринговый регистр
+ *
+ * DB table: TRADING_CLEARING_REGISTRY_HISTORY
+ **/
+public class TradingClearingRegistryHistory extends BusinessEvent
+ * DB table: S_DF53
+ **/
+public class SDf53 extends SpcexObjectBase {
+ private static final long serialVersionUID = ConstSerializable.serialVersionUID;
+
+ private String account;
+ private String deal;
+ private Long status;
+ private BigDecimal result;
+ private Instant generationTime;
+ private Long generationId;
+ private Long inSDfId;
+
+ public String getAccount() {
+ return account;
+ }
+
+ public void setAccount(String value) {
+ this.account = value;
+ }
+
+ public String getDeal() {
+ return deal;
+ }
+
+ public void setDeal(String value) {
+ this.deal = value;
+ }
+
+ public Long getStatus() {
+ return status;
+ }
+
+ public void setStatus(Long value) {
+ this.status = value;
+ }
+
+ public BigDecimal getResult() {
+ return result;
+ }
+
+ public void setResult(BigDecimal value) {
+ this.result = value;
+ }
+
+ public Instant getGenerationTime() {
+ return generationTime;
+ }
+
+ public void setGenerationTime(Instant value) {
+ this.generationTime = value;
+ }
+
+ public Long getGenerationId() {
+ return generationId;
+ }
+
+ public void setGenerationId(Long value) {
+ this.generationId = value;
+ }
+
+ public Long getInSDfId() {
+ return inSDfId;
+ }
+
+ public void setInSDfId(Long value) {
+ this.inSDfId = value;
+ }
+
+}
\ No newline at end of file
diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/security/Security.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/security/Security.java
index b962fd9a8..49d06d171 100644
--- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/security/Security.java
+++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/security/Security.java
@@ -22,6 +22,7 @@ public class Security extends BusinessObject implements WithWorkflowStatus, With
private String securitySymbol;
private String isin;
private String workflowStatus;
+ private String uuid;
public String getInstrumentType() {
return instrumentType;
@@ -95,4 +96,11 @@ public class Security extends BusinessObject implements WithWorkflowStatus, With
this.workflowStatus = value;
}
+ public String getUuid() {
+ return uuid;
+ }
+
+ public void setUuid(String uuid) {
+ this.uuid = uuid;
+ }
}
\ No newline at end of file
diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/SortingConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/SortingConfig.java
index b45a0085d..b84cc8e95 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/SortingConfig.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/SortingConfig.java
@@ -3,7 +3,7 @@ package ru.spcex.clearing.config;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import ru.clearing.classes.statics.data.generated.ClearingMemberCategory;
+import ru.clearing.classes.statics.data.company.ClearingMemberCategory;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.platform.enumeration.ClearingCategory;
import ru.spcex.platform.imdg.api.Imdg;
diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/Clearing.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/Clearing.java
index 7dcbd75a6..3e97acbb6 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/Clearing.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/Clearing.java
@@ -5,7 +5,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import ru.clearing.classes.statics.data.execution.ExecutionDeposit;
-import ru.clearing.classes.statics.data.generated.ClearingMemberCategory;
+import ru.clearing.classes.statics.data.company.ClearingMemberCategory;
import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets;
import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsMoney;
import ru.clearing.classes.statics.data.payment.PaymentInstruction;
diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/SdfCreatorBySTLDPayment.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/SdfCreatorBySTLDPayment.java
index 22f2c9c4e..8d49ef72e 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/SdfCreatorBySTLDPayment.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/SdfCreatorBySTLDPayment.java
@@ -5,7 +5,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import ru.clearing.classes.statics.data.company.Company;
-import ru.clearing.classes.statics.data.generated.ClearingMemberCategory;
+import ru.clearing.classes.statics.data.company.ClearingMemberCategory;
import ru.clearing.classes.statics.data.payment.PaymentInstruction;
import ru.clearing.classes.statics.data.sdf.SDf03;
import ru.clearing.classes.statics.data.sdf.SDf11;
diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/VerificationResultComponent.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/VerificationResultComponent.java
index 3beebfcb7..c10007d94 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/VerificationResultComponent.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/VerificationResultComponent.java
@@ -200,7 +200,7 @@ public class VerificationResultComponent {
.map(sdf01 -> sdf01.getDeal())
.collect(Collectors.toSet());
Set extends TemplateMapStore {
+
+ protected final int validateSecuritySize;
+
+ public ASecurityMapStore(JdbcTemplate jdbcTemplate) {
+ super(jdbcTemplate);
+ validateSecuritySize = getFieldsSecurity().length;
+ }
+
+ public String[] getFieldsSecurity() {
+ return new String[]{"ID", "CREATED_AT", "UPDATED_AT", "INSTRUMENT_TYPE", "ISSUER_ID", "SHORT_NAME", "FULL_NAME", "SHORT_NAME_ENG", "FULL_NAME_ENG", "SECURITY_SYMBOL", "ISIN", "WORKFLOW_STATUS", "UUID"};
+ }
+
+ private final String insertToSecurityStatement = makeInsertSql("SECURITY",
+ getFieldsSecurity(), "id");
+
+
+
+ protected void fillBySecurity(S object, Long securityId) {
+ List resouts = jdbcTemplate.query(
+ "SELECT * FROM SECURITY WHERE id = ?", new Object[]{securityId},
+ (rs, rowNum) -> {
+ object.setCreated(getInstantFromTimestamp(rs, "CREATED_AT"));
+ object.setUpdated(getInstantFromTimestamp(rs, "UPDATED_AT"));
+ object.setInstrumentType(rs.getObject("INSTRUMENT_TYPE", String.class));
+ object.setIssuerId(rs.getObject("issuer_id", Long.class));
+ object.setShortName(rs.getObject("short_name", String.class));
+ object.setFullName(rs.getObject("FULL_NAME", String.class));
+ object.setShortNameEng(rs.getObject("short_name_eng", String.class));
+ object.setFullNameEng(rs.getObject("full_name_eng", String.class));
+ object.setSecuritySymbol(rs.getObject("SECURITY_SYMBOL", String.class));
+ object.setIsin(rs.getObject("ISIN", String.class));
+ object.setWorkflowStatus(rs.getObject("workflow_status", String.class));
+ object.setIsin(rs.getObject("UUID", String.class));
+ return object;
+ }
+ );
+ if (resouts.size() != 1) {
+ log.warn("Result size={} not expected for table SECURITY, {} where id={}", getTableName(), resouts.size(), securityId);
+ }
+ }
+
+
+ protected Object[] securityField(S object) {
+ Object[] args = new Object[]{
+ object.getId(), // SecurityId
+ TimeUtil.toDateFromInstant(object.getCreated()),
+ TimeUtil.toDateFromInstant(object.getUpdated()),
+ object.getInstrumentType(),
+ object.getIssuerId(),
+ object.getShortName(),
+ object.getFullName(),
+ object.getShortNameEng(),
+ object.getFullNameEng(),
+ object.getSecuritySymbol(),
+ object.getIsin(),
+ object.getWorkflowStatus(),
+ object.getUuid()
+ };
+ return args;
+ }
+
+ @Override
+ public void store(Map