diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/MarketDataLiquidation.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/MarketDataLiquidation.java new file mode 100644 index 000000000..066986ea2 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/MarketDataLiquidation.java @@ -0,0 +1,45 @@ +package ru.clearing.classes.statics.data.misc; + +import ru.clearing.classes.ConstSerializable; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +import java.math.BigDecimal; +import java.time.LocalDate; + +/** + * Статичная ценовая информация для ликвидации активов + *

+ * DB table: MARKET_DATA_LIQUIDATION + **/ +public class MarketDataLiquidation extends SpcexObjectBase { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private Long securityId; + private BigDecimal price; + private LocalDate clearingDate; + + public Long getSecurityId() { + return securityId; + } + + public void setSecurityId(Long value) { + this.securityId = value; + } + + public BigDecimal getPrice() { + return price; + } + + public void setPrice(BigDecimal value) { + this.price = value; + } + + public LocalDate getClearingDate() { + return clearingDate; + } + + public void setClearingDate(LocalDate value) { + this.clearingDate = value; + } + +} diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/Notification.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/Notification.java index df2b6e295..4474adea4 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/Notification.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/Notification.java @@ -13,7 +13,7 @@ public class Notification extends BusinessObject { private Long senderId; private Long addresseeId; private String objectType; - private Instant objectId; + private Long objectId; private String notificationStatus; public LocalDate getClearingDate() { @@ -48,11 +48,11 @@ public class Notification extends BusinessObject { this.objectType = objectType; } - public Instant getObjectId() { + public Long getObjectId() { return objectId; } - public void setObjectId(Instant objectId) { + public void setObjectId(Long objectId) { this.objectId = objectId; } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/NotificationHistory.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/NotificationHistory.java new file mode 100644 index 000000000..bb774c91c --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/NotificationHistory.java @@ -0,0 +1,28 @@ +package ru.clearing.classes.statics.data.misc; + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessEvent; + +import java.io.Serial; + +/** + * Изменение состояния объекта Сообщения + *

+ * DB table: NOTIFICATION_HISTORY + **/ +public class NotificationHistory extends BusinessEvent { + @Serial + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private Notification object; + + @Override + public Notification getObject() { + return object; + } + + @Override + public void setObject(Notification object) { + this.object = object; + } +} \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/payment/Operation.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/payment/Operation.java new file mode 100644 index 000000000..f8a8f5d0b --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/payment/Operation.java @@ -0,0 +1,61 @@ +package ru.clearing.classes.statics.data.payment; + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessObject; +import java.time.LocalDate; + +/** + * Проводки + * + * DB table: OPERATION + **/ +public class Operation extends BusinessObject { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private Long addresseeId; + private Long senderId; + private LocalDate clearingDate; + private Long operationTypeId; + private String operationStatus; + + public Long getAddresseeId() { + return addresseeId; + } + + public void setAddresseeId(Long value) { + this.addresseeId = value; + } + + public Long getSenderId() { + return senderId; + } + + public void setSenderId(Long value) { + this.senderId = value; + } + + public LocalDate getClearingDate() { + return clearingDate; + } + + public void setClearingDate(LocalDate value) { + this.clearingDate = value; + } + + public Long getOperationTypeId() { + return operationTypeId; + } + + public void setOperationTypeId(Long value) { + this.operationTypeId = value; + } + + public String getOperationStatus() { + return operationStatus; + } + + public void setOperationStatus(String value) { + this.operationStatus = value; + } + +} \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/payment/PaymentInstruction.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/payment/PaymentInstruction.java index d9e54e5e4..7370f7111 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/payment/PaymentInstruction.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/payment/PaymentInstruction.java @@ -3,35 +3,40 @@ package ru.clearing.classes.statics.data.payment; import ru.clearing.classes.ConstSerializable; import ru.clearing.classes.objects.BusinessObject; +import java.math.BigDecimal; import java.time.Instant; import java.time.LocalDate; public class PaymentInstruction extends BusinessObject { private static final long serialVersionUID = ConstSerializable.serialVersionUID; - private Long senderId; // type="1" - private Long addresseeId; // type="1" - private String adresseeBic; // type="2" - private String payeeBankName; // type="2" - private String payeeBic; // type="2" - private String addresseeBankName; // type="2" - private Instant paymentDate; // type="4" - private String paymentPurpose; // type="2" - private LocalDate settlementDate; // type="6" - private Long creditLegAmount; // type="1" - private Long debitLegAmount; // type="1" - private Long creditLegAccountId; // type="1" - private String creditCsAccount; // type="2" - private String creditLegAccount; // type="2" - private Long debitLegAccountId; // type="1" - private String debitCsAccount; // type="2" - private String debitLegAccount; // type="2" - private Long creditLegDirection; // type="1" - private Long debitLegDirection; // type="1" - private String creditLegCurrencyCode; // type="12" - private String debitLegCurrencyCode; // type="12" - private LocalDate clearingDate; // type="6" - private String transactionStatus; // type="12" - private String documentNumber; // type="2" + + private Long senderId; + private Long addresseeId; + private String payeeBic; + private String adresseeBic; + private String payeeBankName; + private String addresseeBankName; + private Instant paymentDate; + private String paymentPurpose; + private LocalDate settlementDate; + private BigDecimal creditLeg_amount; + private BigDecimal debitLeg_amount; + private Long creditLeg_accountId; + private String credit_csAccount; + private String creditLeg_account; + private Long debitLeg_accountId; + private String debit_csAccount; + private String debitLeg_account; + private String creditLeg_direction; + private String debitLeg_direction; + private String creditLeg_currencyCode; + private String debitLeg_currencyCode; + private Long creditLeg_securityId; + private Long debitLeg_securityId; + private String transactionStatus; + private String documentNumber; + private LocalDate clearingDate; + private Long sessionId; public Long getSenderId() { return senderId; @@ -49,6 +54,14 @@ public class PaymentInstruction extends BusinessObject { this.addresseeId = addresseeId; } + public String getPayeeBic() { + return payeeBic; + } + + public void setPayeeBic(String payeeBic) { + this.payeeBic = payeeBic; + } + public String getAdresseeBic() { return adresseeBic; } @@ -65,14 +78,6 @@ public class PaymentInstruction extends BusinessObject { this.payeeBankName = payeeBankName; } - public String getPayeeBic() { - return payeeBic; - } - - public void setPayeeBic(String payeeBic) { - this.payeeBic = payeeBic; - } - public String getAddresseeBankName() { return addresseeBankName; } @@ -105,108 +110,116 @@ public class PaymentInstruction extends BusinessObject { this.settlementDate = settlementDate; } - public Long getCreditLegAmount() { - return creditLegAmount; + public BigDecimal getCreditLeg_amount() { + return creditLeg_amount; } - public void setCreditLegAmount(Long creditLegAmount) { - this.creditLegAmount = creditLegAmount; + public void setCreditLeg_amount(BigDecimal creditLeg_amount) { + this.creditLeg_amount = creditLeg_amount; } - public Long getDebitLegAmount() { - return debitLegAmount; + public BigDecimal getDebitLeg_amount() { + return debitLeg_amount; } - public void setDebitLegAmount(Long debitLegAmount) { - this.debitLegAmount = debitLegAmount; + public void setDebitLeg_amount(BigDecimal debitLeg_amount) { + this.debitLeg_amount = debitLeg_amount; } - public Long getCreditLegAccountId() { - return creditLegAccountId; + public Long getCreditLeg_accountId() { + return creditLeg_accountId; } - public void setCreditLegAccountId(Long creditLegAccountId) { - this.creditLegAccountId = creditLegAccountId; + public void setCreditLeg_accountId(Long creditLeg_accountId) { + this.creditLeg_accountId = creditLeg_accountId; } - public String getCreditCsAccount() { - return creditCsAccount; + public String getCredit_csAccount() { + return credit_csAccount; } - public void setCreditCsAccount(String creditCsAccount) { - this.creditCsAccount = creditCsAccount; + public void setCredit_csAccount(String credit_csAccount) { + this.credit_csAccount = credit_csAccount; } - public String getCreditLegAccount() { - return creditLegAccount; + public String getCreditLeg_account() { + return creditLeg_account; } - public void setCreditLegAccount(String creditLegAccount) { - this.creditLegAccount = creditLegAccount; + public void setCreditLeg_account(String creditLeg_account) { + this.creditLeg_account = creditLeg_account; } - public Long getDebitLegAccountId() { - return debitLegAccountId; + public Long getDebitLeg_accountId() { + return debitLeg_accountId; } - public void setDebitLegAccountId(Long debitLegAccountId) { - this.debitLegAccountId = debitLegAccountId; + public void setDebitLeg_accountId(Long debitLeg_accountId) { + this.debitLeg_accountId = debitLeg_accountId; } - public String getDebitCsAccount() { - return debitCsAccount; + public String getDebit_csAccount() { + return debit_csAccount; } - public void setDebitCsAccount(String debitCsAccount) { - this.debitCsAccount = debitCsAccount; + public void setDebit_csAccount(String debit_csAccount) { + this.debit_csAccount = debit_csAccount; } - public String getDebitLegAccount() { - return debitLegAccount; + public String getDebitLeg_account() { + return debitLeg_account; } - public void setDebitLegAccount(String debitLegAccount) { - this.debitLegAccount = debitLegAccount; + public void setDebitLeg_account(String debitLeg_account) { + this.debitLeg_account = debitLeg_account; } - public Long getCreditLegDirection() { - return creditLegDirection; + public String getCreditLeg_direction() { + return creditLeg_direction; } - public void setCreditLegDirection(Long creditLegDirection) { - this.creditLegDirection = creditLegDirection; + public void setCreditLeg_direction(String creditLeg_direction) { + this.creditLeg_direction = creditLeg_direction; } - public Long getDebitLegDirection() { - return debitLegDirection; + public String getDebitLeg_direction() { + return debitLeg_direction; } - public void setDebitLegDirection(Long debitLegDirection) { - this.debitLegDirection = debitLegDirection; + public void setDebitLeg_direction(String debitLeg_direction) { + this.debitLeg_direction = debitLeg_direction; } - public String getCreditLegCurrencyCode() { - return creditLegCurrencyCode; + public String getCreditLeg_currencyCode() { + return creditLeg_currencyCode; } - public void setCreditLegCurrencyCode(String creditLegCurrencyCode) { - this.creditLegCurrencyCode = creditLegCurrencyCode; + public void setCreditLeg_currencyCode(String creditLeg_currencyCode) { + this.creditLeg_currencyCode = creditLeg_currencyCode; } - public String getDebitLegCurrencyCode() { - return debitLegCurrencyCode; + public String getDebitLeg_currencyCode() { + return debitLeg_currencyCode; } - public void setDebitLegCurrencyCode(String debitLegCurrencyCode) { - this.debitLegCurrencyCode = debitLegCurrencyCode; + public void setDebitLeg_currencyCode(String debitLeg_currencyCode) { + this.debitLeg_currencyCode = debitLeg_currencyCode; } - public LocalDate getClearingDate() { - return clearingDate; + public Long getCreditLeg_securityId() { + return creditLeg_securityId; } - public void setClearingDate(LocalDate clearingDate) { - this.clearingDate = clearingDate; + public void setCreditLeg_securityId(Long creditLeg_securityId) { + this.creditLeg_securityId = creditLeg_securityId; + } + + public Long getDebitLeg_securityId() { + return debitLeg_securityId; + } + + public void setDebitLeg_securityId(Long debitLeg_securityId) { + this.debitLeg_securityId = debitLeg_securityId; } public String getTransactionStatus() { @@ -224,4 +237,20 @@ public class PaymentInstruction extends BusinessObject { public void setDocumentNumber(String documentNumber) { this.documentNumber = documentNumber; } + + public LocalDate getClearingDate() { + return clearingDate; + } + + public void setClearingDate(LocalDate clearingDate) { + this.clearingDate = clearingDate; + } + + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } } \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ContractRegister.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ContractRegister.java index 186f2d69f..abc1f6f44 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ContractRegister.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ContractRegister.java @@ -11,7 +11,7 @@ public class ContractRegister extends BusinessObject { private String name; private String number; private LocalDate issueDate; - private Long companyFullName; + private String companyFullName; private Long companyId; private String documentType; private String issuePlace; @@ -47,11 +47,11 @@ public class ContractRegister extends BusinessObject { this.issueDate = issueDate; } - public Long getCompanyFullName() { + public String getCompanyFullName() { return companyFullName; } - public void setCompanyFullName(Long companyFullName) { + public void setCompanyFullName(String companyFullName) { this.companyFullName = companyFullName; } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ReportRegister.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ReportRegister.java index 6cda6e948..b15481ac9 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ReportRegister.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ReportRegister.java @@ -5,6 +5,9 @@ import ru.clearing.classes.objects.BusinessObject; import java.time.LocalDate; +/** + * DB table: REPORT_REGISTER + */ public class ReportRegister extends BusinessObject { private static final long serialVersionUID = ConstSerializable.serialVersionUID; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf01.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf01.java index 2a4e77b3e..d17918ae7 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf01.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf01.java @@ -8,7 +8,7 @@ import ru.spcex.platform.classes.base.interfaces.WithMarket; import java.time.Instant; /** - * ДФ-01 Информация о денежных средствах, находящихся на торговых банковских счетах Участников клиринга + * ДФ-01 Информации о денежных средствах, находящихся на торговых банковских счетах участников клиринга *

* DB table: S_DF01 **/ diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf02.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf02.java index d905b58ab..3d2608149 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf02.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf02.java @@ -29,7 +29,7 @@ public class SDf02 extends SpcexObjectBase implements WithAccount { private String result; private Instant generationTime; private Long generationId; - private Long inSDf01Id; + private Long inSDfId; public String getCurr_code() { return curr_code; @@ -152,12 +152,11 @@ public class SDf02 extends SpcexObjectBase implements WithAccount { this.generationId = value; } - public Long getInSDf01Id() { - return inSDf01Id; + public Long getInSDfId() { + return inSDfId; } - public void setInSDf01Id(Long value) { - this.inSDf01Id = value; + public void setInSDfId(Long inSDfId) { + this.inSDfId = inSDfId; } - } \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf03.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf03.java index a8ab57740..fd41ea0ea 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf03.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf03.java @@ -6,7 +6,7 @@ import ru.spcex.platform.classes.base.SpcexObjectBase; import java.time.Instant; /** - * ДФ-03 Сводное платежное поручение + * ДФ-03 Реестр платежных поручений *

* DB table: S_DF03 **/ @@ -17,15 +17,12 @@ public class SDf03 extends SpcexObjectBase { private String doc_type; private String docnm_ref; private String docnmprev; - private String priority; - private String sbankcode; private String c_acc_deb; private String sbanknam1; private String sbanknam2; private String sbanknam3; private String sbanknam4; private String sbanknam5; - private String rbankcode; private String c_acc_cred; private String rbanknam1; private String rbanknam2; @@ -33,31 +30,9 @@ public class SDf03 extends SpcexObjectBase { private String rbanknam4; private String rbanknam5; private String pay_date; - private String ext_date; private String pay_val; private String sum_deb; - private String sclientn1; - private String sclientn2; - private String sclientn3; - private String sclientn4; - private String sc_code; - private String acc_deb; - private String rclientn1; - private String rclientn2; - private String rclientn3; - private String rclientn4; - private String acc_kr_1; - private String acc_kr_2; - private String sp_code; private String specif_1; - private String specif_2; - private String specif_3; - private String specif_4; - private String specif_5; - private String specif_6; - private String send_type; - private String servdate; - private String doc_result; private String imp_result; private Instant generationTime; private Long generationId; @@ -87,20 +62,12 @@ public class SDf03 extends SpcexObjectBase { this.docnm_ref = docnm_ref; } - public String getPriority() { - return priority; + public String getDocnmprev() { + return docnmprev; } - public void setPriority(String priority) { - this.priority = priority; - } - - public String getSbankcode() { - return sbankcode; - } - - public void setSbankcode(String sbankcode) { - this.sbankcode = sbankcode; + public void setDocnmprev(String docnmprev) { + this.docnmprev = docnmprev; } public String getC_acc_deb() { @@ -151,14 +118,6 @@ public class SDf03 extends SpcexObjectBase { this.sbanknam5 = sbanknam5; } - public String getRbankcode() { - return rbankcode; - } - - public void setRbankcode(String rbankcode) { - this.rbankcode = rbankcode; - } - public String getC_acc_cred() { return c_acc_cred; } @@ -215,14 +174,6 @@ public class SDf03 extends SpcexObjectBase { this.pay_date = pay_date; } - public String getExt_date() { - return ext_date; - } - - public void setExt_date(String ext_date) { - this.ext_date = ext_date; - } - public String getPay_val() { return pay_val; } @@ -239,110 +190,6 @@ public class SDf03 extends SpcexObjectBase { this.sum_deb = sum_deb; } - public String getSclientn1() { - return sclientn1; - } - - public void setSclientn1(String sclientn1) { - this.sclientn1 = sclientn1; - } - - public String getSclientn2() { - return sclientn2; - } - - public void setSclientn2(String sclientn2) { - this.sclientn2 = sclientn2; - } - - public String getSclientn3() { - return sclientn3; - } - - public void setSclientn3(String sclientn3) { - this.sclientn3 = sclientn3; - } - - public String getSclientn4() { - return sclientn4; - } - - public void setSclientn4(String sclientn4) { - this.sclientn4 = sclientn4; - } - - public String getSc_code() { - return sc_code; - } - - public void setSc_code(String sc_code) { - this.sc_code = sc_code; - } - - public String getAcc_deb() { - return acc_deb; - } - - public void setAcc_deb(String acc_deb) { - this.acc_deb = acc_deb; - } - - public String getRclientn1() { - return rclientn1; - } - - public void setRclientn1(String rclientn1) { - this.rclientn1 = rclientn1; - } - - public String getRclientn2() { - return rclientn2; - } - - public void setRclientn2(String rclientn2) { - this.rclientn2 = rclientn2; - } - - public String getRclientn3() { - return rclientn3; - } - - public void setRclientn3(String rclientn3) { - this.rclientn3 = rclientn3; - } - - public String getRclientn4() { - return rclientn4; - } - - public void setRclientn4(String rclientn4) { - this.rclientn4 = rclientn4; - } - - public String getAcc_kr_1() { - return acc_kr_1; - } - - public void setAcc_kr_1(String acc_kr_1) { - this.acc_kr_1 = acc_kr_1; - } - - public String getAcc_kr_2() { - return acc_kr_2; - } - - public void setAcc_kr_2(String acc_kr_2) { - this.acc_kr_2 = acc_kr_2; - } - - public String getSp_code() { - return sp_code; - } - - public void setSp_code(String sp_code) { - this.sp_code = sp_code; - } - public String getSpecif_1() { return specif_1; } @@ -351,70 +198,6 @@ public class SDf03 extends SpcexObjectBase { this.specif_1 = specif_1; } - public String getSpecif_2() { - return specif_2; - } - - public void setSpecif_2(String specif_2) { - this.specif_2 = specif_2; - } - - public String getSpecif_3() { - return specif_3; - } - - public void setSpecif_3(String specif_3) { - this.specif_3 = specif_3; - } - - public String getSpecif_4() { - return specif_4; - } - - public void setSpecif_4(String specif_4) { - this.specif_4 = specif_4; - } - - public String getSpecif_5() { - return specif_5; - } - - public void setSpecif_5(String specif_5) { - this.specif_5 = specif_5; - } - - public String getSpecif_6() { - return specif_6; - } - - public void setSpecif_6(String specif_6) { - this.specif_6 = specif_6; - } - - public String getSend_type() { - return send_type; - } - - public void setSend_type(String send_type) { - this.send_type = send_type; - } - - public String getServdate() { - return servdate; - } - - public void setServdate(String servdate) { - this.servdate = servdate; - } - - public String getDoc_result() { - return doc_result; - } - - public void setDoc_result(String doc_result) { - this.doc_result = doc_result; - } - public String getImp_result() { return imp_result; } @@ -439,14 +222,6 @@ public class SDf03 extends SpcexObjectBase { this.generationId = generationId; } - public String getDocnmprev() { - return docnmprev; - } - - public void setDocnmprev(String docnmprev) { - this.docnmprev = docnmprev; - } - public Long getPaymentInstructionId() { return paymentInstructionId; } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf04.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf04.java index 4f651e876..015b2fc12 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf04.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf04.java @@ -6,7 +6,7 @@ import ru.spcex.platform.classes.base.SpcexObjectBase; import java.time.Instant; /** - * ДФ-03 Сводное платежное поручение + * ДФ-04 Подтверждение проведения расчетов * * DB table: S_DF03 **/ @@ -17,15 +17,12 @@ public class SDf04 extends SpcexObjectBase { private String doc_type; private String docnm_ref; private String docnmprev; - private String priority; - private String sbankcode; private String c_acc_deb; private String sbanknam1; private String sbanknam2; private String sbanknam3; private String sbanknam4; private String sbanknam5; - private String rbankcode; private String c_acc_cred; private String rbanknam1; private String rbanknam2; @@ -33,33 +30,11 @@ public class SDf04 extends SpcexObjectBase { private String rbanknam4; private String rbanknam5; private String pay_date; - private String ext_date; private String pay_val; private String sum_deb; - private String sclientn1; - private String sclientn2; - private String sclientn3; - private String sclientn4; - private String sc_code; - private String acc_deb; - private String rclientn1; - private String rclientn2; - private String rclientn3; - private String rclientn4; - private String acc_kr_1; - private String acc_kr_2; - private String sp_code; private String specif_1; - private String specif_2; - private String specif_3; - private String specif_4; - private String specif_5; - private String specif_6; - private String send_type; - private String servdate; - private String doc_result; private String imp_result; - private String file_name; + private String fileName; private Instant generationTime; private Long generationId; @@ -95,22 +70,6 @@ public class SDf04 extends SpcexObjectBase { this.docnmprev = docnmprev; } - public String getPriority() { - return priority; - } - - public void setPriority(String priority) { - this.priority = priority; - } - - public String getSbankcode() { - return sbankcode; - } - - public void setSbankcode(String sbankcode) { - this.sbankcode = sbankcode; - } - public String getC_acc_deb() { return c_acc_deb; } @@ -159,14 +118,6 @@ public class SDf04 extends SpcexObjectBase { this.sbanknam5 = sbanknam5; } - public String getRbankcode() { - return rbankcode; - } - - public void setRbankcode(String rbankcode) { - this.rbankcode = rbankcode; - } - public String getC_acc_cred() { return c_acc_cred; } @@ -223,14 +174,6 @@ public class SDf04 extends SpcexObjectBase { this.pay_date = pay_date; } - public String getExt_date() { - return ext_date; - } - - public void setExt_date(String ext_date) { - this.ext_date = ext_date; - } - public String getPay_val() { return pay_val; } @@ -247,110 +190,6 @@ public class SDf04 extends SpcexObjectBase { this.sum_deb = sum_deb; } - public String getSclientn1() { - return sclientn1; - } - - public void setSclientn1(String sclientn1) { - this.sclientn1 = sclientn1; - } - - public String getSclientn2() { - return sclientn2; - } - - public void setSclientn2(String sclientn2) { - this.sclientn2 = sclientn2; - } - - public String getSclientn3() { - return sclientn3; - } - - public void setSclientn3(String sclientn3) { - this.sclientn3 = sclientn3; - } - - public String getSclientn4() { - return sclientn4; - } - - public void setSclientn4(String sclientn4) { - this.sclientn4 = sclientn4; - } - - public String getSc_code() { - return sc_code; - } - - public void setSc_code(String sc_code) { - this.sc_code = sc_code; - } - - public String getAcc_deb() { - return acc_deb; - } - - public void setAcc_deb(String acc_deb) { - this.acc_deb = acc_deb; - } - - public String getRclientn1() { - return rclientn1; - } - - public void setRclientn1(String rclientn1) { - this.rclientn1 = rclientn1; - } - - public String getRclientn2() { - return rclientn2; - } - - public void setRclientn2(String rclientn2) { - this.rclientn2 = rclientn2; - } - - public String getRclientn3() { - return rclientn3; - } - - public void setRclientn3(String rclientn3) { - this.rclientn3 = rclientn3; - } - - public String getRclientn4() { - return rclientn4; - } - - public void setRclientn4(String rclientn4) { - this.rclientn4 = rclientn4; - } - - public String getAcc_kr_1() { - return acc_kr_1; - } - - public void setAcc_kr_1(String acc_kr_1) { - this.acc_kr_1 = acc_kr_1; - } - - public String getAcc_kr_2() { - return acc_kr_2; - } - - public void setAcc_kr_2(String acc_kr_2) { - this.acc_kr_2 = acc_kr_2; - } - - public String getSp_code() { - return sp_code; - } - - public void setSp_code(String sp_code) { - this.sp_code = sp_code; - } - public String getSpecif_1() { return specif_1; } @@ -359,70 +198,6 @@ public class SDf04 extends SpcexObjectBase { this.specif_1 = specif_1; } - public String getSpecif_2() { - return specif_2; - } - - public void setSpecif_2(String specif_2) { - this.specif_2 = specif_2; - } - - public String getSpecif_3() { - return specif_3; - } - - public void setSpecif_3(String specif_3) { - this.specif_3 = specif_3; - } - - public String getSpecif_4() { - return specif_4; - } - - public void setSpecif_4(String specif_4) { - this.specif_4 = specif_4; - } - - public String getSpecif_5() { - return specif_5; - } - - public void setSpecif_5(String specif_5) { - this.specif_5 = specif_5; - } - - public String getSpecif_6() { - return specif_6; - } - - public void setSpecif_6(String specif_6) { - this.specif_6 = specif_6; - } - - public String getSend_type() { - return send_type; - } - - public void setSend_type(String send_type) { - this.send_type = send_type; - } - - public String getServdate() { - return servdate; - } - - public void setServdate(String servdate) { - this.servdate = servdate; - } - - public String getDoc_result() { - return doc_result; - } - - public void setDoc_result(String doc_result) { - this.doc_result = doc_result; - } - public String getImp_result() { return imp_result; } @@ -431,12 +206,12 @@ public class SDf04 extends SpcexObjectBase { this.imp_result = imp_result; } - public String getFile_name() { - return file_name; + public String getFileName() { + return fileName; } - public void setFile_name(String file_name) { - this.file_name = file_name; + public void setFileName(String fileName) { + this.fileName = fileName; } public Instant getGenerationTime() { diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf06.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf06.java new file mode 100644 index 000000000..1e2c5e432 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf06.java @@ -0,0 +1,135 @@ +package ru.clearing.classes.statics.data.sdf; + +import ru.clearing.classes.ConstSerializable; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +import java.math.BigDecimal; +import java.time.Instant; + +/** + * ДФ-06 Запрос на зачисление/списание денежных средств + *

+ * DB table: S_DF06 + **/ +public class SDf06 extends SpcexObjectBase { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private String account; + private BigDecimal sum; + private String market; + private String type; + private String deal; + private String clientN; + private BigDecimal inn; + private BigDecimal bic; + private String spec; + private BigDecimal number; + private String fileName; + private Instant generationTime; + private Long generationId; + + public String getAccount() { + return account; + } + + public void setAccount(String value) { + this.account = value; + } + + public BigDecimal getSum() { + return sum; + } + + public void setSum(BigDecimal value) { + this.sum = value; + } + + public String getMarket() { + return market; + } + + public void setMarket(String value) { + this.market = value; + } + + public String getType() { + return type; + } + + public void setType(String value) { + this.type = value; + } + + public String getDeal() { + return deal; + } + + public void setDeal(String value) { + this.deal = value; + } + + public String getClientN() { + return clientN; + } + + public void setClientN(String value) { + this.clientN = value; + } + + public BigDecimal getInn() { + return inn; + } + + public void setInn(BigDecimal value) { + this.inn = value; + } + + public BigDecimal getBic() { + return bic; + } + + public void setBic(BigDecimal value) { + this.bic = value; + } + + public String getSpec() { + return spec; + } + + public void setSpec(String value) { + this.spec = value; + } + + public BigDecimal getNumber() { + return number; + } + + public void setNumber(BigDecimal value) { + this.number = value; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String value) { + this.fileName = 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; + } + +} \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf07.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf07.java new file mode 100644 index 000000000..21355472e --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf07.java @@ -0,0 +1,144 @@ +package ru.clearing.classes.statics.data.sdf; + +import ru.clearing.classes.ConstSerializable; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +import java.math.BigDecimal; +import java.time.Instant; + +/** + * ДФ-07 Ответ на запрос по зачислению/списанию денежных средств + *

+ * DB table: S_DF07 + **/ +public class SDf07 extends SpcexObjectBase { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private String account; + private BigDecimal sum; + private String market; + private String type; + private String deal; + private String clientN; + private BigDecimal inn; + private BigDecimal bic; + private String spec; + private BigDecimal number; + 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 BigDecimal getSum() { + return sum; + } + + public void setSum(BigDecimal value) { + this.sum = value; + } + + public String getMarket() { + return market; + } + + public void setMarket(String value) { + this.market = value; + } + + public String getType() { + return type; + } + + public void setType(String value) { + this.type = value; + } + + public String getDeal() { + return deal; + } + + public void setDeal(String value) { + this.deal = value; + } + + public String getClientN() { + return clientN; + } + + public void setClientN(String value) { + this.clientN = value; + } + + public BigDecimal getInn() { + return inn; + } + + public void setInn(BigDecimal value) { + this.inn = value; + } + + public BigDecimal getBic() { + return bic; + } + + public void setBic(BigDecimal value) { + this.bic = value; + } + + public String getSpec() { + return spec; + } + + public void setSpec(String value) { + this.spec = value; + } + + public BigDecimal getNumber() { + return number; + } + + public void setNumber(BigDecimal value) { + this.number = 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/sdf/SDf08.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf08.java index ea7f7ad24..7a46d1be1 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf08.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf08.java @@ -6,48 +6,83 @@ import ru.spcex.platform.classes.base.SpcexObjectBase; import java.time.Instant; /** - * ДФ-08 Запрос остатков по всем счетам + * ДФ-08 Загрузка счетов с остатками *

* DB table: S_DF08 **/ public class SDf08 extends SpcexObjectBase { private static final long serialVersionUID = ConstSerializable.serialVersionUID; - private String number; - private String datetime; + private String outDocument; + private String depoCode; + private String quantity; + private String securityCode; + private String clientName; + private String fileName; private Instant generationTime; private Long generationId; - public String getNumber() { - return number; + public String getOutDocument() { + return outDocument; } - public void setNumber(String value) { - this.number = value; + public void setOutDocument(String outDocument) { + this.outDocument = outDocument; } - public String getDatetime() { - return datetime; + public String getDepoCode() { + return depoCode; } - public void setDatetime(String value) { - this.datetime = value; + public void setDepoCode(String depoCode) { + this.depoCode = depoCode; + } + + public String getQuantity() { + return quantity; + } + + public void setQuantity(String quantity) { + this.quantity = quantity; + } + + public String getSecurityCode() { + return securityCode; + } + + public void setSecurityCode(String securityCode) { + this.securityCode = securityCode; + } + + public String getClientName() { + return clientName; + } + + public void setClientName(String clientName) { + this.clientName = clientName; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; } public Instant getGenerationTime() { return generationTime; } - public void setGenerationTime(Instant value) { - this.generationTime = value; + public void setGenerationTime(Instant generationTime) { + this.generationTime = generationTime; } public Long getGenerationId() { return generationId; } - public void setGenerationId(Long value) { - this.generationId = value; + public void setGenerationId(Long generationId) { + this.generationId = generationId; } - } \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf09.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf09.java index 821d48f23..27bcae5dd 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf09.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf09.java @@ -2,86 +2,82 @@ package ru.clearing.classes.statics.data.sdf; import ru.clearing.classes.ConstSerializable; import ru.spcex.platform.classes.base.SpcexObjectBase; -import ru.spcex.platform.classes.base.interfaces.WithAccount; -import ru.spcex.platform.classes.base.interfaces.WithMarket; -import ru.spcex.platform.classes.base.interfaces.WithSum; import java.math.BigDecimal; import java.time.Instant; /** - * ДФ-08 Запрос остатков по всем счетам + * ДФ-09 Ответ на загрузку счетов с остатками *

* DB table: S_DF08 **/ -public class SDf09 extends SpcexObjectBase implements WithAccount, WithMarket, WithSum { +public class SDf09 extends SpcexObjectBase { private static final long serialVersionUID = ConstSerializable.serialVersionUID; - private String account; - private BigDecimal sum; - private String market; - private String type; - private BigDecimal number; - private BigDecimal inn; - private String fileName; + private String outDocument; + private String inDocument; + private String depoCode; + private String quantity; + private String securityCode; + private String clientName; + private BigDecimal result; private Instant generationTime; private Long generationId; - @Override - public String getAccount() { - return account; + public String getOutDocument() { + return outDocument; } - public void setAccount(String account) { - this.account = account; + public void setOutDocument(String outDocument) { + this.outDocument = outDocument; } - public BigDecimal getSum() { - return sum; + public String getInDocument() { + return inDocument; } - public void setSum(BigDecimal sum) { - this.sum = sum; + public void setInDocument(String inDocument) { + this.inDocument = inDocument; } - public String getMarket() { - return market; + public String getDepoCode() { + return depoCode; } - public void setMarket(String market) { - this.market = market; + public void setDepoCode(String depoCode) { + this.depoCode = depoCode; } - public String getType() { - return type; + public String getQuantity() { + return quantity; } - public void setType(String type) { - this.type = type; + public void setQuantity(String quantity) { + this.quantity = quantity; } - public BigDecimal getNumber() { - return number; + public String getSecurityCode() { + return securityCode; } - public void setNumber(BigDecimal number) { - this.number = number; + public void setSecurityCode(String securityCode) { + this.securityCode = securityCode; } - public BigDecimal getInn() { - return inn; + public String getClientName() { + return clientName; } - public void setInn(BigDecimal inn) { - this.inn = inn; + public void setClientName(String clientName) { + this.clientName = clientName; } - public String getFileName() { - return fileName; + public BigDecimal getResult() { + return result; } - public void setFileName(String fileName) { - this.fileName = fileName; + public void setResult(BigDecimal result) { + this.result = result; } public Instant getGenerationTime() { diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf10.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf10.java index d8a2575b0..5a5c34987 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf10.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf10.java @@ -2,85 +2,72 @@ package ru.clearing.classes.statics.data.sdf; import ru.clearing.classes.ConstSerializable; import ru.spcex.platform.classes.base.SpcexObjectBase; -import ru.spcex.platform.classes.base.interfaces.WithAccount; -import java.math.BigDecimal; import java.time.Instant; /** - * ДФ-10 Подтверждение о загрузке по поступлению на клиринговый счет + * sDf10 - ДФ-10 Запрос на зачисление/списание ценных бумаг *

* DB table: S_DF10 */ -public class SDf10 extends SpcexObjectBase implements WithAccount { +public class SDf10 extends SpcexObjectBase { private static final long serialVersionUID = ConstSerializable.serialVersionUID; - private String account; - private BigDecimal sum; - private String market; - private String type; - private BigDecimal number; - private BigDecimal inn; - private String result; + private String outDocument; + private String depoCode; + private String quantity; + private String securityCode; + private String clientName; + private String fileName; private Instant generationTime; private Long generationId; - private Long inSDf09Id; - @Override - public String getAccount() { - return account; + public String getOutDocument() { + return outDocument; } - public void setAccount(String account) { - this.account = account; + public void setOutDocument(String outDocument) { + this.outDocument = outDocument; } - public BigDecimal getSum() { - return sum; + public String getDepoCode() { + return depoCode; } - public void setSum(BigDecimal sum) { - this.sum = sum; + public void setDepoCode(String depoCode) { + this.depoCode = depoCode; } - public String getMarket() { - return market; + public String getQuantity() { + return quantity; } - public void setMarket(String market) { - this.market = market; + public void setQuantity(String quantity) { + this.quantity = quantity; } - public String getType() { - return type; + public String getSecurityCode() { + return securityCode; } - public void setType(String type) { - this.type = type; + public void setSecurityCode(String securityCode) { + this.securityCode = securityCode; } - public BigDecimal getNumber() { - return number; + public String getClientName() { + return clientName; } - public void setNumber(BigDecimal number) { - this.number = number; + public void setClientName(String clientName) { + this.clientName = clientName; } - public BigDecimal getInn() { - return inn; + public String getFileName() { + return fileName; } - public void setInn(BigDecimal inn) { - this.inn = inn; - } - - public String getResult() { - return result; - } - - public void setResult(String result) { - this.result = result; + public void setFileName(String fileName) { + this.fileName = fileName; } public Instant getGenerationTime() { @@ -98,12 +85,4 @@ public class SDf10 extends SpcexObjectBase implements WithAccount { public void setGenerationId(Long generationId) { this.generationId = generationId; } - - public Long getInSDf09Id() { - return inSDf09Id; - } - - public void setInSDf09Id(Long inSDf09Id) { - this.inSDf09Id = inSDf09Id; - } } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf11.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf11.java index b0b27136c..ec4b1c75f 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf11.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf11.java @@ -3,423 +3,81 @@ package ru.clearing.classes.statics.data.sdf; import ru.clearing.classes.ConstSerializable; import ru.spcex.platform.classes.base.SpcexObjectBase; +import java.math.BigDecimal; import java.time.Instant; /** - * ДФ-11 Из КС в ПРЦ Платежное распоряжение на перевод средств с ТБС Участника на КС Инициатора + * ДФ-11 Ответ на Запрос на зачисление/списание ценных бумаг *

* DB table: S_DF11 **/ public class SDf11 extends SpcexObjectBase { private static final long serialVersionUID = ConstSerializable.serialVersionUID; - private String seg_type; - private String doc_type; - private String docnm_ref; - private String docnmprev; - private String priority; - private String sbankcode; - private String c_acc_deb; - private String sbanknam1; - private String sbanknam2; - private String sbanknam3; - private String sbanknam4; - private String sbanknam5; - private String rbankcode; - private String c_acc_cred; - private String rbanknam1; - private String rbanknam2; - private String rbanknam3; - private String rbanknam4; - private String rbanknam5; - private String pay_date; - private String ext_date; - private String pay_val; - private String sum_deb; - private String sclientn1; - private String sclientn2; - private String sclientn3; - private String sclientn4; - private String sc_code; - private String acc_deb; - private String rclientn1; - private String rclientn2; - private String rclientn3; - private String rclientn4; - private String acc_kr_1; - private String acc_kr_2; - private String sp_code; - private String specif_1; - private String specif_2; - private String specif_3; - private String specif_4; - private String specif_5; - private String specif_6; - private String send_type; - private String servdate; - private String doc_result; + private String outDocument; + private String inDocument; + private String depoCode; + private String quantity; + private String securityCode; + private String clientName; + private BigDecimal result; private Instant generationTime; private Long generationId; - private Long paymentInstructionId; - public String getSeg_type() { - return seg_type; + public String getOutDocument() { + return outDocument; } - public void setSeg_type(String seg_type) { - this.seg_type = seg_type; + public void setOutDocument(String outDocument) { + this.outDocument = outDocument; } - public String getDoc_type() { - return doc_type; + public String getInDocument() { + return inDocument; } - public void setDoc_type(String doc_type) { - this.doc_type = doc_type; + public void setInDocument(String inDocument) { + this.inDocument = inDocument; } - public String getDocnm_ref() { - return docnm_ref; + public String getDepoCode() { + return depoCode; } - public void setDocnm_ref(String docnm_ref) { - this.docnm_ref = docnm_ref; + public void setDepoCode(String depoCode) { + this.depoCode = depoCode; } - public String getDocnmprev() { - return docnmprev; + public String getQuantity() { + return quantity; } - public void setDocnmprev(String docnmprev) { - this.docnmprev = docnmprev; + public void setQuantity(String quantity) { + this.quantity = quantity; } - public String getPriority() { - return priority; + public String getSecurityCode() { + return securityCode; } - public void setPriority(String priority) { - this.priority = priority; + public void setSecurityCode(String securityCode) { + this.securityCode = securityCode; } - public String getSbankcode() { - return sbankcode; + public String getClientName() { + return clientName; } - public void setSbankcode(String sbankcode) { - this.sbankcode = sbankcode; + public void setClientName(String clientName) { + this.clientName = clientName; } - public String getC_acc_deb() { - return c_acc_deb; + public BigDecimal getResult() { + return result; } - public void setC_acc_deb(String c_acc_deb) { - this.c_acc_deb = c_acc_deb; - } - - public String getSbanknam1() { - return sbanknam1; - } - - public void setSbanknam1(String sbanknam1) { - this.sbanknam1 = sbanknam1; - } - - public String getSbanknam2() { - return sbanknam2; - } - - public void setSbanknam2(String sbanknam2) { - this.sbanknam2 = sbanknam2; - } - - public String getSbanknam3() { - return sbanknam3; - } - - public void setSbanknam3(String sbanknam3) { - this.sbanknam3 = sbanknam3; - } - - public String getSbanknam4() { - return sbanknam4; - } - - public void setSbanknam4(String sbanknam4) { - this.sbanknam4 = sbanknam4; - } - - public String getSbanknam5() { - return sbanknam5; - } - - public void setSbanknam5(String sbanknam5) { - this.sbanknam5 = sbanknam5; - } - - public String getRbankcode() { - return rbankcode; - } - - public void setRbankcode(String rbankcode) { - this.rbankcode = rbankcode; - } - - public String getC_acc_cred() { - return c_acc_cred; - } - - public void setC_acc_cred(String c_acc_cred) { - this.c_acc_cred = c_acc_cred; - } - - public String getRbanknam1() { - return rbanknam1; - } - - public void setRbanknam1(String rbanknam1) { - this.rbanknam1 = rbanknam1; - } - - public String getRbanknam2() { - return rbanknam2; - } - - public void setRbanknam2(String rbanknam2) { - this.rbanknam2 = rbanknam2; - } - - public String getRbanknam3() { - return rbanknam3; - } - - public void setRbanknam3(String rbanknam3) { - this.rbanknam3 = rbanknam3; - } - - public String getRbanknam4() { - return rbanknam4; - } - - public void setRbanknam4(String rbanknam4) { - this.rbanknam4 = rbanknam4; - } - - public String getRbanknam5() { - return rbanknam5; - } - - public void setRbanknam5(String rbanknam5) { - this.rbanknam5 = rbanknam5; - } - - public String getPay_date() { - return pay_date; - } - - public void setPay_date(String pay_date) { - this.pay_date = pay_date; - } - - public String getExt_date() { - return ext_date; - } - - public void setExt_date(String ext_date) { - this.ext_date = ext_date; - } - - public String getPay_val() { - return pay_val; - } - - public void setPay_val(String pay_val) { - this.pay_val = pay_val; - } - - public String getSum_deb() { - return sum_deb; - } - - public void setSum_deb(String sum_deb) { - this.sum_deb = sum_deb; - } - - public String getSclientn1() { - return sclientn1; - } - - public void setSclientn1(String sclientn1) { - this.sclientn1 = sclientn1; - } - - public String getSclientn2() { - return sclientn2; - } - - public void setSclientn2(String sclientn2) { - this.sclientn2 = sclientn2; - } - - public String getSclientn3() { - return sclientn3; - } - - public void setSclientn3(String sclientn3) { - this.sclientn3 = sclientn3; - } - - public String getSclientn4() { - return sclientn4; - } - - public void setSclientn4(String sclientn4) { - this.sclientn4 = sclientn4; - } - - public String getSc_code() { - return sc_code; - } - - public void setSc_code(String sc_code) { - this.sc_code = sc_code; - } - - public String getAcc_deb() { - return acc_deb; - } - - public void setAcc_deb(String acc_deb) { - this.acc_deb = acc_deb; - } - - public String getRclientn1() { - return rclientn1; - } - - public void setRclientn1(String rclientn1) { - this.rclientn1 = rclientn1; - } - - public String getRclientn2() { - return rclientn2; - } - - public void setRclientn2(String rclientn2) { - this.rclientn2 = rclientn2; - } - - public String getRclientn3() { - return rclientn3; - } - - public void setRclientn3(String rclientn3) { - this.rclientn3 = rclientn3; - } - - public String getRclientn4() { - return rclientn4; - } - - public void setRclientn4(String rclientn4) { - this.rclientn4 = rclientn4; - } - - public String getAcc_kr_1() { - return acc_kr_1; - } - - public void setAcc_kr_1(String acc_kr_1) { - this.acc_kr_1 = acc_kr_1; - } - - public String getAcc_kr_2() { - return acc_kr_2; - } - - public void setAcc_kr_2(String acc_kr_2) { - this.acc_kr_2 = acc_kr_2; - } - - public String getSp_code() { - return sp_code; - } - - public void setSp_code(String sp_code) { - this.sp_code = sp_code; - } - - public String getSpecif_1() { - return specif_1; - } - - public void setSpecif_1(String specif_1) { - this.specif_1 = specif_1; - } - - public String getSpecif_2() { - return specif_2; - } - - public void setSpecif_2(String specif_2) { - this.specif_2 = specif_2; - } - - public String getSpecif_3() { - return specif_3; - } - - public void setSpecif_3(String specif_3) { - this.specif_3 = specif_3; - } - - public String getSpecif_4() { - return specif_4; - } - - public void setSpecif_4(String specif_4) { - this.specif_4 = specif_4; - } - - public String getSpecif_5() { - return specif_5; - } - - public void setSpecif_5(String specif_5) { - this.specif_5 = specif_5; - } - - public String getSpecif_6() { - return specif_6; - } - - public void setSpecif_6(String specif_6) { - this.specif_6 = specif_6; - } - - public String getSend_type() { - return send_type; - } - - public void setSend_type(String send_type) { - this.send_type = send_type; - } - - public String getServdate() { - return servdate; - } - - public void setServdate(String servdate) { - this.servdate = servdate; - } - - public String getDoc_result() { - return doc_result; - } - - public void setDoc_result(String doc_result) { - this.doc_result = doc_result; + public void setResult(BigDecimal result) { + this.result = result; } public Instant getGenerationTime() { @@ -437,12 +95,4 @@ public class SDf11 extends SpcexObjectBase { public void setGenerationId(Long generationId) { this.generationId = generationId; } - - public Long getPaymentInstructionId() { - return paymentInstructionId; - } - - public void setPaymentInstructionId(Long paymentInstructionId) { - this.paymentInstructionId = paymentInstructionId; - } } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf12.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf12.java index dafeee777..99073a3be 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf12.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf12.java @@ -2,72 +2,88 @@ package ru.clearing.classes.statics.data.sdf; import ru.clearing.classes.ConstSerializable; import ru.spcex.platform.classes.base.SpcexObjectBase; -import ru.spcex.platform.classes.base.interfaces.WithAccount; +import java.math.BigDecimal; import java.time.Instant; /** - * ДФ-12 Из ПРЦ в КС Информация о блокировке/разблокировке/закрытии ТБС УК + * ДФ-12 Распоряжение на проведение операций по итогам клиринга *

* DB table: S_DF12 **/ -public class SDf12 extends SpcexObjectBase implements WithAccount { +public class SDf12 extends SpcexObjectBase { private static final long serialVersionUID = ConstSerializable.serialVersionUID; - private String account; - private String deal; - private Long status; - private String fileName; + private String outDocument; + private String quantity; + private String securityCode; + private String depoCodeSender; + private String depoCodeAdressee; + private BigDecimal result; private Instant generationTime; private Long generationId; - @Override - public String getAccount() { - return account; + public String getOutDocument() { + return outDocument; } - public void setAccount(String value) { - this.account = value; + public void setOutDocument(String outDocument) { + this.outDocument = outDocument; } - public String getDeal() { - return deal; + public String getQuantity() { + return quantity; } - public void setDeal(String value) { - this.deal = value; + public void setQuantity(String quantity) { + this.quantity = quantity; } - public Long getStatus() { - return status; + public String getSecurityCode() { + return securityCode; } - public void setStatus(Long value) { - this.status = value; + public void setSecurityCode(String securityCode) { + this.securityCode = securityCode; } - public String getFileName() { - return fileName; + public String getDepoCodeSender() { + return depoCodeSender; } - public void setFileName(String value) { - this.fileName = value; + public void setDepoCodeSender(String depoCodeSender) { + this.depoCodeSender = depoCodeSender; + } + + public String getDepoCodeAdressee() { + return depoCodeAdressee; + } + + public void setDepoCodeAdressee(String depoCodeAdressee) { + this.depoCodeAdressee = depoCodeAdressee; + } + + public BigDecimal getResult() { + return result; + } + + public void setResult(BigDecimal result) { + this.result = result; } public Instant getGenerationTime() { return generationTime; } - public void setGenerationTime(Instant value) { - this.generationTime = value; + public void setGenerationTime(Instant generationTime) { + this.generationTime = generationTime; } public Long getGenerationId() { return generationId; } - public void setGenerationId(Long value) { - this.generationId = value; + public void setGenerationId(Long generationId) { + this.generationId = generationId; } - } \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf13.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf13.java index 0f88d7aa9..15b14ef97 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf13.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf13.java @@ -3,422 +3,63 @@ package ru.clearing.classes.statics.data.sdf; import ru.clearing.classes.ConstSerializable; import ru.spcex.platform.classes.base.SpcexObjectBase; +import java.math.BigDecimal; import java.time.Instant; /** - * ДФ-13 Вывод свободных средств для инициаторов категории В с клирингового счета 30414/7 - платежное поручение АО СПВБ на вывод средств из РО + * ДФ-13 Уведомление о статусе исполнения или мотивированный отказ *

* DB table: S_DF13 **/ public class SDf13 extends SpcexObjectBase { private static final long serialVersionUID = ConstSerializable.serialVersionUID; - private String seg_type; - private String doc_type; - private String docnm_ref; - private String docnmprev; - private String priority; - private String sbankcode; - private String c_acc_deb; - private String sbanknam1; - private String sbanknam2; - private String sbanknam3; - private String sbanknam4; - private String sbanknam5; - private String rbankcode; - private String c_acc_cred; - private String rbanknam1; - private String op_type; - private String op_order; - private String rbanknam4; - private String rbanknam5; - private String pay_date; - private String ext_date; - private String pay_val; - private String sum_deb; - private String sclientn1; - private String inn_deb; - private String kpp_deb; - private String sclientn4; - private String sc_code; - private String acc_deb; - private String rclientn1; - private String inn_cred; - private String kpp_cred; - private String rclientn4; - private String acc_kr_1; - private String acc_kr_2; - private String sp_code; - private String specif_1; - private String specif_2; - private String specif_3; - private String specif_4; - private String specif_5; - private String specif_6; - private String send_type; - private String servdate; - private String doc_result; + private String outDocument; + private String inDocument; + private BigDecimal result; + private String textError; + private String fileName; private Instant generationTime; private Long generationId; - public String getSeg_type() { - return seg_type; + public String getOutDocument() { + return outDocument; } - public void setSeg_type(String seg_type) { - this.seg_type = seg_type; + public void setOutDocument(String outDocument) { + this.outDocument = outDocument; } - public String getDoc_type() { - return doc_type; + public String getInDocument() { + return inDocument; } - public void setDoc_type(String doc_type) { - this.doc_type = doc_type; + public void setInDocument(String inDocument) { + this.inDocument = inDocument; } - public String getDocnm_ref() { - return docnm_ref; + public BigDecimal getResult() { + return result; } - public void setDocnm_ref(String docnm_ref) { - this.docnm_ref = docnm_ref; + public void setResult(BigDecimal result) { + this.result = result; } - public String getDocnmprev() { - return docnmprev; + public String getTextError() { + return textError; } - public void setDocnmprev(String docnmprev) { - this.docnmprev = docnmprev; + public void setTextError(String textError) { + this.textError = textError; } - public String getPriority() { - return priority; + public String getFileName() { + return fileName; } - public void setPriority(String priority) { - this.priority = priority; - } - - public String getSbankcode() { - return sbankcode; - } - - public void setSbankcode(String sbankcode) { - this.sbankcode = sbankcode; - } - - public String getC_acc_deb() { - return c_acc_deb; - } - - public void setC_acc_deb(String c_acc_deb) { - this.c_acc_deb = c_acc_deb; - } - - public String getSbanknam1() { - return sbanknam1; - } - - public void setSbanknam1(String sbanknam1) { - this.sbanknam1 = sbanknam1; - } - - public String getSbanknam2() { - return sbanknam2; - } - - public void setSbanknam2(String sbanknam2) { - this.sbanknam2 = sbanknam2; - } - - public String getSbanknam3() { - return sbanknam3; - } - - public void setSbanknam3(String sbanknam3) { - this.sbanknam3 = sbanknam3; - } - - public String getSbanknam4() { - return sbanknam4; - } - - public void setSbanknam4(String sbanknam4) { - this.sbanknam4 = sbanknam4; - } - - public String getSbanknam5() { - return sbanknam5; - } - - public void setSbanknam5(String sbanknam5) { - this.sbanknam5 = sbanknam5; - } - - public String getRbankcode() { - return rbankcode; - } - - public void setRbankcode(String rbankcode) { - this.rbankcode = rbankcode; - } - - public String getC_acc_cred() { - return c_acc_cred; - } - - public void setC_acc_cred(String c_acc_cred) { - this.c_acc_cred = c_acc_cred; - } - - public String getRbanknam1() { - return rbanknam1; - } - - public void setRbanknam1(String rbanknam1) { - this.rbanknam1 = rbanknam1; - } - - public String getOp_type() { - return op_type; - } - - public void setOp_type(String op_type) { - this.op_type = op_type; - } - - public String getOp_order() { - return op_order; - } - - public void setOp_order(String op_order) { - this.op_order = op_order; - } - - public String getRbanknam4() { - return rbanknam4; - } - - public void setRbanknam4(String rbanknam4) { - this.rbanknam4 = rbanknam4; - } - - public String getRbanknam5() { - return rbanknam5; - } - - public void setRbanknam5(String rbanknam5) { - this.rbanknam5 = rbanknam5; - } - - public String getPay_date() { - return pay_date; - } - - public void setPay_date(String pay_date) { - this.pay_date = pay_date; - } - - public String getExt_date() { - return ext_date; - } - - public void setExt_date(String ext_date) { - this.ext_date = ext_date; - } - - public String getPay_val() { - return pay_val; - } - - public void setPay_val(String pay_val) { - this.pay_val = pay_val; - } - - public String getSum_deb() { - return sum_deb; - } - - public void setSum_deb(String sum_deb) { - this.sum_deb = sum_deb; - } - - public String getSclientn1() { - return sclientn1; - } - - public void setSclientn1(String sclientn1) { - this.sclientn1 = sclientn1; - } - - public String getInn_deb() { - return inn_deb; - } - - public void setInn_deb(String inn_deb) { - this.inn_deb = inn_deb; - } - - public String getKpp_deb() { - return kpp_deb; - } - - public void setKpp_deb(String kpp_deb) { - this.kpp_deb = kpp_deb; - } - - public String getSclientn4() { - return sclientn4; - } - - public void setSclientn4(String sclientn4) { - this.sclientn4 = sclientn4; - } - - public String getSc_code() { - return sc_code; - } - - public void setSc_code(String sc_code) { - this.sc_code = sc_code; - } - - public String getAcc_deb() { - return acc_deb; - } - - public void setAcc_deb(String acc_deb) { - this.acc_deb = acc_deb; - } - - public String getRclientn1() { - return rclientn1; - } - - public void setRclientn1(String rclientn1) { - this.rclientn1 = rclientn1; - } - - public String getInn_cred() { - return inn_cred; - } - - public void setInn_cred(String inn_cred) { - this.inn_cred = inn_cred; - } - - public String getKpp_cred() { - return kpp_cred; - } - - public void setKpp_cred(String kpp_cred) { - this.kpp_cred = kpp_cred; - } - - public String getRclientn4() { - return rclientn4; - } - - public void setRclientn4(String rclientn4) { - this.rclientn4 = rclientn4; - } - - public String getAcc_kr_1() { - return acc_kr_1; - } - - public void setAcc_kr_1(String acc_kr_1) { - this.acc_kr_1 = acc_kr_1; - } - - public String getAcc_kr_2() { - return acc_kr_2; - } - - public void setAcc_kr_2(String acc_kr_2) { - this.acc_kr_2 = acc_kr_2; - } - - public String getSp_code() { - return sp_code; - } - - public void setSp_code(String sp_code) { - this.sp_code = sp_code; - } - - public String getSpecif_1() { - return specif_1; - } - - public void setSpecif_1(String specif_1) { - this.specif_1 = specif_1; - } - - public String getSpecif_2() { - return specif_2; - } - - public void setSpecif_2(String specif_2) { - this.specif_2 = specif_2; - } - - public String getSpecif_3() { - return specif_3; - } - - public void setSpecif_3(String specif_3) { - this.specif_3 = specif_3; - } - - public String getSpecif_4() { - return specif_4; - } - - public void setSpecif_4(String specif_4) { - this.specif_4 = specif_4; - } - - public String getSpecif_5() { - return specif_5; - } - - public void setSpecif_5(String specif_5) { - this.specif_5 = specif_5; - } - - public String getSpecif_6() { - return specif_6; - } - - public void setSpecif_6(String specif_6) { - this.specif_6 = specif_6; - } - - public String getSend_type() { - return send_type; - } - - public void setSend_type(String send_type) { - this.send_type = send_type; - } - - public String getServdate() { - return servdate; - } - - public void setServdate(String servdate) { - this.servdate = servdate; - } - - public String getDoc_result() { - return doc_result; - } - - public void setDoc_result(String doc_result) { - this.doc_result = doc_result; + public void setFileName(String fileName) { + this.fileName = fileName; } public Instant getGenerationTime() { diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf14.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf14.java new file mode 100644 index 000000000..ef977149f --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf14.java @@ -0,0 +1,54 @@ +package ru.clearing.classes.statics.data.sdf; + +import ru.clearing.classes.ConstSerializable; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +import java.math.BigDecimal; +import java.time.Instant; + +/** + * ДФ-14 Уведомление о завершении расчетов + *

+ * DB table: S_DF14 + **/ +public class SDf14 extends SpcexObjectBase { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private String outDocument; + private BigDecimal result; + private Instant generationTime; + private Long generationId; + + public String getOutDocument() { + return outDocument; + } + + public void setOutDocument(String value) { + this.outDocument = 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; + } + +} \ No newline at end of file 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 new file mode 100644 index 000000000..edbfc006d --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf20.java @@ -0,0 +1,134 @@ +package ru.clearing.classes.statics.data.sdf; + +import ru.clearing.classes.ConstSerializable; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +import java.time.Instant; + +/** + * ДФ-20 Отчет об исполнении поручения на зачисление/списание ценных бумаг + *

+ * DB table: S_DF20 + **/ +public class SDf20 extends SpcexObjectBase { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private String outDocument; + private String inDocument; + private String security; + private String openBalance; + private String depoCodeCl; + private String quantity; + private String operationCode; + private String depoCodeCorr; + private String operationDate; + private String closeBalance; + private String fileName; + private Instant generationTime; + private Long generationId; + + public String getOutDocument() { + return outDocument; + } + + public void setOutDocument(String value) { + this.outDocument = value; + } + + public String getInDocument() { + return inDocument; + } + + public void setInDocument(String value) { + this.inDocument = value; + } + + public String getSecurity() { + return security; + } + + public void setSecurity(String value) { + this.security = value; + } + + public String getOpenBalance() { + return openBalance; + } + + public void setOpenBalance(String value) { + this.openBalance = value; + } + + public String getDepoCodeCl() { + return depoCodeCl; + } + + public void setDepoCodeCl(String value) { + this.depoCodeCl = value; + } + + public String getQuantity() { + return quantity; + } + + public void setQuantity(String value) { + this.quantity = value; + } + + public String getOperationCode() { + return operationCode; + } + + public void setOperationCode(String value) { + this.operationCode = value; + } + + public String getDepoCodeCorr() { + return depoCodeCorr; + } + + public void setDepoCodeCorr(String value) { + this.depoCodeCorr = value; + } + + public String getOperationDate() { + return operationDate; + } + + public void setOperationDate(String value) { + this.operationDate = value; + } + + public String getCloseBalance() { + return closeBalance; + } + + public void setCloseBalance(String value) { + this.closeBalance = value; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String value) { + this.fileName = 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; + } + +} \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf54.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf54.java new file mode 100644 index 000000000..8d5aad9d7 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf54.java @@ -0,0 +1,395 @@ +package ru.clearing.classes.statics.data.sdf; + +import ru.clearing.classes.ConstSerializable; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +import java.time.Instant; + +/** + * ДФ-54 Вывод свободных средств для инициаторов категории В с клирингового счета 30414 + *

+ * DB table: S_DF54 + **/ +public class SDf54 extends SpcexObjectBase { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private String seg_type; + private String doc_type; + private String docnm_ref; + private String docnmprev; + private String sbankcode; + private String c_acc_deb; + private String sbanknam1; + private String sbanknam2; + private String sbanknam3; + private String sbanknam4; + private String sbanknam5; + private String rbankcode; + private String c_acc_cred; + private String rbanknam1; + private String rbanknam2; + private String rbanknam3; + private String rbanknam4; + private String rbanknam5; + private String op_type; + private String op_order; + private String pay_date; + private String pay_val; + private String sum_deb; + private String sclientn1; + private String sclientn2; + private String sclientn3; + private String sclientn4; + private String inn_deb; + private String kpp_deb; + private String acc_deb; + private String rclientn1; + private String rclientn2; + private String rclientn3; + private String rclientn4; + private String inn_cred; + private String kpp_cred; + private String acc_kr_1; + private String specif_1; + private String send_type; + private String doc_result; + private Instant generationTime; + private Long generationId; + + public String getSeg_type() { + return seg_type; + } + + public void setSeg_type(String value) { + this.seg_type = value; + } + + public String getDoc_type() { + return doc_type; + } + + public void setDoc_type(String value) { + this.doc_type = value; + } + + public String getDocnm_ref() { + return docnm_ref; + } + + public void setDocnm_ref(String value) { + this.docnm_ref = value; + } + + public String getDocnmprev() { + return docnmprev; + } + + public void setDocnmprev(String value) { + this.docnmprev = value; + } + + public String getSbankcode() { + return sbankcode; + } + + public void setSbankcode(String value) { + this.sbankcode = value; + } + + public String getC_acc_deb() { + return c_acc_deb; + } + + public void setC_acc_deb(String value) { + this.c_acc_deb = value; + } + + public String getSbanknam1() { + return sbanknam1; + } + + public void setSbanknam1(String value) { + this.sbanknam1 = value; + } + + public String getSbanknam2() { + return sbanknam2; + } + + public void setSbanknam2(String value) { + this.sbanknam2 = value; + } + + public String getSbanknam3() { + return sbanknam3; + } + + public void setSbanknam3(String value) { + this.sbanknam3 = value; + } + + public String getSbanknam4() { + return sbanknam4; + } + + public void setSbanknam4(String value) { + this.sbanknam4 = value; + } + + public String getSbanknam5() { + return sbanknam5; + } + + public void setSbanknam5(String value) { + this.sbanknam5 = value; + } + + public String getRbankcode() { + return rbankcode; + } + + public void setRbankcode(String value) { + this.rbankcode = value; + } + + public String getC_acc_cred() { + return c_acc_cred; + } + + public void setC_acc_cred(String value) { + this.c_acc_cred = value; + } + + public String getRbanknam1() { + return rbanknam1; + } + + public void setRbanknam1(String value) { + this.rbanknam1 = value; + } + + public String getRbanknam2() { + return rbanknam2; + } + + public void setRbanknam2(String value) { + this.rbanknam2 = value; + } + + public String getRbanknam3() { + return rbanknam3; + } + + public void setRbanknam3(String value) { + this.rbanknam3 = value; + } + + public String getRbanknam4() { + return rbanknam4; + } + + public void setRbanknam4(String value) { + this.rbanknam4 = value; + } + + public String getRbanknam5() { + return rbanknam5; + } + + public void setRbanknam5(String value) { + this.rbanknam5 = value; + } + + public String getOp_type() { + return op_type; + } + + public void setOp_type(String value) { + this.op_type = value; + } + + public String getOp_order() { + return op_order; + } + + public void setOp_order(String value) { + this.op_order = value; + } + + public String getPay_date() { + return pay_date; + } + + public void setPay_date(String value) { + this.pay_date = value; + } + + public String getPay_val() { + return pay_val; + } + + public void setPay_val(String value) { + this.pay_val = value; + } + + public String getSum_deb() { + return sum_deb; + } + + public void setSum_deb(String value) { + this.sum_deb = value; + } + + public String getSclientn1() { + return sclientn1; + } + + public void setSclientn1(String value) { + this.sclientn1 = value; + } + + public String getSclientn2() { + return sclientn2; + } + + public void setSclientn2(String value) { + this.sclientn2 = value; + } + + public String getSclientn3() { + return sclientn3; + } + + public void setSclientn3(String value) { + this.sclientn3 = value; + } + + public String getSclientn4() { + return sclientn4; + } + + public void setSclientn4(String value) { + this.sclientn4 = value; + } + + public String getInn_deb() { + return inn_deb; + } + + public void setInn_deb(String value) { + this.inn_deb = value; + } + + public String getKpp_deb() { + return kpp_deb; + } + + public void setKpp_deb(String value) { + this.kpp_deb = value; + } + + public String getAcc_deb() { + return acc_deb; + } + + public void setAcc_deb(String value) { + this.acc_deb = value; + } + + public String getRclientn1() { + return rclientn1; + } + + public void setRclientn1(String value) { + this.rclientn1 = value; + } + + public String getRclientn2() { + return rclientn2; + } + + public void setRclientn2(String value) { + this.rclientn2 = value; + } + + public String getRclientn3() { + return rclientn3; + } + + public void setRclientn3(String value) { + this.rclientn3 = value; + } + + public String getRclientn4() { + return rclientn4; + } + + public void setRclientn4(String value) { + this.rclientn4 = value; + } + + public String getInn_cred() { + return inn_cred; + } + + public void setInn_cred(String value) { + this.inn_cred = value; + } + + public String getKpp_cred() { + return kpp_cred; + } + + public void setKpp_cred(String value) { + this.kpp_cred = value; + } + + public String getAcc_kr_1() { + return acc_kr_1; + } + + public void setAcc_kr_1(String value) { + this.acc_kr_1 = value; + } + + public String getSpecif_1() { + return specif_1; + } + + public void setSpecif_1(String value) { + this.specif_1 = value; + } + + public String getSend_type() { + return send_type; + } + + public void setSend_type(String value) { + this.send_type = value; + } + + public String getDoc_result() { + return doc_result; + } + + public void setDoc_result(String value) { + this.doc_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; + } + +} \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf55.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf55.java new file mode 100644 index 000000000..926da9346 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf55.java @@ -0,0 +1,404 @@ +package ru.clearing.classes.statics.data.sdf; + +import ru.clearing.classes.ConstSerializable; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +import java.time.Instant; + +/** + * ДФ-55 Квитанция об обработке ДФ-54 + *

+ * DB table: S_DF55 + **/ +public class SDf55 extends SpcexObjectBase { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private String seg_type; + private String doc_type; + private String docnm_ref; + private String docnmprev; + private String sbankcode; + private String c_acc_deb; + private String sbanknam1; + private String sbanknam2; + private String sbanknam3; + private String sbanknam4; + private String sbanknam5; + private String rbankcode; + private String c_acc_cred; + private String rbanknam1; + private String rbanknam2; + private String rbanknam3; + private String rbanknam4; + private String rbanknam5; + private String op_type; + private String op_order; + private String pay_date; + private String pay_val; + private String sum_deb; + private String sclientn1; + private String sclientn2; + private String sclientn3; + private String sclientn4; + private String inn_deb; + private String kpp_deb; + private String acc_deb; + private String rclientn1; + private String rclientn2; + private String rclientn3; + private String rclientn4; + private String inn_cred; + private String kpp_cred; + private String acc_kr_1; + private String specif_1; + private String send_type; + private String doc_result; + private String fileName; + private Instant generationTime; + private Long generationId; + + public String getSeg_type() { + return seg_type; + } + + public void setSeg_type(String value) { + this.seg_type = value; + } + + public String getDoc_type() { + return doc_type; + } + + public void setDoc_type(String value) { + this.doc_type = value; + } + + public String getDocnm_ref() { + return docnm_ref; + } + + public void setDocnm_ref(String value) { + this.docnm_ref = value; + } + + public String getDocnmprev() { + return docnmprev; + } + + public void setDocnmprev(String value) { + this.docnmprev = value; + } + + public String getSbankcode() { + return sbankcode; + } + + public void setSbankcode(String value) { + this.sbankcode = value; + } + + public String getC_acc_deb() { + return c_acc_deb; + } + + public void setC_acc_deb(String value) { + this.c_acc_deb = value; + } + + public String getSbanknam1() { + return sbanknam1; + } + + public void setSbanknam1(String value) { + this.sbanknam1 = value; + } + + public String getSbanknam2() { + return sbanknam2; + } + + public void setSbanknam2(String value) { + this.sbanknam2 = value; + } + + public String getSbanknam3() { + return sbanknam3; + } + + public void setSbanknam3(String value) { + this.sbanknam3 = value; + } + + public String getSbanknam4() { + return sbanknam4; + } + + public void setSbanknam4(String value) { + this.sbanknam4 = value; + } + + public String getSbanknam5() { + return sbanknam5; + } + + public void setSbanknam5(String value) { + this.sbanknam5 = value; + } + + public String getRbankcode() { + return rbankcode; + } + + public void setRbankcode(String value) { + this.rbankcode = value; + } + + public String getC_acc_cred() { + return c_acc_cred; + } + + public void setC_acc_cred(String value) { + this.c_acc_cred = value; + } + + public String getRbanknam1() { + return rbanknam1; + } + + public void setRbanknam1(String value) { + this.rbanknam1 = value; + } + + public String getRbanknam2() { + return rbanknam2; + } + + public void setRbanknam2(String value) { + this.rbanknam2 = value; + } + + public String getRbanknam3() { + return rbanknam3; + } + + public void setRbanknam3(String value) { + this.rbanknam3 = value; + } + + public String getRbanknam4() { + return rbanknam4; + } + + public void setRbanknam4(String value) { + this.rbanknam4 = value; + } + + public String getRbanknam5() { + return rbanknam5; + } + + public void setRbanknam5(String value) { + this.rbanknam5 = value; + } + + public String getOp_type() { + return op_type; + } + + public void setOp_type(String value) { + this.op_type = value; + } + + public String getOp_order() { + return op_order; + } + + public void setOp_order(String value) { + this.op_order = value; + } + + public String getPay_date() { + return pay_date; + } + + public void setPay_date(String value) { + this.pay_date = value; + } + + public String getPay_val() { + return pay_val; + } + + public void setPay_val(String value) { + this.pay_val = value; + } + + public String getSum_deb() { + return sum_deb; + } + + public void setSum_deb(String value) { + this.sum_deb = value; + } + + public String getSclientn1() { + return sclientn1; + } + + public void setSclientn1(String value) { + this.sclientn1 = value; + } + + public String getSclientn2() { + return sclientn2; + } + + public void setSclientn2(String value) { + this.sclientn2 = value; + } + + public String getSclientn3() { + return sclientn3; + } + + public void setSclientn3(String value) { + this.sclientn3 = value; + } + + public String getSclientn4() { + return sclientn4; + } + + public void setSclientn4(String value) { + this.sclientn4 = value; + } + + public String getInn_deb() { + return inn_deb; + } + + public void setInn_deb(String value) { + this.inn_deb = value; + } + + public String getKpp_deb() { + return kpp_deb; + } + + public void setKpp_deb(String value) { + this.kpp_deb = value; + } + + public String getAcc_deb() { + return acc_deb; + } + + public void setAcc_deb(String value) { + this.acc_deb = value; + } + + public String getRclientn1() { + return rclientn1; + } + + public void setRclientn1(String value) { + this.rclientn1 = value; + } + + public String getRclientn2() { + return rclientn2; + } + + public void setRclientn2(String value) { + this.rclientn2 = value; + } + + public String getRclientn3() { + return rclientn3; + } + + public void setRclientn3(String value) { + this.rclientn3 = value; + } + + public String getRclientn4() { + return rclientn4; + } + + public void setRclientn4(String value) { + this.rclientn4 = value; + } + + public String getInn_cred() { + return inn_cred; + } + + public void setInn_cred(String value) { + this.inn_cred = value; + } + + public String getKpp_cred() { + return kpp_cred; + } + + public void setKpp_cred(String value) { + this.kpp_cred = value; + } + + public String getAcc_kr_1() { + return acc_kr_1; + } + + public void setAcc_kr_1(String value) { + this.acc_kr_1 = value; + } + + public String getSpecif_1() { + return specif_1; + } + + public void setSpecif_1(String value) { + this.specif_1 = value; + } + + public String getSend_type() { + return send_type; + } + + public void setSend_type(String value) { + this.send_type = value; + } + + public String getDoc_result() { + return doc_result; + } + + public void setDoc_result(String value) { + this.doc_result = value; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String value) { + this.fileName = 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; + } + +} \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf56.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf56.java new file mode 100644 index 000000000..54ac3ecf3 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf56.java @@ -0,0 +1,79 @@ +package ru.clearing.classes.statics.data.sdf; + +import ru.clearing.classes.ConstSerializable; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +import java.time.Instant; + +/** + * ДФ-56 Запрос транзакций за период + *

+ * DB table: S_DF56 + **/ +public class SDf56 extends SpcexObjectBase { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private String number; + private String start_datetime; + private String end_datetime; + private String account; + private String deal; + private Instant generationTime; + private Long generationId; + + public String getNumber() { + return number; + } + + public void setNumber(String value) { + this.number = value; + } + + public String getStart_datetime() { + return start_datetime; + } + + public void setStart_datetime(String value) { + this.start_datetime = value; + } + + public String getEnd_datetime() { + return end_datetime; + } + + public void setEnd_datetime(String value) { + this.end_datetime = value; + } + + 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 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; + } +} diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf57.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf57.java new file mode 100644 index 000000000..f66fcc510 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf57.java @@ -0,0 +1,377 @@ +package ru.clearing.classes.statics.data.sdf; + +import ru.clearing.classes.ConstSerializable; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +import java.time.Instant; + +/** + * ДФ-57 Список транзакций о списании/зачислении за период по всем счетам (ТБС и КС) + *

+ * DB table: S_DF57 + **/ +public class SDf57 extends SpcexObjectBase { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private Long dbfId; + private String deal_deb; + private String deal_cred; + private String sbankcode; + private String c_acc_deb; + private String sbanknam1; + private String sbanknam2; + private String sbanknam3; + private String sbanknam4; + private String sbanknam5; + private String rbankcode; + private String c_acc_cred; + private String rbanknam1; + private String rbanknam2; + private String rbanknam3; + private String rbanknam4; + private String rbanknam5; + private String op_type; + private String pay_date; + private String ext_date; + private String pay_val; + private String sum_deb; + private String sclientn1; + private String sclientn2; + private String sclientn3; + private String sclientn4; + private String inn_deb; + private String kpp_deb; + private String acc_deb; + private String rclientn1; + private String rclientn2; + private String rclientn3; + private String rclientn4; + private String inn_cred; + private String kpp_cred; + private String acc_kr; + private String specif; + private String fileName; + private Instant generationTime; + private Long generationId; + + public Long getDbfId() { + return dbfId; + } + + public void setDbfId(Long value) { + this.dbfId = value; + } + + public String getDeal_deb() { + return deal_deb; + } + + public void setDeal_deb(String value) { + this.deal_deb = value; + } + + public String getDeal_cred() { + return deal_cred; + } + + public void setDeal_cred(String value) { + this.deal_cred = value; + } + + public String getSbankcode() { + return sbankcode; + } + + public void setSbankcode(String value) { + this.sbankcode = value; + } + + public String getC_acc_deb() { + return c_acc_deb; + } + + public void setC_acc_deb(String value) { + this.c_acc_deb = value; + } + + public String getSbanknam1() { + return sbanknam1; + } + + public void setSbanknam1(String value) { + this.sbanknam1 = value; + } + + public String getSbanknam2() { + return sbanknam2; + } + + public void setSbanknam2(String value) { + this.sbanknam2 = value; + } + + public String getSbanknam3() { + return sbanknam3; + } + + public void setSbanknam3(String value) { + this.sbanknam3 = value; + } + + public String getSbanknam4() { + return sbanknam4; + } + + public void setSbanknam4(String value) { + this.sbanknam4 = value; + } + + public String getSbanknam5() { + return sbanknam5; + } + + public void setSbanknam5(String value) { + this.sbanknam5 = value; + } + + public String getRbankcode() { + return rbankcode; + } + + public void setRbankcode(String value) { + this.rbankcode = value; + } + + public String getC_acc_cred() { + return c_acc_cred; + } + + public void setC_acc_cred(String value) { + this.c_acc_cred = value; + } + + public String getRbanknam1() { + return rbanknam1; + } + + public void setRbanknam1(String value) { + this.rbanknam1 = value; + } + + public String getRbanknam2() { + return rbanknam2; + } + + public void setRbanknam2(String value) { + this.rbanknam2 = value; + } + + public String getRbanknam3() { + return rbanknam3; + } + + public void setRbanknam3(String value) { + this.rbanknam3 = value; + } + + public String getRbanknam4() { + return rbanknam4; + } + + public void setRbanknam4(String value) { + this.rbanknam4 = value; + } + + public String getRbanknam5() { + return rbanknam5; + } + + public void setRbanknam5(String value) { + this.rbanknam5 = value; + } + + public String getOp_type() { + return op_type; + } + + public void setOp_type(String value) { + this.op_type = value; + } + + public String getPay_date() { + return pay_date; + } + + public void setPay_date(String value) { + this.pay_date = value; + } + + public String getExt_date() { + return ext_date; + } + + public void setExt_date(String value) { + this.ext_date = value; + } + + public String getPay_val() { + return pay_val; + } + + public void setPay_val(String value) { + this.pay_val = value; + } + + public String getSum_deb() { + return sum_deb; + } + + public void setSum_deb(String value) { + this.sum_deb = value; + } + + public String getSclientn1() { + return sclientn1; + } + + public void setSclientn1(String value) { + this.sclientn1 = value; + } + + public String getSclientn2() { + return sclientn2; + } + + public void setSclientn2(String value) { + this.sclientn2 = value; + } + + public String getSclientn3() { + return sclientn3; + } + + public void setSclientn3(String value) { + this.sclientn3 = value; + } + + public String getSclientn4() { + return sclientn4; + } + + public void setSclientn4(String value) { + this.sclientn4 = value; + } + + public String getInn_deb() { + return inn_deb; + } + + public void setInn_deb(String value) { + this.inn_deb = value; + } + + public String getKpp_deb() { + return kpp_deb; + } + + public void setKpp_deb(String value) { + this.kpp_deb = value; + } + + public String getAcc_deb() { + return acc_deb; + } + + public void setAcc_deb(String value) { + this.acc_deb = value; + } + + public String getRclientn1() { + return rclientn1; + } + + public void setRclientn1(String value) { + this.rclientn1 = value; + } + + public String getRclientn2() { + return rclientn2; + } + + public void setRclientn2(String value) { + this.rclientn2 = value; + } + + public String getRclientn3() { + return rclientn3; + } + + public void setRclientn3(String value) { + this.rclientn3 = value; + } + + public String getRclientn4() { + return rclientn4; + } + + public void setRclientn4(String value) { + this.rclientn4 = value; + } + + public String getInn_cred() { + return inn_cred; + } + + public void setInn_cred(String value) { + this.inn_cred = value; + } + + public String getKpp_cred() { + return kpp_cred; + } + + public void setKpp_cred(String value) { + this.kpp_cred = value; + } + + public String getAcc_kr() { + return acc_kr; + } + + public void setAcc_kr(String value) { + this.acc_kr = value; + } + + public String getSpecif() { + return specif; + } + + public void setSpecif(String value) { + this.specif = value; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String value) { + this.fileName = 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; + } + +} \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/statement/Statement.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/statement/Statement.java index f6872ed68..5a165da5f 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/statement/Statement.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/statement/Statement.java @@ -16,156 +16,164 @@ public class Statement extends BusinessObject { private Long addresseeId; private Long senderId; - private LocalDate clearingDate; private String statementType; + private Long securityId; + private String contract; private String comment; private Long accountId; private String account; private String inOutDirection; private LocalDate settlementDate; private BigDecimal amount; - private String cashMovementCurrencyCode; private String operationStatus; - private String errorCode; - private String errorText; + private Long errorCodeId; + private Long errorTextId; private Long inSDfId; private Long outSDfId; private String inOutSDfType; + private LocalDate clearingDate; public Long getAddresseeId() { return addresseeId; } - public void setAddresseeId(Long value) { - this.addresseeId = value; + public void setAddresseeId(Long addresseeId) { + this.addresseeId = addresseeId; } public Long getSenderId() { return senderId; } - public void setSenderId(Long value) { - this.senderId = value; - } - - public LocalDate getClearingDate() { - return clearingDate; - } - - public void setClearingDate(LocalDate value) { - this.clearingDate = value; + public void setSenderId(Long senderId) { + this.senderId = senderId; } public String getStatementType() { return statementType; } - public void setStatementType(String value) { - this.statementType = value; + public void setStatementType(String statementType) { + this.statementType = statementType; + } + + public Long getSecurityId() { + return securityId; + } + + public void setSecurityId(Long securityId) { + this.securityId = securityId; + } + + public String getContract() { + return contract; + } + + public void setContract(String contract) { + this.contract = contract; } public String getComment() { return comment; } - public void setComment(String value) { - this.comment = value; + public void setComment(String comment) { + this.comment = comment; } 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 void setAccount(String value) { - this.account = value; + public void setAccount(String account) { + this.account = account; } public String getInOutDirection() { return inOutDirection; } - public void setInOutDirection(String value) { - this.inOutDirection = value; + public void setInOutDirection(String inOutDirection) { + this.inOutDirection = inOutDirection; } public LocalDate getSettlementDate() { return settlementDate; } - public void setSettlementDate(LocalDate value) { - this.settlementDate = value; + public void setSettlementDate(LocalDate settlementDate) { + this.settlementDate = settlementDate; } public BigDecimal getAmount() { return amount; } - public void setAmount(BigDecimal value) { - this.amount = value; - } - - public String getCashMovementCurrencyCode() { - return cashMovementCurrencyCode; - } - - public void setCashMovementCurrencyCode(String value) { - this.cashMovementCurrencyCode = value; + public void setAmount(BigDecimal amount) { + this.amount = amount; } public String getOperationStatus() { return operationStatus; } - public void setOperationStatus(String value) { - this.operationStatus = value; + public void setOperationStatus(String operationStatus) { + this.operationStatus = operationStatus; } - public String getErrorCode() { - return errorCode; + public Long getErrorCodeId() { + return errorCodeId; } - public void setErrorCode(String value) { - this.errorCode = value; + public void setErrorCodeId(Long errorCodeId) { + this.errorCodeId = errorCodeId; } - public String getErrorText() { - return errorText; + public Long getErrorTextId() { + return errorTextId; } - public void setErrorText(String value) { - this.errorText = value; + public void setErrorTextId(Long errorTextId) { + this.errorTextId = errorTextId; } public Long getInSDfId() { return inSDfId; } - public void setInSDfId(Long value) { - this.inSDfId = value; + public void setInSDfId(Long inSDfId) { + this.inSDfId = inSDfId; } public Long getOutSDfId() { return outSDfId; } - public void setOutSDfId(Long value) { - this.outSDfId = value; + public void setOutSDfId(Long outSDfId) { + this.outSDfId = outSDfId; } public String getInOutSDfType() { return inOutSDfType; } - public void setInOutSDfType(String value) { - this.inOutSDfType = value; + public void setInOutSDfType(String inOutSDfType) { + this.inOutSDfType = inOutSDfType; } + public LocalDate getClearingDate() { + return clearingDate; + } + + public void setClearingDate(LocalDate clearingDate) { + this.clearingDate = clearingDate; + } } \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/NotificationHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/NotificationHistoryMapStore.java new file mode 100644 index 000000000..a70332a61 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/NotificationHistoryMapStore.java @@ -0,0 +1,57 @@ +package ru.spcex.clearing.imdg.businessevent; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.clearing.classes.statics.data.misc.Notification; +import ru.clearing.classes.statics.data.misc.NotificationHistory; +import ru.spcex.clearing.imdg.base.TemplateEventMapStore; +import ru.spcex.platform.utils.time.TimeUtil; + +@Component +public class NotificationHistoryMapStore extends TemplateEventMapStore { + + public NotificationHistoryMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_NotificationHistory; + } + + @Override + public String getTableName() { + return "NOTIFICATION_HISTORY"; + } + + @Override + public String[] getFields() { + return new String[]{"ID", "EVENT_TIME", "EVENT_USER_ID", "EVENT_TYPE", + "NOTIFICATION_ID", "CREATED_AT", "UPDATED_AT", "CLEARING_DATE", "SENDER_ID", "ADDRESSEE_ID", "OBJECT_TYPE", "OBJECT_ID", "NOTIFICATION_STATUS" + }; + } + + @Override + public Object[] objectToField(NotificationHistory historyLog) { + Notification object = historyLog.getObject(); + Object[] args = new Object[]{ + historyLog.getId(), + TimeUtil.toDateFromInstant(historyLog.getEventTime()), + historyLog.getUserId(), + historyLog.getEventType(), + + object.getId(), + TimeUtil.toDateFromInstant(object.getCreated()), + TimeUtil.toDateFromInstant(object.getUpdated()), + TimeUtil.toDateFromLocalDate(object.getClearingDate()), + object.getSenderId(), + object.getAddresseeId(), + object.getObjectType(), + object.getObjectId(), + object.getNotificationStatus() + }; + return args; + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/OperationMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/OperationMapStore.java new file mode 100644 index 000000000..8161f263f --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/OperationMapStore.java @@ -0,0 +1,66 @@ +package ru.spcex.clearing.imdg.businessobject; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.payment.Operation; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.imdg.base.TemplateMapStore; +import ru.spcex.platform.utils.time.TimeUtil; + +import java.sql.ResultSet; +import java.sql.SQLException; + +@Component +public class OperationMapStore extends TemplateMapStore { + + public OperationMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_Operation; + } + + @Override + public String getTableName() { + return "OPERATION"; + } + + @Override + public String[] getFields() { + return new String[]{ + "ID", "ADDRESSEE_ID", "SENDER_ID", "CREATED_AT", "UPDATED_AT", "CLEARING_DATE", "OPERATION_TYPE_ID", "OPERATION_STATUS" + }; + } + + @Override + public Operation objectReader(ResultSet resultSet) throws SQLException { + Operation object = new Operation(); + object.setId(resultSet.getObject("ID", Long.class)); + object.setAddresseeId(resultSet.getObject("ADDRESSEE_ID", Long.class)); + object.setSenderId(resultSet.getObject("SENDER_ID", Long.class)); + object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT")); + object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT")); + object.setClearingDate(getLocalDateFromSqlDate(resultSet, "CLEARING_DATE")); + object.setOperationTypeId(resultSet.getObject("OPERATION_TYPE_ID", Long.class)); + object.setOperationStatus(resultSet.getObject("OPERATION_STATUS", String.class)); + return object; + } + + @Override + public Object[] objectToField(Operation object) { + Object[] args = new Object[]{ + object.getId(), + object.getAddresseeId(), + object.getSenderId(), + TimeUtil.toDateFromInstant(object.getCreated()), + TimeUtil.toDateFromInstant(object.getUpdated()), + TimeUtil.toDateFromLocalDate(object.getClearingDate()), + object.getOperationTypeId(), + object.getOperationStatus() + }; + return args; + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/StatementMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/StatementMapStore.java index 2ac34dbaa..babef23ac 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/StatementMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/StatementMapStore.java @@ -31,7 +31,7 @@ public class StatementMapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "ADDRESSEE_ID", "SENDER_ID", "CREATED_AT", "UPDATED_AT", "CLEARING_DATE", "STATEMENT_TYPE", "COMMENT", "ACCOUNT_ID", "ACCOUNT", "IN_OUT_DIRECTION", "SETTLEMENT_DATE", "AMOUNT", "CASH_MOVEMENT_CURRENCY_CODE", "OPERATION_STATUS", "ERROR_CODE", "ERROR_TEXT", "IN_S_DF_ID", "OUT_S_DF_ID", "IN_OUT_S_DF_TYPE" + "ID", "ADDRESSEE_ID", "SENDER_ID", "STATEMENT_TYPE", "SECURITY_ID", "CONTRACT", "COMMENT", "ACCOUNT_ID", "ACCOUNT", "IN_OUT_DIRECTION", "SETTLEMENT_DATE", "AMOUNT", "OPERATION_STATUS", "ERROR_CODE_ID", "ERROR_TEXT_ID", "IN_S_DF_ID", "OUT_S_DF_ID", "IN_OUT_S_DF_TYPE", "CREATED_AT", "UPDATED_AT", "CLEARING_DATE" }; } @@ -41,23 +41,24 @@ public class StatementMapStore extends TemplateMapStore { object.setId(resultSet.getObject("ID", Long.class)); object.setAddresseeId(resultSet.getObject("ADDRESSEE_ID", Long.class)); object.setSenderId(resultSet.getObject("SENDER_ID", Long.class)); - object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT")); - object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT")); - object.setClearingDate(getLocalDateFromSqlDate(resultSet, "CLEARING_DATE")); object.setStatementType(resultSet.getObject("STATEMENT_TYPE", String.class)); + object.setSecurityId(resultSet.getObject("SECURITY_ID", Long.class)); + object.setContract(resultSet.getObject("CONTRACT", String.class)); object.setComment(resultSet.getObject("COMMENT", String.class)); object.setAccountId(resultSet.getObject("ACCOUNT_ID", Long.class)); object.setAccount(resultSet.getObject("ACCOUNT", String.class)); object.setInOutDirection(resultSet.getObject("IN_OUT_DIRECTION", String.class)); object.setSettlementDate(getLocalDateFromSqlDate(resultSet, "SETTLEMENT_DATE")); object.setAmount(resultSet.getObject("AMOUNT", BigDecimal.class)); - object.setCashMovementCurrencyCode(resultSet.getObject("CASH_MOVEMENT_CURRENCY_CODE", String.class)); object.setOperationStatus(resultSet.getObject("OPERATION_STATUS", String.class)); - object.setErrorCode(resultSet.getObject("ERROR_CODE", String.class)); - object.setErrorText(resultSet.getObject("ERROR_TEXT", String.class)); + object.setErrorCodeId(resultSet.getObject("ERROR_CODE_ID", Long.class)); + object.setErrorTextId(resultSet.getObject("ERROR_TEXT_ID", Long.class)); object.setInSDfId(resultSet.getObject("IN_S_DF_ID", Long.class)); object.setOutSDfId(resultSet.getObject("OUT_S_DF_ID", Long.class)); object.setInOutSDfType(resultSet.getObject("IN_OUT_S_DF_TYPE", String.class)); + object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT")); + object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT")); + object.setClearingDate(getLocalDateFromSqlDate(resultSet, "CLEARING_DATE")); return object; } @@ -67,23 +68,24 @@ public class StatementMapStore extends TemplateMapStore { object.getId(), object.getAddresseeId(), object.getSenderId(), - TimeUtil.toDateFromInstant(object.getCreated()), - TimeUtil.toDateFromInstant(object.getUpdated()), - TimeUtil.toDateFromLocalDate(object.getClearingDate()), object.getStatementType(), + object.getSecurityId(), + object.getContract(), object.getComment(), object.getAccountId(), object.getAccount(), object.getInOutDirection(), TimeUtil.toDateFromLocalDate(object.getSettlementDate()), object.getAmount(), - object.getCashMovementCurrencyCode(), object.getOperationStatus(), - object.getErrorCode(), - object.getErrorText(), + object.getErrorCodeId(), + object.getErrorTextId(), object.getInSDfId(), object.getOutSDfId(), - object.getInOutSDfType() + object.getInOutSDfType(), + TimeUtil.toDateFromInstant(object.getCreated()), + TimeUtil.toDateFromInstant(object.getUpdated()), + TimeUtil.toDateFromLocalDate(object.getClearingDate()) }; return args; } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ContractRegisterMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ContractRegisterMapStore.java index a97030e36..c86d05117 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ContractRegisterMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ContractRegisterMapStore.java @@ -56,7 +56,7 @@ public class ContractRegisterMapStore extends TemplateMapStore object.setName(resultSet.getObject("NAME", String.class)); object.setNumber(resultSet.getObject("NUMBER", String.class)); object.setIssueDate(getLocalDateFromSqlDate(resultSet, "ISSUE_DATE")); - object.setCompanyFullName(resultSet.getObject("COMPANY_FULL_NAME", Long.class)); + object.setCompanyFullName(resultSet.getObject("COMPANY_FULL_NAME", String.class)); object.setCompanyId(resultSet.getObject("COMPANY_ID", Long.class)); object.setDocumentType(resultSet.getObject("DOCUMENT_TYPE", String.class)); object.setIssuePlace(resultSet.getObject("ISSUE_PLACE", String.class)); diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/MarketDataLiquidationMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/MarketDataLiquidationMapStore.java new file mode 100644 index 000000000..5b7d9be69 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/MarketDataLiquidationMapStore.java @@ -0,0 +1,60 @@ +package ru.spcex.clearing.imdg.object; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.misc.MarketDataLiquidation; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.imdg.base.TemplateMapStore; +import ru.spcex.platform.utils.time.TimeUtil; + +import java.math.BigDecimal; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.*; + +@Component +public class MarketDataLiquidationMapStore extends TemplateMapStore { + + public MarketDataLiquidationMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_MarketDataLiquidation; + } + + @Override + public String getTableName() { + return "MARKET_DATA_LIQUIDATION"; + } + + @Override + public String[] getFields() { + return new String[]{ + "ID", "SECURITY_ID", "PRICE", "CLEARING_DATE" + }; + } + + @Override + public MarketDataLiquidation objectReader(ResultSet resultSet) throws SQLException { + MarketDataLiquidation object = new MarketDataLiquidation(); + object.setId(resultSet.getObject("ID", Long.class)); + object.setSecurityId(resultSet.getObject("SECURITY_ID", Long.class)); + object.setPrice(resultSet.getObject("PRICE", BigDecimal.class)); + object.setClearingDate(getLocalDateFromSqlDate(resultSet, "CLEARING_DATE")); + return object; + } + + @Override + public Object[] objectToField(MarketDataLiquidation object) { + Object[] args = new Object[]{ + object.getId(), + object.getSecurityId(), + object.getPrice(), + TimeUtil.toDateFromLocalDate(object.getClearingDate()) + }; + return args; + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/NotificationMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/NotificationMapStore.java index 1731f9845..ffbd7f8f0 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/NotificationMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/NotificationMapStore.java @@ -17,58 +17,50 @@ public class NotificationMapStore extends TemplateMapStore { super(jdbcTemplate); } - @Override - public String getTableName() { - return "NOTIFICATION"; - } - @Override public String getMapName() { return IMDGDistributedNames.Map_Notification; } + @Override + public String getTableName() { + return "NOTIFICATION"; + } + @Override public String[] getFields() { return new String[]{ - "id", - "created_at", - "updated_at", - "clearing_date", - "sender_id", - "addressee_id", - "object_type", - "object_id", - "notification_status" + "ID", "CREATED_AT", "UPDATED_AT", "CLEARING_DATE", "SENDER_ID", "ADDRESSEE_ID", "OBJECT_TYPE", "OBJECT_ID", "NOTIFICATION_STATUS" }; } @Override - protected Notification objectReader(ResultSet resultSet) throws SQLException { - Notification notification = new Notification(); - notification.setId(resultSet.getLong("id")); - notification.setCreated(getInstantFromTimestamp(resultSet, "created_at")); - notification.setUpdated(getInstantFromTimestamp(resultSet, "updated_at")); - notification.setClearingDate(getLocalDateFromSqlDate(resultSet, "clearing_date")); - notification.setSenderId(resultSet.getLong("sender_id")); - notification.setAddresseeId(resultSet.getLong("addressee_id")); - notification.setObjectType(resultSet.getString("object_type")); - notification.setObjectId(getInstantFromTimestamp(resultSet, "object_id")); - notification.setNotificationStatus(resultSet.getString("notification_status")); - return notification; + public Notification objectReader(ResultSet resultSet) throws SQLException { + Notification object = new Notification(); + object.setId(resultSet.getObject("ID", Long.class)); + object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT")); + object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT")); + object.setClearingDate(getLocalDateFromSqlDate(resultSet, "CLEARING_DATE")); + object.setSenderId(resultSet.getObject("SENDER_ID", Long.class)); + object.setAddresseeId(resultSet.getObject("ADDRESSEE_ID", Long.class)); + object.setObjectType(resultSet.getObject("OBJECT_TYPE", String.class)); + object.setObjectId(resultSet.getObject("OBJECT_ID", Long.class)); + object.setNotificationStatus(resultSet.getObject("NOTIFICATION_STATUS", String.class)); + return object; } @Override - protected Object[] objectToField(Notification notification) { + public Object[] objectToField(Notification object) { Object[] args = new Object[]{ - notification.getId(), - TimeUtil.toDateFromInstant(notification.getCreated()), - TimeUtil.toDateFromInstant(notification.getUpdated()), - notification.getClearingDate(), - notification.getSenderId(), - notification.getAddresseeId(), - notification.getObjectType(), - TimeUtil.toDateFromInstant(notification.getObjectId()), - notification.getNotificationStatus() + object.getId(), + TimeUtil.toDateFromInstant(object.getCreated()), + TimeUtil.toDateFromInstant(object.getUpdated()), + TimeUtil.toDateFromLocalDate(object.getClearingDate()), + object.getSenderId(), + object.getAddresseeId(), + object.getObjectType(), + object.getObjectId(), + object.getNotificationStatus() }; return args; } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/PaymentInstructionMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/PaymentInstructionMapStore.java index 3a4fa3c31..11281e96f 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/PaymentInstructionMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/PaymentInstructionMapStore.java @@ -7,6 +7,7 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.base.TemplateMapStore; import ru.spcex.platform.utils.time.TimeUtil; +import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; @@ -17,86 +18,92 @@ public class PaymentInstructionMapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "CURR_CODE", "ACCOUNT", "REMAINDER", "DEAL", "ACC_CODE", "DAT", "MARKET", "ACC_NAME", "ACC_TYPE", "SUMENGAGE", "SUMUNBLOCK", "FILE_TYPE", "RESULT", "GENERATION_TIME", "GENERATION_ID", "IN_S_DF01_ID" + "ID", "CURR_CODE", "ACCOUNT", "REMAINDER", "DEAL", "ACC_CODE", "DAT", "MARKET", "ACC_NAME", "ACC_TYPE", "SUMENGAGE", "SUMUNBLOCK", "FILE_TYPE", "RESULT", "GENERATION_TIME", "GENERATION_ID", "IN_S_DF_ID" }; } @@ -53,7 +53,7 @@ public class SDf02MapStore extends TemplateMapStore { object.setResult(resultSet.getObject("RESULT", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); - object.setInSDf01Id(resultSet.getObject("IN_S_DF01_ID", Long.class)); + object.setInSDfId(resultSet.getObject("IN_S_DF_ID", Long.class)); return object; } @@ -76,7 +76,7 @@ public class SDf02MapStore extends TemplateMapStore { object.getResult(), TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId(), - object.getInSDf01Id() + object.getInSDfId() }; return args; } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf03MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf03MapStore.java index b06068c55..2a22e089e 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf03MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf03MapStore.java @@ -30,12 +30,7 @@ public class SDf03MapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "SEG_TYPE", "DOC_TYPE", "DOCNM_REF", "DOCNMPREV", "PRIORITY", "SBANKCODE", "C_ACC_DEB", "SBANKNAM1", "SBANKNAM2", - "SBANKNAM3", "SBANKNAM4", "SBANKNAM5", "RBANKCODE", "C_ACC_CRED", "RBANKNAM1", "RBANKNAM2", "RBANKNAM3", - "RBANKNAM4", "RBANKNAM5", "PAY_DATE", "EXT_DATE", "PAY_VAL", "SUM_DEB", "SCLIENTN1", "SCLIENTN2", - "SCLIENTN3", "SCLIENTN4", "SC_CODE", "ACC_DEB", "RCLIENTN1", "RCLIENTN2", "RCLIENTN3", "RCLIENTN4", - "ACC_KR_1", "ACC_KR_2", "SP_CODE", "SPECIF_1", "SPECIF_2", "SPECIF_3", "SPECIF_4", "SPECIF_5", - "SPECIF_6", "SEND_TYPE", "SERVDATE", "DOC_RESULT", "IMP_RESULT", "GENERATION_TIME", "GENERATION_ID", "PAYMENT_INSTRUCTION_ID" + "ID", "SEG_TYPE", "DOC_TYPE", "DOCNM_REF", "DOCNMPREV", "C_ACC_DEB", "SBANKNAM1", "SBANKNAM2", "SBANKNAM3", "SBANKNAM4", "SBANKNAM5", "C_ACC_CRED", "RBANKNAM1", "RBANKNAM2", "RBANKNAM3", "RBANKNAM4", "RBANKNAM5", "PAY_DATE", "PAY_VAL", "SUM_DEB", "SPECIF_1", "IMP_RESULT", "GENERATION_TIME", "GENERATION_ID", "PAYMENT_INSTRUCTION_ID" }; } @@ -47,15 +42,12 @@ public class SDf03MapStore extends TemplateMapStore { object.setDoc_type(resultSet.getObject("DOC_TYPE", String.class)); object.setDocnm_ref(resultSet.getObject("DOCNM_REF", String.class)); object.setDocnmprev(resultSet.getObject("DOCNMPREV", String.class)); - object.setPriority(resultSet.getObject("PRIORITY", String.class)); - object.setSbankcode(resultSet.getObject("SBANKCODE", String.class)); object.setC_acc_deb(resultSet.getObject("C_ACC_DEB", String.class)); object.setSbanknam1(resultSet.getObject("SBANKNAM1", String.class)); object.setSbanknam2(resultSet.getObject("SBANKNAM2", String.class)); object.setSbanknam3(resultSet.getObject("SBANKNAM3", String.class)); object.setSbanknam4(resultSet.getObject("SBANKNAM4", String.class)); object.setSbanknam5(resultSet.getObject("SBANKNAM5", String.class)); - object.setRbankcode(resultSet.getObject("RBANKCODE", String.class)); object.setC_acc_cred(resultSet.getObject("C_ACC_CRED", String.class)); object.setRbanknam1(resultSet.getObject("RBANKNAM1", String.class)); object.setRbanknam2(resultSet.getObject("RBANKNAM2", String.class)); @@ -63,31 +55,9 @@ public class SDf03MapStore extends TemplateMapStore { object.setRbanknam4(resultSet.getObject("RBANKNAM4", String.class)); object.setRbanknam5(resultSet.getObject("RBANKNAM5", String.class)); object.setPay_date(resultSet.getObject("PAY_DATE", String.class)); - object.setExt_date(resultSet.getObject("EXT_DATE", String.class)); object.setPay_val(resultSet.getObject("PAY_VAL", String.class)); object.setSum_deb(resultSet.getObject("SUM_DEB", String.class)); - object.setSclientn1(resultSet.getObject("SCLIENTN1", String.class)); - object.setSclientn2(resultSet.getObject("SCLIENTN2", String.class)); - object.setSclientn3(resultSet.getObject("SCLIENTN3", String.class)); - object.setSclientn4(resultSet.getObject("SCLIENTN4", String.class)); - object.setSc_code(resultSet.getObject("SC_CODE", String.class)); - object.setAcc_deb(resultSet.getObject("ACC_DEB", String.class)); - object.setRclientn1(resultSet.getObject("RCLIENTN1", String.class)); - object.setRclientn2(resultSet.getObject("RCLIENTN2", String.class)); - object.setRclientn3(resultSet.getObject("RCLIENTN3", String.class)); - object.setRclientn4(resultSet.getObject("RCLIENTN4", String.class)); - object.setAcc_kr_1(resultSet.getObject("ACC_KR_1", String.class)); - object.setAcc_kr_2(resultSet.getObject("ACC_KR_2", String.class)); - object.setSp_code(resultSet.getObject("SP_CODE", String.class)); object.setSpecif_1(resultSet.getObject("SPECIF_1", String.class)); - object.setSpecif_2(resultSet.getObject("SPECIF_2", String.class)); - object.setSpecif_3(resultSet.getObject("SPECIF_3", String.class)); - object.setSpecif_4(resultSet.getObject("SPECIF_4", String.class)); - object.setSpecif_5(resultSet.getObject("SPECIF_5", String.class)); - object.setSpecif_6(resultSet.getObject("SPECIF_6", String.class)); - object.setSend_type(resultSet.getObject("SEND_TYPE", String.class)); - object.setServdate(resultSet.getObject("SERVDATE", String.class)); - object.setDoc_result(resultSet.getObject("DOC_RESULT", String.class)); object.setImp_result(resultSet.getObject("IMP_RESULT", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); @@ -103,15 +73,12 @@ public class SDf03MapStore extends TemplateMapStore { object.getDoc_type(), object.getDocnm_ref(), object.getDocnmprev(), - object.getPriority(), - object.getSbankcode(), object.getC_acc_deb(), object.getSbanknam1(), object.getSbanknam2(), object.getSbanknam3(), object.getSbanknam4(), object.getSbanknam5(), - object.getRbankcode(), object.getC_acc_cred(), object.getRbanknam1(), object.getRbanknam2(), @@ -119,31 +86,9 @@ public class SDf03MapStore extends TemplateMapStore { object.getRbanknam4(), object.getRbanknam5(), object.getPay_date(), - object.getExt_date(), object.getPay_val(), object.getSum_deb(), - object.getSclientn1(), - object.getSclientn2(), - object.getSclientn3(), - object.getSclientn4(), - object.getSc_code(), - object.getAcc_deb(), - object.getRclientn1(), - object.getRclientn2(), - object.getRclientn3(), - object.getRclientn4(), - object.getAcc_kr_1(), - object.getAcc_kr_2(), - object.getSp_code(), object.getSpecif_1(), - object.getSpecif_2(), - object.getSpecif_3(), - object.getSpecif_4(), - object.getSpecif_5(), - object.getSpecif_6(), - object.getSend_type(), - object.getServdate(), - object.getDoc_result(), object.getImp_result(), TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId(), diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf04MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf04MapStore.java index b2cd9d2fd..1b1ac63b5 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf04MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf04MapStore.java @@ -30,12 +30,7 @@ public class SDf04MapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "id", "seg_type", "doc_type", "docnm_ref", "docnmprev", "priority", "sbankcode", "c_acc_deb", "sbanknam1", - "sbanknam2", "sbanknam3", "sbanknam4", "sbanknam5", "rbankcode", "c_acc_cred", "rbanknam1", "rbanknam2", - "rbanknam3", "rbanknam4", "rbanknam5", "pay_date", "ext_date", "pay_val", "sum_deb", "sclientn1", "sclientn2", - "sclientn3", "sclientn4", "sc_code", "acc_deb", "rclientn1", "rclientn2", "rclientn3", "rclientn4", "acc_kr_1", - "acc_kr_2", "sp_code", "specif_1", "specif_2", "specif_3", "specif_4", "specif_5", "specif_6", "send_type", - "servdate", "doc_result", "imp_result", "file_name", "generation_time", "generation_id" + "ID", "SEG_TYPE", "DOC_TYPE", "DOCNM_REF", "DOCNMPREV", "C_ACC_DEB", "SBANKNAM1", "SBANKNAM2", "SBANKNAM3", "SBANKNAM4", "SBANKNAM5", "C_ACC_CRED", "RBANKNAM1", "RBANKNAM2", "RBANKNAM3", "RBANKNAM4", "RBANKNAM5", "PAY_DATE", "PAY_VAL", "SUM_DEB", "SPECIF_1", "IMP_RESULT", "FILE_NAME", "GENERATION_TIME", "GENERATION_ID" }; } @@ -43,55 +38,30 @@ public class SDf04MapStore extends TemplateMapStore { public SDf04 objectReader(ResultSet resultSet) throws SQLException { SDf04 object = new SDf04(); object.setId(resultSet.getObject("ID", Long.class)); - object.setSeg_type(resultSet.getString("seg_type")); - object.setDoc_type(resultSet.getString("doc_type")); - object.setDocnm_ref(resultSet.getString("docnm_ref")); - object.setDocnmprev(resultSet.getString("docnmprev")); - object.setPriority(resultSet.getString("priority")); - object.setSbankcode(resultSet.getString("sbankcode")); - object.setC_acc_deb(resultSet.getString("c_acc_deb")); - object.setSbanknam1(resultSet.getString("sbanknam1")); - object.setSbanknam2(resultSet.getString("sbanknam2")); - object.setSbanknam3(resultSet.getString("sbanknam3")); - object.setSbanknam4(resultSet.getString("sbanknam4")); - object.setSbanknam5(resultSet.getString("sbanknam5")); - object.setRbankcode(resultSet.getString("rbankcode")); - object.setC_acc_cred(resultSet.getString("c_acc_cred")); - object.setRbanknam1(resultSet.getString("rbanknam1")); - object.setRbanknam2(resultSet.getString("rbanknam2")); - object.setRbanknam3(resultSet.getString("rbanknam3")); - object.setRbanknam4(resultSet.getString("rbanknam4")); - object.setRbanknam5(resultSet.getString("rbanknam5")); - object.setPay_date(resultSet.getString("pay_date")); - object.setExt_date(resultSet.getString("ext_date")); - object.setPay_val(resultSet.getString("pay_val")); - object.setSum_deb(resultSet.getString("sum_deb")); - object.setSclientn1(resultSet.getString("sclientn1")); - object.setSclientn2(resultSet.getString("sclientn2")); - object.setSclientn3(resultSet.getString("sclientn3")); - object.setSclientn4(resultSet.getString("sclientn4")); - object.setSc_code(resultSet.getString("sc_code")); - object.setAcc_deb(resultSet.getString("acc_deb")); - object.setRclientn1(resultSet.getString("rclientn1")); - object.setRclientn2(resultSet.getString("rclientn2")); - object.setRclientn3(resultSet.getString("rclientn3")); - object.setRclientn4(resultSet.getString("rclientn4")); - object.setAcc_kr_1(resultSet.getString("acc_kr_1")); - object.setAcc_kr_2(resultSet.getString("acc_kr_2")); - object.setSp_code(resultSet.getString("sp_code")); - object.setSpecif_1(resultSet.getString("specif_1")); - object.setSpecif_2(resultSet.getString("specif_2")); - object.setSpecif_3(resultSet.getString("specif_3")); - object.setSpecif_4(resultSet.getString("specif_4")); - object.setSpecif_5(resultSet.getString("specif_5")); - object.setSpecif_6(resultSet.getString("specif_6")); - object.setSend_type(resultSet.getString("send_type")); - object.setServdate(resultSet.getString("servdate")); - object.setDoc_result(resultSet.getString("doc_result")); - object.setImp_result(resultSet.getString("imp_result")); - object.setFile_name(resultSet.getString("file_name")); - object.setGenerationTime(getInstantFromTimestamp(resultSet, "generation_time")); - object.setGenerationId(resultSet.getObject("generation_id", Long.class)); + object.setSeg_type(resultSet.getObject("SEG_TYPE", String.class)); + object.setDoc_type(resultSet.getObject("DOC_TYPE", String.class)); + object.setDocnm_ref(resultSet.getObject("DOCNM_REF", String.class)); + object.setDocnmprev(resultSet.getObject("DOCNMPREV", String.class)); + object.setC_acc_deb(resultSet.getObject("C_ACC_DEB", String.class)); + object.setSbanknam1(resultSet.getObject("SBANKNAM1", String.class)); + object.setSbanknam2(resultSet.getObject("SBANKNAM2", String.class)); + object.setSbanknam3(resultSet.getObject("SBANKNAM3", String.class)); + object.setSbanknam4(resultSet.getObject("SBANKNAM4", String.class)); + object.setSbanknam5(resultSet.getObject("SBANKNAM5", String.class)); + object.setC_acc_cred(resultSet.getObject("C_ACC_CRED", String.class)); + object.setRbanknam1(resultSet.getObject("RBANKNAM1", String.class)); + object.setRbanknam2(resultSet.getObject("RBANKNAM2", String.class)); + object.setRbanknam3(resultSet.getObject("RBANKNAM3", String.class)); + object.setRbanknam4(resultSet.getObject("RBANKNAM4", String.class)); + object.setRbanknam5(resultSet.getObject("RBANKNAM5", String.class)); + object.setPay_date(resultSet.getObject("PAY_DATE", String.class)); + object.setPay_val(resultSet.getObject("PAY_VAL", String.class)); + object.setSum_deb(resultSet.getObject("SUM_DEB", String.class)); + object.setSpecif_1(resultSet.getObject("SPECIF_1", String.class)); + object.setImp_result(resultSet.getObject("IMP_RESULT", String.class)); + object.setFileName(resultSet.getObject("FILE_NAME", String.class)); + object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); + object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); return object; } @@ -103,15 +73,12 @@ public class SDf04MapStore extends TemplateMapStore { object.getDoc_type(), object.getDocnm_ref(), object.getDocnmprev(), - object.getPriority(), - object.getSbankcode(), object.getC_acc_deb(), object.getSbanknam1(), object.getSbanknam2(), object.getSbanknam3(), object.getSbanknam4(), object.getSbanknam5(), - object.getRbankcode(), object.getC_acc_cred(), object.getRbanknam1(), object.getRbanknam2(), @@ -119,33 +86,11 @@ public class SDf04MapStore extends TemplateMapStore { object.getRbanknam4(), object.getRbanknam5(), object.getPay_date(), - object.getExt_date(), object.getPay_val(), object.getSum_deb(), - object.getSclientn1(), - object.getSclientn2(), - object.getSclientn3(), - object.getSclientn4(), - object.getSc_code(), - object.getAcc_deb(), - object.getRclientn1(), - object.getRclientn2(), - object.getRclientn3(), - object.getRclientn4(), - object.getAcc_kr_1(), - object.getAcc_kr_2(), - object.getSp_code(), object.getSpecif_1(), - object.getSpecif_2(), - object.getSpecif_3(), - object.getSpecif_4(), - object.getSpecif_5(), - object.getSpecif_6(), - object.getSend_type(), - object.getServdate(), - object.getDoc_result(), object.getImp_result(), - object.getFile_name(), + object.getFileName(), TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId() }; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf06MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf06MapStore.java new file mode 100644 index 000000000..94edabb33 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf06MapStore.java @@ -0,0 +1,80 @@ +package ru.spcex.clearing.imdg.object; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.clearing.classes.statics.data.sdf.SDf06; +import ru.spcex.clearing.imdg.base.TemplateMapStore; +import ru.spcex.platform.utils.time.TimeUtil; + +import java.math.BigDecimal; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.*; + +@Component +public class SDf06MapStore extends TemplateMapStore { + + public SDf06MapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_SDf06; + } + + @Override + public String getTableName() { + return "S_DF06"; + } + + @Override + public String[] getFields() { + return new String[]{ + "ID", "ACCOUNT", "SUM", "MARKET", "TYPE", "DEAL", "CLIENT_N", "INN", "BIC", "SPEC", "NUMBER", "FILE_NAME", "GENERATION_TIME", "GENERATION_ID" + }; + } + + @Override + public SDf06 objectReader(ResultSet resultSet) throws SQLException { + SDf06 object = new SDf06(); + object.setId(resultSet.getObject("ID", Long.class)); + object.setAccount(resultSet.getObject("ACCOUNT", String.class)); + object.setSum(resultSet.getObject("SUM", BigDecimal.class)); + object.setMarket(resultSet.getObject("MARKET", String.class)); + object.setType(resultSet.getObject("TYPE", String.class)); + object.setDeal(resultSet.getObject("DEAL", String.class)); + object.setClientN(resultSet.getObject("CLIENT_N", String.class)); + object.setInn(resultSet.getObject("INN", BigDecimal.class)); + object.setBic(resultSet.getObject("BIC", BigDecimal.class)); + object.setSpec(resultSet.getObject("SPEC", String.class)); + object.setNumber(resultSet.getObject("NUMBER", BigDecimal.class)); + object.setFileName(resultSet.getObject("FILE_NAME", String.class)); + object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); + object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); + return object; + } + + @Override + public Object[] objectToField(SDf06 object) { + Object[] args = new Object[]{ + object.getId(), + object.getAccount(), + object.getSum(), + object.getMarket(), + object.getType(), + object.getDeal(), + object.getClientN(), + object.getInn(), + object.getBic(), + object.getSpec(), + object.getNumber(), + object.getFileName(), + TimeUtil.toDateFromInstant(object.getGenerationTime()), + object.getGenerationId() + }; + return args; + } + +} diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf07MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf07MapStore.java new file mode 100644 index 000000000..e0d5118ff --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf07MapStore.java @@ -0,0 +1,81 @@ +package ru.spcex.clearing.imdg.object; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.clearing.classes.statics.data.sdf.SDf07; +import ru.spcex.clearing.imdg.base.TemplateMapStore; +import ru.spcex.platform.utils.time.TimeUtil; + +import java.math.BigDecimal; +import java.sql.ResultSet; +import java.sql.SQLException; + +@Component +public class SDf07MapStore extends TemplateMapStore { + + public SDf07MapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_SDf07; + } + + @Override + public String getTableName() { + return "S_DF07"; + } + + @Override + public String[] getFields() { + return new String[]{ + "ID", "ACCOUNT", "SUM", "MARKET", "TYPE", "DEAL", "CLIENT_N", "INN", "BIC", "SPEC", "NUMBER", "RESULT", "GENERATION_TIME", "GENERATION_ID", "IN_S_DF_ID" + }; + } + + @Override + public SDf07 objectReader(ResultSet resultSet) throws SQLException { + SDf07 object = new SDf07(); + object.setId(resultSet.getObject("ID", Long.class)); + object.setAccount(resultSet.getObject("ACCOUNT", String.class)); + object.setSum(resultSet.getObject("SUM", BigDecimal.class)); + object.setMarket(resultSet.getObject("MARKET", String.class)); + object.setType(resultSet.getObject("TYPE", String.class)); + object.setDeal(resultSet.getObject("DEAL", String.class)); + object.setClientN(resultSet.getObject("CLIENT_N", String.class)); + object.setInn(resultSet.getObject("INN", BigDecimal.class)); + object.setBic(resultSet.getObject("BIC", BigDecimal.class)); + object.setSpec(resultSet.getObject("SPEC", String.class)); + object.setNumber(resultSet.getObject("NUMBER", BigDecimal.class)); + object.setResult(resultSet.getObject("RESULT", BigDecimal.class)); + object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); + object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); + object.setInSDfId(resultSet.getObject("IN_S_DF_ID", Long.class)); + return object; + } + + @Override + public Object[] objectToField(SDf07 object) { + Object[] args = new Object[]{ + object.getId(), + object.getAccount(), + object.getSum(), + object.getMarket(), + object.getType(), + object.getDeal(), + object.getClientN(), + object.getInn(), + object.getBic(), + object.getSpec(), + object.getNumber(), + object.getResult(), + TimeUtil.toDateFromInstant(object.getGenerationTime()), + object.getGenerationId(), + object.getInSDfId() + }; + return args; + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf08MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf08MapStore.java index b81be7113..a061f133e 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf08MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf08MapStore.java @@ -30,7 +30,7 @@ public class SDf08MapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "NUMBER", "DATETIME", "GENERATION_TIME", "GENERATION_ID" + "ID", "OUT_DOCUMENT", "DEPO_CODE", "QUANTITY", "SECURITY_CODE", "CLIENT_NAME", "FILE_NAME", "GENERATION_TIME", "GENERATION_ID" }; } @@ -38,8 +38,12 @@ public class SDf08MapStore extends TemplateMapStore { public SDf08 objectReader(ResultSet resultSet) throws SQLException { SDf08 object = new SDf08(); object.setId(resultSet.getObject("ID", Long.class)); - object.setNumber(resultSet.getObject("NUMBER", String.class)); - object.setDatetime(resultSet.getObject("DATETIME", String.class)); + object.setOutDocument(resultSet.getObject("OUT_DOCUMENT", String.class)); + object.setDepoCode(resultSet.getObject("DEPO_CODE", String.class)); + object.setQuantity(resultSet.getObject("QUANTITY", String.class)); + object.setSecurityCode(resultSet.getObject("SECURITY_CODE", String.class)); + object.setClientName(resultSet.getObject("CLIENT_NAME", String.class)); + object.setFileName(resultSet.getObject("FILE_NAME", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); return object; @@ -49,8 +53,12 @@ public class SDf08MapStore extends TemplateMapStore { public Object[] objectToField(SDf08 object) { Object[] args = new Object[]{ object.getId(), - object.getNumber(), - object.getDatetime(), + object.getOutDocument(), + object.getDepoCode(), + object.getQuantity(), + object.getSecurityCode(), + object.getClientName(), + object.getFileName(), TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId() }; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf09MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf09MapStore.java index 2cc841e7d..d704935e2 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf09MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf09MapStore.java @@ -31,8 +31,7 @@ public class SDf09MapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "ACCOUNT", "SUM", "MARKET", "TYPE", "NUMBER", "INN", "FILE_NAME", "GENERATION_TIME", - "GENERATION_ID" + "ID", "OUT_DOCUMENT", "IN_DOCUMENT", "DEPO_CODE", "QUANTITY", "SECURITY_CODE", "CLIENT_NAME", "RESULT", "GENERATION_TIME", "GENERATION_ID" }; } @@ -40,13 +39,13 @@ public class SDf09MapStore extends TemplateMapStore { public SDf09 objectReader(ResultSet resultSet) throws SQLException { SDf09 object = new SDf09(); object.setId(resultSet.getObject("ID", Long.class)); - object.setAccount(resultSet.getString("ACCOUNT")); - object.setSum(resultSet.getObject("SUM", BigDecimal.class)); - object.setMarket(resultSet.getString("MARKET")); - object.setType(resultSet.getString("TYPE")); - object.setNumber(resultSet.getObject("NUMBER", BigDecimal.class)); - object.setInn(resultSet.getObject("INN", BigDecimal.class)); - object.setFileName(resultSet.getString("FILE_NAME")); + object.setOutDocument(resultSet.getObject("OUT_DOCUMENT", String.class)); + object.setInDocument(resultSet.getObject("IN_DOCUMENT", String.class)); + object.setDepoCode(resultSet.getObject("DEPO_CODE", String.class)); + object.setQuantity(resultSet.getObject("QUANTITY", String.class)); + object.setSecurityCode(resultSet.getObject("SECURITY_CODE", String.class)); + object.setClientName(resultSet.getObject("CLIENT_NAME", String.class)); + object.setResult(resultSet.getObject("RESULT", BigDecimal.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); return object; @@ -56,13 +55,13 @@ public class SDf09MapStore extends TemplateMapStore { public Object[] objectToField(SDf09 object) { Object[] args = new Object[]{ object.getId(), - object.getAccount(), - object.getSum(), - object.getMarket(), - object.getType(), - object.getNumber(), - object.getInn(), - object.getFileName(), + object.getOutDocument(), + object.getInDocument(), + object.getDepoCode(), + object.getQuantity(), + object.getSecurityCode(), + object.getClientName(), + object.getResult(), TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId() }; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf10MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf10MapStore.java index fab361ee3..6f5a547aa 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf10MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf10MapStore.java @@ -31,8 +31,8 @@ public class SDf10MapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "ACCOUNT", "SUM", "MARKET", "TYPE", "NUMBER", "INN", - "RESULT", "GENERATION_TIME", "GENERATION_ID", "IN_S_DF09_ID" + "ID", "OUT_DOCUMENT", "DEPO_CODE", "QUANTITY", "SECURITY_CODE", "CLIENT_NAME", "FILE_NAME", + "GENERATION_TIME", "GENERATION_ID" }; } @@ -40,16 +40,14 @@ public class SDf10MapStore extends TemplateMapStore { public SDf10 objectReader(ResultSet resultSet) throws SQLException { SDf10 object = new SDf10(); object.setId(resultSet.getObject("ID", Long.class)); - object.setAccount(resultSet.getObject("ACCOUNT", String.class)); - object.setSum(resultSet.getObject("SUM", BigDecimal.class)); - object.setMarket(resultSet.getObject("MARKET", String.class)); - object.setType(resultSet.getObject("TYPE", String.class)); - object.setNumber(resultSet.getObject("NUMBER", BigDecimal.class)); - object.setInn(resultSet.getObject("INN", BigDecimal.class)); - object.setResult(resultSet.getObject("RESULT", String.class)); + object.setOutDocument(resultSet.getObject("OUT_DOCUMENT", String.class)); + object.setDepoCode(resultSet.getObject("DEPO_CODE", String.class)); + object.setQuantity(resultSet.getObject("QUANTITY", String.class)); + object.setSecurityCode(resultSet.getObject("SECURITY_CODE", String.class)); + object.setClientName(resultSet.getObject("CLIENT_NAME", String.class)); + object.setFileName(resultSet.getObject("FILE_NAME", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); - object.setInSDf09Id(resultSet.getObject("IN_S_DF09_ID", Long.class)); return object; } @@ -57,18 +55,15 @@ public class SDf10MapStore extends TemplateMapStore { public Object[] objectToField(SDf10 object) { Object[] args = new Object[]{ object.getId(), - object.getAccount(), - object.getSum(), - object.getMarket(), - object.getType(), - object.getNumber(), - object.getInn(), - object.getResult(), + object.getOutDocument(), + object.getDepoCode(), + object.getQuantity(), + object.getSecurityCode(), + object.getClientName(), + object.getFileName(), TimeUtil.toDateFromInstant(object.getGenerationTime()), - object.getGenerationId(), - object.getInSDf09Id() + object.getGenerationId() }; return args; } - } \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf11MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf11MapStore.java index febedde70..67c69a293 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf11MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf11MapStore.java @@ -7,6 +7,7 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.base.TemplateMapStore; import ru.spcex.platform.utils.time.TimeUtil; +import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; @@ -30,12 +31,7 @@ public class SDf11MapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "SEG_TYPE", "DOC_TYPE", "DOCNM_REF", "DOCNMPREV", "PRIORITY", "SBANKCODE", "C_ACC_DEB", "SBANKNAM1", - "SBANKNAM2", "SBANKNAM3", "SBANKNAM4", "SBANKNAM5", "RBANKCODE", "C_ACC_CRED", "RBANKNAM1", "RBANKNAM2", - "RBANKNAM3", "RBANKNAM4", "RBANKNAM5", "PAY_DATE", "EXT_DATE", "PAY_VAL", "SUM_DEB", "SCLIENTN1", "SCLIENTN2", - "SCLIENTN3", "SCLIENTN4", "SC_CODE", "ACC_DEB", "RCLIENTN1", "RCLIENTN2", "RCLIENTN3", "RCLIENTN4", - "ACC_KR_1", "ACC_KR_2", "SP_CODE", "SPECIF_1", "SPECIF_2", "SPECIF_3", "SPECIF_4", "SPECIF_5", - "SPECIF_6", "SEND_TYPE", "SERVDATE", "DOC_RESULT", "GENERATION_TIME", "GENERATION_ID", "PAYMENT_INSTRUCTION_ID" + "ID", "OUT_DOCUMENT", "IN_DOCUMENT", "DEPO_CODE", "QUANTITY", "SECURITY_CODE", "CLIENT_NAME", "RESULT", "GENERATION_TIME", "GENERATION_ID" }; } @@ -43,54 +39,15 @@ public class SDf11MapStore extends TemplateMapStore { public SDf11 objectReader(ResultSet resultSet) throws SQLException { SDf11 object = new SDf11(); object.setId(resultSet.getObject("ID", Long.class)); - object.setSeg_type(resultSet.getObject("SEG_TYPE", String.class)); - object.setDoc_type(resultSet.getObject("DOC_TYPE", String.class)); - object.setDocnm_ref(resultSet.getObject("DOCNM_REF", String.class)); - object.setDocnmprev(resultSet.getObject("DOCNMPREV", String.class)); - object.setPriority(resultSet.getObject("PRIORITY", String.class)); - object.setSbankcode(resultSet.getObject("SBANKCODE", String.class)); - object.setC_acc_deb(resultSet.getObject("C_ACC_DEB", String.class)); - object.setSbanknam1(resultSet.getObject("SBANKNAM1", String.class)); - object.setSbanknam2(resultSet.getObject("SBANKNAM2", String.class)); - object.setSbanknam3(resultSet.getObject("SBANKNAM3", String.class)); - object.setSbanknam4(resultSet.getObject("SBANKNAM4", String.class)); - object.setSbanknam5(resultSet.getObject("SBANKNAM5", String.class)); - object.setRbankcode(resultSet.getObject("RBANKCODE", String.class)); - object.setC_acc_cred(resultSet.getObject("C_ACC_CRED", String.class)); - object.setRbanknam1(resultSet.getObject("RBANKNAM1", String.class)); - object.setRbanknam2(resultSet.getObject("RBANKNAM2", String.class)); - object.setRbanknam3(resultSet.getObject("RBANKNAM3", String.class)); - object.setRbanknam4(resultSet.getObject("RBANKNAM4", String.class)); - object.setRbanknam5(resultSet.getObject("RBANKNAM5", String.class)); - object.setPay_date(resultSet.getObject("PAY_DATE", String.class)); - object.setExt_date(resultSet.getObject("EXT_DATE", String.class)); - object.setPay_val(resultSet.getObject("PAY_VAL", String.class)); - object.setSum_deb(resultSet.getObject("SUM_DEB", String.class)); - object.setSclientn1(resultSet.getObject("SCLIENTN1", String.class)); - object.setSclientn2(resultSet.getObject("SCLIENTN2", String.class)); - object.setSclientn3(resultSet.getObject("SCLIENTN3", String.class)); - object.setSclientn4(resultSet.getObject("SCLIENTN4", String.class)); - object.setSc_code(resultSet.getObject("SC_CODE", String.class)); - object.setAcc_deb(resultSet.getObject("ACC_DEB", String.class)); - object.setRclientn1(resultSet.getObject("RCLIENTN1", String.class)); - object.setRclientn2(resultSet.getObject("RCLIENTN2", String.class)); - object.setRclientn3(resultSet.getObject("RCLIENTN3", String.class)); - object.setRclientn4(resultSet.getObject("RCLIENTN4", String.class)); - object.setAcc_kr_1(resultSet.getObject("ACC_KR_1", String.class)); - object.setAcc_kr_2(resultSet.getObject("ACC_KR_2", String.class)); - object.setSp_code(resultSet.getObject("SP_CODE", String.class)); - object.setSpecif_1(resultSet.getObject("SPECIF_1", String.class)); - object.setSpecif_2(resultSet.getObject("SPECIF_2", String.class)); - object.setSpecif_3(resultSet.getObject("SPECIF_3", String.class)); - object.setSpecif_4(resultSet.getObject("SPECIF_4", String.class)); - object.setSpecif_5(resultSet.getObject("SPECIF_5", String.class)); - object.setSpecif_6(resultSet.getObject("SPECIF_6", String.class)); - object.setSend_type(resultSet.getObject("SEND_TYPE", String.class)); - object.setServdate(resultSet.getObject("SERVDATE", String.class)); - object.setDoc_result(resultSet.getObject("DOC_RESULT", String.class)); + object.setOutDocument(resultSet.getObject("OUT_DOCUMENT", String.class)); + object.setInDocument(resultSet.getObject("IN_DOCUMENT", String.class)); + object.setDepoCode(resultSet.getObject("DEPO_CODE", String.class)); + object.setQuantity(resultSet.getObject("QUANTITY", String.class)); + object.setSecurityCode(resultSet.getObject("SECURITY_CODE", String.class)); + object.setClientName(resultSet.getObject("CLIENT_NAME", String.class)); + object.setResult(resultSet.getObject("RESULT", BigDecimal.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); - object.setPaymentInstructionId(resultSet.getObject("PAYMENT_INSTRUCTION_ID", Long.class)); return object; } @@ -98,54 +55,15 @@ public class SDf11MapStore extends TemplateMapStore { public Object[] objectToField(SDf11 object) { Object[] args = new Object[]{ object.getId(), - object.getSeg_type(), - object.getDoc_type(), - object.getDocnm_ref(), - object.getDocnmprev(), - object.getPriority(), - object.getSbankcode(), - object.getC_acc_deb(), - object.getSbanknam1(), - object.getSbanknam2(), - object.getSbanknam3(), - object.getSbanknam4(), - object.getSbanknam5(), - object.getRbankcode(), - object.getC_acc_cred(), - object.getRbanknam1(), - object.getRbanknam2(), - object.getRbanknam3(), - object.getRbanknam4(), - object.getRbanknam5(), - object.getPay_date(), - object.getExt_date(), - object.getPay_val(), - object.getSum_deb(), - object.getSclientn1(), - object.getSclientn2(), - object.getSclientn3(), - object.getSclientn4(), - object.getSc_code(), - object.getAcc_deb(), - object.getRclientn1(), - object.getRclientn2(), - object.getRclientn3(), - object.getRclientn4(), - object.getAcc_kr_1(), - object.getAcc_kr_2(), - object.getSp_code(), - object.getSpecif_1(), - object.getSpecif_2(), - object.getSpecif_3(), - object.getSpecif_4(), - object.getSpecif_5(), - object.getSpecif_6(), - object.getSend_type(), - object.getServdate(), - object.getDoc_result(), + object.getOutDocument(), + object.getInDocument(), + object.getDepoCode(), + object.getQuantity(), + object.getSecurityCode(), + object.getClientName(), + object.getResult(), TimeUtil.toDateFromInstant(object.getGenerationTime()), - object.getGenerationId(), - object.getPaymentInstructionId() + object.getGenerationId() }; return args; } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf12MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf12MapStore.java index 0fa7ad736..8a0d1ec01 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf12MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf12MapStore.java @@ -3,14 +3,15 @@ package ru.spcex.clearing.imdg.object; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; -import ru.clearing.classes.statics.data.sdf.SDf12; import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.clearing.classes.statics.data.sdf.SDf12; import ru.spcex.clearing.imdg.base.TemplateMapStore; import ru.spcex.platform.utils.time.TimeUtil; import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; +import java.util.*; @Component public class SDf12MapStore extends TemplateMapStore { @@ -32,7 +33,7 @@ public class SDf12MapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "ACCOUNT", "DEAL", "STATUS", "FILE_NAME", "GENERATION_TIME", "GENERATION_ID" + "ID", "OUT_DOCUMENT", "QUANTITY", "SECURITY_CODE", "DEPO_CODE_SENDER", "DEPO_CODE_ADRESSEE", "RESULT", "GENERATION_TIME", "GENERATION_ID" }; } @@ -40,10 +41,12 @@ public class SDf12MapStore extends TemplateMapStore { public SDf12 objectReader(ResultSet resultSet) throws SQLException { SDf12 object = new SDf12(); object.setId(resultSet.getObject("ID", Long.class)); - object.setAccount(resultSet.getObject("ACCOUNT", String.class)); - object.setDeal(resultSet.getObject("DEAL", String.class)); - object.setStatus(resultSet.getObject("STATUS", Long.class)); - object.setFileName(resultSet.getObject("FILE_NAME", String.class)); + object.setOutDocument(resultSet.getObject("OUT_DOCUMENT", String.class)); + object.setQuantity(resultSet.getObject("QUANTITY", String.class)); + object.setSecurityCode(resultSet.getObject("SECURITY_CODE", String.class)); + object.setDepoCodeSender(resultSet.getObject("DEPO_CODE_SENDER", String.class)); + object.setDepoCodeAdressee(resultSet.getObject("DEPO_CODE_ADRESSEE", String.class)); + object.setResult(resultSet.getObject("RESULT", BigDecimal.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); return object; @@ -53,10 +56,12 @@ public class SDf12MapStore extends TemplateMapStore { public Object[] objectToField(SDf12 object) { Object[] args = new Object[]{ object.getId(), - object.getAccount(), - object.getDeal(), - object.getStatus(), - object.getFileName(), + object.getOutDocument(), + object.getQuantity(), + object.getSecurityCode(), + object.getDepoCodeSender(), + object.getDepoCodeAdressee(), + object.getResult(), TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId() }; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf13MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf13MapStore.java index 01b9b80bf..a89719ba5 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf13MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf13MapStore.java @@ -7,6 +7,7 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.base.TemplateMapStore; import ru.spcex.platform.utils.time.TimeUtil; +import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; @@ -30,12 +31,7 @@ public class SDf13MapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "SEG_TYPE", "DOC_TYPE", "DOCNM_REF", "DOCNMPREV", "PRIORITY", "SBANKCODE", "C_ACC_DEB", "SBANKNAM1", - "SBANKNAM2", "SBANKNAM3", "SBANKNAM4", "SBANKNAM5", "RBANKCODE", "C_ACC_CRED", "RBANKNAM1", "OP_TYPE", - "OP_ORDER", "RBANKNAM4", "RBANKNAM5", "PAY_DATE", "EXT_DATE", "PAY_VAL", "SUM_DEB", "SCLIENTN1", "INN_DEB", - "KPP_DEB", "SCLIENTN4", "SC_CODE", "ACC_DEB", "RCLIENTN1", "INN_CRED", "KPP_CRED", "RCLIENTN4", "ACC_KR_1", - "ACC_KR_2", "SP_CODE", "SPECIF_1", "SPECIF_2", "SPECIF_3", "SPECIF_4", "SPECIF_5", "SPECIF_6", "SEND_TYPE", - "SERVDATE", "DOC_RESULT", "GENERATION_TIME", "GENERATION_ID" + "ID", "OUT_DOCUMENT", "IN_DOCUMENT", "RESULT", "TEXT_ERROR", "FILE_NAME", "GENERATION_TIME", "GENERATION_ID" }; } @@ -43,51 +39,11 @@ public class SDf13MapStore extends TemplateMapStore { public SDf13 objectReader(ResultSet resultSet) throws SQLException { SDf13 object = new SDf13(); object.setId(resultSet.getObject("ID", Long.class)); - object.setSeg_type(resultSet.getObject("SEG_TYPE", String.class)); - object.setDoc_type(resultSet.getObject("DOC_TYPE", String.class)); - object.setDocnm_ref(resultSet.getObject("DOCNM_REF", String.class)); - object.setDocnmprev(resultSet.getObject("DOCNMPREV", String.class)); - object.setPriority(resultSet.getObject("PRIORITY", String.class)); - object.setSbankcode(resultSet.getObject("SBANKCODE", String.class)); - object.setC_acc_deb(resultSet.getObject("C_ACC_DEB", String.class)); - object.setSbanknam1(resultSet.getObject("SBANKNAM1", String.class)); - object.setSbanknam2(resultSet.getObject("SBANKNAM2", String.class)); - object.setSbanknam3(resultSet.getObject("SBANKNAM3", String.class)); - object.setSbanknam4(resultSet.getObject("SBANKNAM4", String.class)); - object.setSbanknam5(resultSet.getObject("SBANKNAM5", String.class)); - object.setRbankcode(resultSet.getObject("RBANKCODE", String.class)); - object.setC_acc_cred(resultSet.getObject("C_ACC_CRED", String.class)); - object.setRbanknam1(resultSet.getObject("RBANKNAM1", String.class)); - object.setOp_type(resultSet.getObject("OP_TYPE", String.class)); - object.setOp_order(resultSet.getObject("OP_ORDER", String.class)); - object.setRbanknam4(resultSet.getObject("RBANKNAM4", String.class)); - object.setRbanknam5(resultSet.getObject("RBANKNAM5", String.class)); - object.setPay_date(resultSet.getObject("PAY_DATE", String.class)); - object.setExt_date(resultSet.getObject("EXT_DATE", String.class)); - object.setPay_val(resultSet.getObject("PAY_VAL", String.class)); - object.setSum_deb(resultSet.getObject("SUM_DEB", String.class)); - object.setSclientn1(resultSet.getObject("SCLIENTN1", String.class)); - object.setInn_deb(resultSet.getObject("INN_DEB", String.class)); - object.setKpp_deb(resultSet.getObject("KPP_DEB", String.class)); - object.setSclientn4(resultSet.getObject("SCLIENTN4", String.class)); - object.setSc_code(resultSet.getObject("SC_CODE", String.class)); - object.setAcc_deb(resultSet.getObject("ACC_DEB", String.class)); - object.setRclientn1(resultSet.getObject("RCLIENTN1", String.class)); - object.setInn_cred(resultSet.getObject("INN_CRED", String.class)); - object.setKpp_cred(resultSet.getObject("KPP_CRED", String.class)); - object.setRclientn4(resultSet.getObject("RCLIENTN4", String.class)); - object.setAcc_kr_1(resultSet.getObject("ACC_KR_1", String.class)); - object.setAcc_kr_2(resultSet.getObject("ACC_KR_2", String.class)); - object.setSp_code(resultSet.getObject("SP_CODE", String.class)); - object.setSpecif_1(resultSet.getObject("SPECIF_1", String.class)); - object.setSpecif_2(resultSet.getObject("SPECIF_2", String.class)); - object.setSpecif_3(resultSet.getObject("SPECIF_3", String.class)); - object.setSpecif_4(resultSet.getObject("SPECIF_4", String.class)); - object.setSpecif_5(resultSet.getObject("SPECIF_5", String.class)); - object.setSpecif_6(resultSet.getObject("SPECIF_6", String.class)); - object.setSend_type(resultSet.getObject("SEND_TYPE", String.class)); - object.setServdate(resultSet.getObject("SERVDATE", String.class)); - object.setDoc_result(resultSet.getObject("DOC_RESULT", String.class)); + object.setOutDocument(resultSet.getObject("OUT_DOCUMENT", String.class)); + object.setInDocument(resultSet.getObject("IN_DOCUMENT", String.class)); + object.setResult(resultSet.getObject("RESULT", BigDecimal.class)); + object.setTextError(resultSet.getObject("TEXT_ERROR", String.class)); + object.setFileName(resultSet.getObject("FILE_NAME", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); return object; @@ -97,51 +53,11 @@ public class SDf13MapStore extends TemplateMapStore { public Object[] objectToField(SDf13 object) { Object[] args = new Object[]{ object.getId(), - object.getSeg_type(), - object.getDoc_type(), - object.getDocnm_ref(), - object.getDocnmprev(), - object.getPriority(), - object.getSbankcode(), - object.getC_acc_deb(), - object.getSbanknam1(), - object.getSbanknam2(), - object.getSbanknam3(), - object.getSbanknam4(), - object.getSbanknam5(), - object.getRbankcode(), - object.getC_acc_cred(), - object.getRbanknam1(), - object.getOp_type(), - object.getOp_order(), - object.getRbanknam4(), - object.getRbanknam5(), - object.getPay_date(), - object.getExt_date(), - object.getPay_val(), - object.getSum_deb(), - object.getSclientn1(), - object.getInn_deb(), - object.getKpp_deb(), - object.getSclientn4(), - object.getSc_code(), - object.getAcc_deb(), - object.getRclientn1(), - object.getInn_cred(), - object.getKpp_cred(), - object.getRclientn4(), - object.getAcc_kr_1(), - object.getAcc_kr_2(), - object.getSp_code(), - object.getSpecif_1(), - object.getSpecif_2(), - object.getSpecif_3(), - object.getSpecif_4(), - object.getSpecif_5(), - object.getSpecif_6(), - object.getSend_type(), - object.getServdate(), - object.getDoc_result(), + object.getOutDocument(), + object.getInDocument(), + object.getResult(), + object.getTextError(), + object.getFileName(), TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId() }; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf14MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf14MapStore.java new file mode 100644 index 000000000..ab6c22e91 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf14MapStore.java @@ -0,0 +1,61 @@ +package ru.spcex.clearing.imdg.object; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.clearing.classes.statics.data.sdf.SDf14; +import ru.spcex.clearing.imdg.base.TemplateMapStore; +import ru.spcex.platform.utils.time.TimeUtil; + +import java.math.BigDecimal; +import java.sql.ResultSet; +import java.sql.SQLException; + +@Component +public class SDf14MapStore extends TemplateMapStore { + + public SDf14MapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_SDf14; + } + + @Override + public String getTableName() { + return "S_DF14"; + } + + @Override + public String[] getFields() { + return new String[]{ + "ID", "OUT_DOCUMENT", "RESULT", "GENERATION_TIME", "GENERATION_ID" + }; + } + + @Override + public SDf14 objectReader(ResultSet resultSet) throws SQLException { + SDf14 object = new SDf14(); + object.setId(resultSet.getObject("ID", Long.class)); + object.setOutDocument(resultSet.getObject("OUT_DOCUMENT", String.class)); + object.setResult(resultSet.getObject("RESULT", BigDecimal.class)); + object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); + object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); + return object; + } + + @Override + public Object[] objectToField(SDf14 object) { + Object[] args = new Object[]{ + object.getId(), + object.getOutDocument(), + object.getResult(), + TimeUtil.toDateFromInstant(object.getGenerationTime()), + object.getGenerationId() + }; + return args; + } + +} \ No newline at end of file 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 new file mode 100644 index 000000000..7ddf99571 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf20MapStore.java @@ -0,0 +1,78 @@ +package ru.spcex.clearing.imdg.object; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.clearing.classes.statics.data.sdf.SDf20; +import ru.spcex.clearing.imdg.base.TemplateMapStore; +import ru.spcex.platform.utils.time.TimeUtil; + +import java.sql.ResultSet; +import java.sql.SQLException; + +@Component +public class SDf20MapStore extends TemplateMapStore { + + public SDf20MapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_SDf20; + } + + @Override + public String getTableName() { + return "S_DF20"; + } + + @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" + }; + } + + @Override + public SDf20 objectReader(ResultSet resultSet) throws SQLException { + SDf20 object = new SDf20(); + object.setId(resultSet.getObject("ID", Long.class)); + object.setOutDocument(resultSet.getObject("OUT_DOCUMENT", String.class)); + object.setInDocument(resultSet.getObject("IN_DOCUMENT", String.class)); + object.setSecurity(resultSet.getObject("SECURITY", String.class)); + object.setOpenBalance(resultSet.getObject("OPEN_BALANCE", String.class)); + object.setDepoCodeCl(resultSet.getObject("DEPO_CODE_CL", String.class)); + object.setQuantity(resultSet.getObject("QUANTITY", String.class)); + object.setOperationCode(resultSet.getObject("OPERATION_CODE", String.class)); + object.setDepoCodeCorr(resultSet.getObject("DEPO_CODE_CORR", String.class)); + object.setOperationDate(resultSet.getObject("OPERATION_DATE", String.class)); + object.setCloseBalance(resultSet.getObject("CLOSE_BALANCE", String.class)); + object.setFileName(resultSet.getObject("FILE_NAME", String.class)); + object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); + object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); + return object; + } + + @Override + public Object[] objectToField(SDf20 object) { + Object[] args = new Object[]{ + object.getId(), + object.getOutDocument(), + object.getInDocument(), + object.getSecurity(), + object.getOpenBalance(), + object.getDepoCodeCl(), + object.getQuantity(), + object.getOperationCode(), + object.getDepoCodeCorr(), + object.getOperationDate(), + object.getCloseBalance(), + object.getFileName(), + TimeUtil.toDateFromInstant(object.getGenerationTime()), + object.getGenerationId() + }; + return args; + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf54MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf54MapStore.java new file mode 100644 index 000000000..d8ff3af72 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf54MapStore.java @@ -0,0 +1,137 @@ +package ru.spcex.clearing.imdg.object; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.clearing.classes.statics.data.sdf.SDf54; +import ru.spcex.clearing.imdg.base.TemplateMapStore; +import ru.spcex.platform.utils.time.TimeUtil; + +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.*; + +@Component +public class SDf54MapStore extends TemplateMapStore { + + public SDf54MapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_SDf54; + } + + @Override + public String getTableName() { + return "S_DF54"; + } + + @Override + public String[] getFields() { + return new String[]{ + "ID", "SEG_TYPE", "DOC_TYPE", "DOCNM_REF", "DOCNMPREV", "SBANKCODE", "C_ACC_DEB", "SBANKNAM1", "SBANKNAM2", "SBANKNAM3", "SBANKNAM4", "SBANKNAM5", "RBANKCODE", "C_ACC_CRED", "RBANKNAM1", "RBANKNAM2", "RBANKNAM3", "RBANKNAM4", "RBANKNAM5", "OP_TYPE", "OP_ORDER", "PAY_DATE", "PAY_VAL", "SUM_DEB", "SCLIENTN1", "SCLIENTN2", "SCLIENTN3", "SCLIENTN4", "INN_DEB", "KPP_DEB", "ACC_DEB", "RCLIENTN1", "RCLIENTN2", "RCLIENTN3", "RCLIENTN4", "INN_CRED", "KPP_CRED", "ACC_KR_1", "SPECIF_1", "SEND_TYPE", "DOC_RESULT", "GENERATION_TIME", "GENERATION_ID" + }; + } + + @Override + public SDf54 objectReader(ResultSet resultSet) throws SQLException { + SDf54 object = new SDf54(); + object.setId(resultSet.getObject("ID", Long.class)); + object.setSeg_type(resultSet.getObject("SEG_TYPE", String.class)); + object.setDoc_type(resultSet.getObject("DOC_TYPE", String.class)); + object.setDocnm_ref(resultSet.getObject("DOCNM_REF", String.class)); + object.setDocnmprev(resultSet.getObject("DOCNMPREV", String.class)); + object.setSbankcode(resultSet.getObject("SBANKCODE", String.class)); + object.setC_acc_deb(resultSet.getObject("C_ACC_DEB", String.class)); + object.setSbanknam1(resultSet.getObject("SBANKNAM1", String.class)); + object.setSbanknam2(resultSet.getObject("SBANKNAM2", String.class)); + object.setSbanknam3(resultSet.getObject("SBANKNAM3", String.class)); + object.setSbanknam4(resultSet.getObject("SBANKNAM4", String.class)); + object.setSbanknam5(resultSet.getObject("SBANKNAM5", String.class)); + object.setRbankcode(resultSet.getObject("RBANKCODE", String.class)); + object.setC_acc_cred(resultSet.getObject("C_ACC_CRED", String.class)); + object.setRbanknam1(resultSet.getObject("RBANKNAM1", String.class)); + object.setRbanknam2(resultSet.getObject("RBANKNAM2", String.class)); + object.setRbanknam3(resultSet.getObject("RBANKNAM3", String.class)); + object.setRbanknam4(resultSet.getObject("RBANKNAM4", String.class)); + object.setRbanknam5(resultSet.getObject("RBANKNAM5", String.class)); + object.setOp_type(resultSet.getObject("OP_TYPE", String.class)); + object.setOp_order(resultSet.getObject("OP_ORDER", String.class)); + object.setPay_date(resultSet.getObject("PAY_DATE", String.class)); + object.setPay_val(resultSet.getObject("PAY_VAL", String.class)); + object.setSum_deb(resultSet.getObject("SUM_DEB", String.class)); + object.setSclientn1(resultSet.getObject("SCLIENTN1", String.class)); + object.setSclientn2(resultSet.getObject("SCLIENTN2", String.class)); + object.setSclientn3(resultSet.getObject("SCLIENTN3", String.class)); + object.setSclientn4(resultSet.getObject("SCLIENTN4", String.class)); + object.setInn_deb(resultSet.getObject("INN_DEB", String.class)); + object.setKpp_deb(resultSet.getObject("KPP_DEB", String.class)); + object.setAcc_deb(resultSet.getObject("ACC_DEB", String.class)); + object.setRclientn1(resultSet.getObject("RCLIENTN1", String.class)); + object.setRclientn2(resultSet.getObject("RCLIENTN2", String.class)); + object.setRclientn3(resultSet.getObject("RCLIENTN3", String.class)); + object.setRclientn4(resultSet.getObject("RCLIENTN4", String.class)); + object.setInn_cred(resultSet.getObject("INN_CRED", String.class)); + object.setKpp_cred(resultSet.getObject("KPP_CRED", String.class)); + object.setAcc_kr_1(resultSet.getObject("ACC_KR_1", String.class)); + object.setSpecif_1(resultSet.getObject("SPECIF_1", String.class)); + object.setSend_type(resultSet.getObject("SEND_TYPE", String.class)); + object.setDoc_result(resultSet.getObject("DOC_RESULT", String.class)); + object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); + object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); + return object; + } + + @Override + public Object[] objectToField(SDf54 object) { + Object[] args = new Object[]{ + object.getId(), + object.getSeg_type(), + object.getDoc_type(), + object.getDocnm_ref(), + object.getDocnmprev(), + object.getSbankcode(), + object.getC_acc_deb(), + object.getSbanknam1(), + object.getSbanknam2(), + object.getSbanknam3(), + object.getSbanknam4(), + object.getSbanknam5(), + object.getRbankcode(), + object.getC_acc_cred(), + object.getRbanknam1(), + object.getRbanknam2(), + object.getRbanknam3(), + object.getRbanknam4(), + object.getRbanknam5(), + object.getOp_type(), + object.getOp_order(), + object.getPay_date(), + object.getPay_val(), + object.getSum_deb(), + object.getSclientn1(), + object.getSclientn2(), + object.getSclientn3(), + object.getSclientn4(), + object.getInn_deb(), + object.getKpp_deb(), + object.getAcc_deb(), + object.getRclientn1(), + object.getRclientn2(), + object.getRclientn3(), + object.getRclientn4(), + object.getInn_cred(), + object.getKpp_cred(), + object.getAcc_kr_1(), + object.getSpecif_1(), + object.getSend_type(), + object.getDoc_result(), + TimeUtil.toDateFromInstant(object.getGenerationTime()), + object.getGenerationId() + }; + return args; + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf55MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf55MapStore.java new file mode 100644 index 000000000..40efb1f1f --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf55MapStore.java @@ -0,0 +1,138 @@ +package ru.spcex.clearing.imdg.object; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.sdf.SDf55; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.imdg.base.TemplateMapStore; +import ru.spcex.platform.utils.time.TimeUtil; + +import java.sql.ResultSet; +import java.sql.SQLException; + +@Component +public class SDf55MapStore extends TemplateMapStore { + + public SDf55MapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_SDf55; + } + + @Override + public String getTableName() { + return "S_DF55"; + } + + @Override + public String[] getFields() { + return new String[]{ + "ID", "SEG_TYPE", "DOC_TYPE", "DOCNM_REF", "DOCNMPREV", "SBANKCODE", "C_ACC_DEB", "SBANKNAM1", "SBANKNAM2", "SBANKNAM3", "SBANKNAM4", "SBANKNAM5", "RBANKCODE", "C_ACC_CRED", "RBANKNAM1", "RBANKNAM2", "RBANKNAM3", "RBANKNAM4", "RBANKNAM5", "OP_TYPE", "OP_ORDER", "PAY_DATE", "PAY_VAL", "SUM_DEB", "SCLIENTN1", "SCLIENTN2", "SCLIENTN3", "SCLIENTN4", "INN_DEB", "KPP_DEB", "ACC_DEB", "RCLIENTN1", "RCLIENTN2", "RCLIENTN3", "RCLIENTN4", "INN_CRED", "KPP_CRED", "ACC_KR_1", "SPECIF_1", "SEND_TYPE", "DOC_RESULT", "FILE_NAME", "GENERATION_TIME", "GENERATION_ID" + }; + } + + @Override + public SDf55 objectReader(ResultSet resultSet) throws SQLException { + SDf55 object = new SDf55(); + object.setId(resultSet.getObject("ID", Long.class)); + object.setSeg_type(resultSet.getObject("SEG_TYPE", String.class)); + object.setDoc_type(resultSet.getObject("DOC_TYPE", String.class)); + object.setDocnm_ref(resultSet.getObject("DOCNM_REF", String.class)); + object.setDocnmprev(resultSet.getObject("DOCNMPREV", String.class)); + object.setSbankcode(resultSet.getObject("SBANKCODE", String.class)); + object.setC_acc_deb(resultSet.getObject("C_ACC_DEB", String.class)); + object.setSbanknam1(resultSet.getObject("SBANKNAM1", String.class)); + object.setSbanknam2(resultSet.getObject("SBANKNAM2", String.class)); + object.setSbanknam3(resultSet.getObject("SBANKNAM3", String.class)); + object.setSbanknam4(resultSet.getObject("SBANKNAM4", String.class)); + object.setSbanknam5(resultSet.getObject("SBANKNAM5", String.class)); + object.setRbankcode(resultSet.getObject("RBANKCODE", String.class)); + object.setC_acc_cred(resultSet.getObject("C_ACC_CRED", String.class)); + object.setRbanknam1(resultSet.getObject("RBANKNAM1", String.class)); + object.setRbanknam2(resultSet.getObject("RBANKNAM2", String.class)); + object.setRbanknam3(resultSet.getObject("RBANKNAM3", String.class)); + object.setRbanknam4(resultSet.getObject("RBANKNAM4", String.class)); + object.setRbanknam5(resultSet.getObject("RBANKNAM5", String.class)); + object.setOp_type(resultSet.getObject("OP_TYPE", String.class)); + object.setOp_order(resultSet.getObject("OP_ORDER", String.class)); + object.setPay_date(resultSet.getObject("PAY_DATE", String.class)); + object.setPay_val(resultSet.getObject("PAY_VAL", String.class)); + object.setSum_deb(resultSet.getObject("SUM_DEB", String.class)); + object.setSclientn1(resultSet.getObject("SCLIENTN1", String.class)); + object.setSclientn2(resultSet.getObject("SCLIENTN2", String.class)); + object.setSclientn3(resultSet.getObject("SCLIENTN3", String.class)); + object.setSclientn4(resultSet.getObject("SCLIENTN4", String.class)); + object.setInn_deb(resultSet.getObject("INN_DEB", String.class)); + object.setKpp_deb(resultSet.getObject("KPP_DEB", String.class)); + object.setAcc_deb(resultSet.getObject("ACC_DEB", String.class)); + object.setRclientn1(resultSet.getObject("RCLIENTN1", String.class)); + object.setRclientn2(resultSet.getObject("RCLIENTN2", String.class)); + object.setRclientn3(resultSet.getObject("RCLIENTN3", String.class)); + object.setRclientn4(resultSet.getObject("RCLIENTN4", String.class)); + object.setInn_cred(resultSet.getObject("INN_CRED", String.class)); + object.setKpp_cred(resultSet.getObject("KPP_CRED", String.class)); + object.setAcc_kr_1(resultSet.getObject("ACC_KR_1", String.class)); + object.setSpecif_1(resultSet.getObject("SPECIF_1", String.class)); + object.setSend_type(resultSet.getObject("SEND_TYPE", String.class)); + object.setDoc_result(resultSet.getObject("DOC_RESULT", String.class)); + object.setFileName(resultSet.getObject("FILE_NAME", String.class)); + object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); + object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); + return object; + } + + @Override + public Object[] objectToField(SDf55 object) { + Object[] args = new Object[]{ + object.getId(), + object.getSeg_type(), + object.getDoc_type(), + object.getDocnm_ref(), + object.getDocnmprev(), + object.getSbankcode(), + object.getC_acc_deb(), + object.getSbanknam1(), + object.getSbanknam2(), + object.getSbanknam3(), + object.getSbanknam4(), + object.getSbanknam5(), + object.getRbankcode(), + object.getC_acc_cred(), + object.getRbanknam1(), + object.getRbanknam2(), + object.getRbanknam3(), + object.getRbanknam4(), + object.getRbanknam5(), + object.getOp_type(), + object.getOp_order(), + object.getPay_date(), + object.getPay_val(), + object.getSum_deb(), + object.getSclientn1(), + object.getSclientn2(), + object.getSclientn3(), + object.getSclientn4(), + object.getInn_deb(), + object.getKpp_deb(), + object.getAcc_deb(), + object.getRclientn1(), + object.getRclientn2(), + object.getRclientn3(), + object.getRclientn4(), + object.getInn_cred(), + object.getKpp_cred(), + object.getAcc_kr_1(), + object.getSpecif_1(), + object.getSend_type(), + object.getDoc_result(), + object.getFileName(), + TimeUtil.toDateFromInstant(object.getGenerationTime()), + object.getGenerationId() + }; + return args; + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf56MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf56MapStore.java new file mode 100644 index 000000000..0de660d05 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf56MapStore.java @@ -0,0 +1,66 @@ +package ru.spcex.clearing.imdg.object; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.sdf.SDf56; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.imdg.base.TemplateMapStore; +import ru.spcex.platform.utils.time.TimeUtil; + +import java.sql.ResultSet; +import java.sql.SQLException; + +@Component +public class SDf56MapStore extends TemplateMapStore { + + public SDf56MapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_SDf56; + } + + @Override + public String getTableName() { + return "S_DF56"; + } + + @Override + public String[] getFields() { + return new String[]{ + "ID", "NUMBER", "START_DATETIME", "END_DATETIME", "ACCOUNT", "DEAL", "GENERATION_TIME", "GENERATION_ID" + }; + } + + @Override + public SDf56 objectReader(ResultSet resultSet) throws SQLException { + SDf56 object = new SDf56(); + object.setId(resultSet.getObject("ID", Long.class)); + object.setNumber(resultSet.getObject("NUMBER", String.class)); + object.setStart_datetime(resultSet.getObject("START_DATETIME", String.class)); + object.setEnd_datetime(resultSet.getObject("END_DATETIME", String.class)); + object.setAccount(resultSet.getObject("ACCOUNT", String.class)); + object.setDeal(resultSet.getObject("DEAL", String.class)); + object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); + object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); + return object; + } + + @Override + public Object[] objectToField(SDf56 object) { + Object[] args = new Object[]{ + object.getId(), + object.getNumber(), + object.getStart_datetime(), + object.getEnd_datetime(), + object.getAccount(), + object.getDeal(), + TimeUtil.toDateFromInstant(object.getGenerationTime()), + object.getGenerationId() + }; + return args; + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf57MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf57MapStore.java new file mode 100644 index 000000000..8abdf9498 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf57MapStore.java @@ -0,0 +1,132 @@ +package ru.spcex.clearing.imdg.object; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.sdf.SDf57; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.imdg.base.TemplateMapStore; +import ru.spcex.platform.utils.time.TimeUtil; + +import java.sql.ResultSet; +import java.sql.SQLException; + +@Component +public class SDf57MapStore extends TemplateMapStore { + + public SDf57MapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_SDf57; + } + + @Override + public String getTableName() { + return "S_DF57"; + } + + @Override + public String[] getFields() { + return new String[]{ + "ID", "DBF_ID", "DEAL_DEB", "DEAL_CRED", "SBANKCODE", "C_ACC_DEB", "SBANKNAM1", "SBANKNAM2", "SBANKNAM3", "SBANKNAM4", "SBANKNAM5", "RBANKCODE", "C_ACC_CRED", "RBANKNAM1", "RBANKNAM2", "RBANKNAM3", "RBANKNAM4", "RBANKNAM5", "OP_TYPE", "PAY_DATE", "EXT_DATE", "PAY_VAL", "SUM_DEB", "SCLIENTN1", "SCLIENTN2", "SCLIENTN3", "SCLIENTN4", "INN_DEB", "KPP_DEB", "ACC_DEB", "RCLIENTN1", "RCLIENTN2", "RCLIENTN3", "RCLIENTN4", "INN_CRED", "KPP_CRED", "ACC_KR", "SPECIF", "FILE_NAME", "GENERATION_TIME", "GENERATION_ID" + }; + } + + @Override + public SDf57 objectReader(ResultSet resultSet) throws SQLException { + SDf57 object = new SDf57(); + object.setId(resultSet.getObject("ID", Long.class)); + object.setDbfId(resultSet.getObject("DBF_ID", Long.class)); + object.setDeal_deb(resultSet.getObject("DEAL_DEB", String.class)); + object.setDeal_cred(resultSet.getObject("DEAL_CRED", String.class)); + object.setSbankcode(resultSet.getObject("SBANKCODE", String.class)); + object.setC_acc_deb(resultSet.getObject("C_ACC_DEB", String.class)); + object.setSbanknam1(resultSet.getObject("SBANKNAM1", String.class)); + object.setSbanknam2(resultSet.getObject("SBANKNAM2", String.class)); + object.setSbanknam3(resultSet.getObject("SBANKNAM3", String.class)); + object.setSbanknam4(resultSet.getObject("SBANKNAM4", String.class)); + object.setSbanknam5(resultSet.getObject("SBANKNAM5", String.class)); + object.setRbankcode(resultSet.getObject("RBANKCODE", String.class)); + object.setC_acc_cred(resultSet.getObject("C_ACC_CRED", String.class)); + object.setRbanknam1(resultSet.getObject("RBANKNAM1", String.class)); + object.setRbanknam2(resultSet.getObject("RBANKNAM2", String.class)); + object.setRbanknam3(resultSet.getObject("RBANKNAM3", String.class)); + object.setRbanknam4(resultSet.getObject("RBANKNAM4", String.class)); + object.setRbanknam5(resultSet.getObject("RBANKNAM5", String.class)); + object.setOp_type(resultSet.getObject("OP_TYPE", String.class)); + object.setPay_date(resultSet.getObject("PAY_DATE", String.class)); + object.setExt_date(resultSet.getObject("EXT_DATE", String.class)); + object.setPay_val(resultSet.getObject("PAY_VAL", String.class)); + object.setSum_deb(resultSet.getObject("SUM_DEB", String.class)); + object.setSclientn1(resultSet.getObject("SCLIENTN1", String.class)); + object.setSclientn2(resultSet.getObject("SCLIENTN2", String.class)); + object.setSclientn3(resultSet.getObject("SCLIENTN3", String.class)); + object.setSclientn4(resultSet.getObject("SCLIENTN4", String.class)); + object.setInn_deb(resultSet.getObject("INN_DEB", String.class)); + object.setKpp_deb(resultSet.getObject("KPP_DEB", String.class)); + object.setAcc_deb(resultSet.getObject("ACC_DEB", String.class)); + object.setRclientn1(resultSet.getObject("RCLIENTN1", String.class)); + object.setRclientn2(resultSet.getObject("RCLIENTN2", String.class)); + object.setRclientn3(resultSet.getObject("RCLIENTN3", String.class)); + object.setRclientn4(resultSet.getObject("RCLIENTN4", String.class)); + object.setInn_cred(resultSet.getObject("INN_CRED", String.class)); + object.setKpp_cred(resultSet.getObject("KPP_CRED", String.class)); + object.setAcc_kr(resultSet.getObject("ACC_KR", String.class)); + object.setSpecif(resultSet.getObject("SPECIF", String.class)); + object.setFileName(resultSet.getObject("FILE_NAME", String.class)); + object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); + object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); + return object; + } + + @Override + public Object[] objectToField(SDf57 object) { + Object[] args = new Object[]{ + object.getId(), + object.getDbfId(), + object.getDeal_deb(), + object.getDeal_cred(), + object.getSbankcode(), + object.getC_acc_deb(), + object.getSbanknam1(), + object.getSbanknam2(), + object.getSbanknam3(), + object.getSbanknam4(), + object.getSbanknam5(), + object.getRbankcode(), + object.getC_acc_cred(), + object.getRbanknam1(), + object.getRbanknam2(), + object.getRbanknam3(), + object.getRbanknam4(), + object.getRbanknam5(), + object.getOp_type(), + object.getPay_date(), + object.getExt_date(), + object.getPay_val(), + object.getSum_deb(), + object.getSclientn1(), + object.getSclientn2(), + object.getSclientn3(), + object.getSclientn4(), + object.getInn_deb(), + object.getKpp_deb(), + object.getAcc_deb(), + object.getRclientn1(), + object.getRclientn2(), + object.getRclientn3(), + object.getRclientn4(), + object.getInn_cred(), + object.getKpp_cred(), + object.getAcc_kr(), + object.getSpecif(), + object.getFileName(), + TimeUtil.toDateFromInstant(object.getGenerationTime()), + object.getGenerationId() + }; + return args; + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/UpdateMapService.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/UpdateMapService.java index 43d66ee91..6b3590754 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/UpdateMapService.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/UpdateMapService.java @@ -54,6 +54,7 @@ public class UpdateMapService extends AbstractUpdateMapService { hazelcastServerInstance.getMap(IMDGDistributedNames.Map_CouponPeriod).addLocalEntryListener(this, Predicates.alwaysTrue(), true); hazelcastServerInstance.getMap(IMDGDistributedNames.Map_Listing).addLocalEntryListener(this, Predicates.alwaysTrue(), true); hazelcastServerInstance.getMap(IMDGDistributedNames.Map_Market).addLocalEntryListener(this, Predicates.alwaysTrue(), true); + hazelcastServerInstance.getMap(IMDGDistributedNames.Map_Notification).addLocalEntryListener(this, Predicates.alwaysTrue(), true); } @Override @@ -155,6 +156,11 @@ public class UpdateMapService extends AbstractUpdateMapService { createBusinessEvent(couponPeriodHistory, eventType); couponPeriodHistory.setObject((CouponPeriod) value); hazelcastServerInstance.getMap(IMDGDistributedNames.Map_CouponPeriodHistory).put(couponPeriodHistory.getId(), couponPeriodHistory); + } else if (value instanceof Notification) { + NotificationHistory notificationHistory = new NotificationHistory(); + createBusinessEvent(notificationHistory, eventType); + notificationHistory.setObject((Notification) value); + hazelcastServerInstance.getMap(IMDGDistributedNames.Map_NotificationHistory).put(notificationHistory.getId(), notificationHistory); } else if (value instanceof Security) { // Существуют наследники этой таблицы, по этому в последнюю очередь делать эту проверку. diff --git a/clearing-parent/imdg/src/test/java/ru/spcex/clearing/imdg/structure/RunnableMapNamesForTesting.java b/clearing-parent/imdg/src/test/java/ru/spcex/clearing/imdg/structure/RunnableMapNamesForTesting.java index 7a261636b..11c92a279 100644 --- a/clearing-parent/imdg/src/test/java/ru/spcex/clearing/imdg/structure/RunnableMapNamesForTesting.java +++ b/clearing-parent/imdg/src/test/java/ru/spcex/clearing/imdg/structure/RunnableMapNamesForTesting.java @@ -15,6 +15,7 @@ import ru.clearing.classes.statics.data.journal.ManagementJournal; import ru.clearing.classes.statics.data.journal.OutDocumentJournal; import ru.clearing.classes.statics.data.messages.ErrorText; import ru.clearing.classes.statics.data.misc.*; +import ru.clearing.classes.statics.data.payment.Operation; import ru.clearing.classes.statics.data.payment.PaymentInstruction; import ru.clearing.classes.statics.data.profile.Contact; import ru.clearing.classes.statics.data.profile.ProfileDocument; @@ -90,6 +91,7 @@ public class RunnableMapNamesForTesting { "object.lotSize") /*new SettingOperation("object.lotSize", new Object[]{new BigDecimal("850.640000000000000000")}),*/)); checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_MarketHistory, MarketHistory.class)); + checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_NotificationHistory, NotificationHistory.class)); checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_CompanySymbolsHistory, CompanySymbolsHistory.class)); checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_ProfileDocumentHistory, ProfileDocumentHistory.class)); checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_ClearingMemberCategoryHistory, ClearingMemberCategoryHistory.class)); @@ -308,9 +310,11 @@ public class RunnableMapNamesForTesting { )//, //new SettingOperation("setNominalValue", new Class[]{BigDecimal.class}, new Object[]{new BigDecimal("25.25")}) )); + checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_MarketDataLiquidation, MarketDataLiquidation.class)); checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_Notification, Notification.class)); checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_OutDocumentJournal, OutDocumentJournal.class, new SettingOperation("setAmount", new Class[]{BigDecimal.class}, new Object[]{new BigDecimal("28.28")}))); + checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_Operation, Operation.class)); checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_PaymentInstruction, PaymentInstruction.class)); checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_PlannerAllToday, PlannerAllToday.class)); checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_ProfileDocument, ProfileDocument.class)); @@ -322,12 +326,16 @@ public class RunnableMapNamesForTesting { checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_SDf03, SDf03.class)); checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_SDf04, SDf04.class)); checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_SDf05, SDf05.class)); + checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_SDf06, SDf06.class)); + checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_SDf07, SDf07.class)); checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_SDf08, SDf08.class)); checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_SDf09, SDf09.class)); checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_SDf10, SDf10.class)); checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_SDf11, SDf11.class)); checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_SDf12, SDf12.class)); checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_SDf13, SDf13.class)); + checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_SDf14, SDf14.class)); + checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_SDf20, SDf20.class)); checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_Session, Session.class)); checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_STrades, STrades.class, new SettingOperation("setQty", new Class[]{BigDecimal.class}, new Object[]{generatingRandomBigDecimal(2)}), @@ -352,7 +360,10 @@ public class RunnableMapNamesForTesting { checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_SDf51, SDf51.class)); checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_SDf52, SDf52.class)); checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_SDf53, SDf53.class)); - //todo other... + checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_SDf54, SDf54.class)); + checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_SDf55, SDf55.class)); + checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_SDf56, SDf56.class)); + checkerBusinessMapStores.add(new CheckerBusinessMapStore<>(IMDGDistributedNames.Map_SDf57, SDf57.class)); } } diff --git a/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java b/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java index 2d027ab6c..176213160 100644 --- a/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java +++ b/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java @@ -34,6 +34,7 @@ public final class IMDGDistributedNames { public static final String Map_Statement = "Map_Statement"; public static final String Map_MarketAccess = "Map_MarketAccess"; // todo unused? public static final String Map_MarketTypeDictionary = "Map_MarketTypeDictionary"; + public static final String Map_MarketDataLiquidation = "Map_MarketDataLiquidation"; public static final String Map_UserConnect = "Map_UserConnect"; public static final String Map_UserConnectHistory = "Map_UserConnectHistory"; public static final String Map_User = "Map_User"; @@ -51,21 +52,29 @@ public final class IMDGDistributedNames { public static final String Map_SDf03 = "Map_SDf03"; public static final String Map_SDf04 = "Map_SDf04"; public static final String Map_SDf05 = "Map_SDf05"; + public static final String Map_SDf06 = "Map_SDf06"; + public static final String Map_SDf07 = "Map_SDf07"; + public static final String Map_SDf08 = "Map_SDf08"; + public static final String Map_SDf09 = "Map_SDf09"; public static final String Map_SDf10 = "Map_SDf10"; public static final String Map_SDf11 = "Map_SDf11"; + public static final String Map_SDf12 = "Map_SDf12"; public static final String Map_SDf13 = "Map_SDf13"; + public static final String Map_SDf14 = "Map_SDf14"; @Deprecated public static final String Map_SDf17 = "Map_SDf17"; @Deprecated public static final String Map_SDf16 = "Map_SDf16"; - public static final String Map_SDf08 = "Map_SDf08"; - public static final String Map_SDf09 = "Map_SDf09"; - public static final String Map_SDf12 = "Map_SDf12"; @Deprecated public static final String Map_SDf18 = "Map_SDf18"; + public static final String Map_SDf20 = "Map_SDf20"; public static final String Map_SDf51 = "Map_sDf51"; public static final String Map_SDf52 = "Map_sDf52"; public static final String Map_SDf53 = "Map_sDf53"; + public static final String Map_SDf54 = "Map_sDf54"; + public static final String Map_SDf55 = "Map_sDf55"; + public static final String Map_SDf56 = "Map_sDf56"; + public static final String Map_SDf57 = "Map_sDf57"; public static final String Map_AllowedDictionary = "Map_AllowedDictionary"; public static final String Map_ClearingCategoryDictionary = "Map_ClearingCategoryDictionary"; public static final String Map_CompanyRoleDictionary = "Map_CompanyRoleDictionary"; @@ -90,6 +99,7 @@ public final class IMDGDistributedNames { public static final String Map_ManagementJournalStatusDictionary = "Map_ManagementJournalStatusDictionary"; public static final String Map_ManagementJournalTypeDictionary = "Map_ManagementJournalTypeDictionary"; public static final String Map_MoneyFlowSideDictionary = "Map_MoneyFlowSideDictionary"; + public static final String Map_Operation = "Map_Operation"; public static final String Map_OperationStatusDictionary = "Map_OperationStatusDictionary"; public static final String Map_OperationTypeDictionary = "Map_OperationTypeDictionary"; public static final String Map_ResultStatusDictionary = "Map_ResultStatusDictionary"; @@ -117,6 +127,7 @@ public final class IMDGDistributedNames { public static final String Map_Session = "Map_Session"; public static final String Map_SessionHistory = "Map_SessionHistory"; public static final String Map_Notification = "Map_Notification"; + public static final String Map_NotificationHistory = "Map_NotificationHistory"; @Deprecated public static final String Map_LiabilitiesClaimsAssets = "Map_LiabilitiesClaimsAssets"; @Deprecated