treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://jira.mfd.msk:8088/browse/CLS-875 xml-importer DBF string splitting bug fixed

Browse source 
(cherry picked from commit 564de467ad)
This commit is contained in:
Ivan Nikolaev-Axenov 2025-06-25 12:05:56 +03:00 • committed by etreschenkov
parent ba5ad03fa5
commit 855fe48403
9 changed files with 239 additions and 531 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/sdf/objects/DF01ObjectTag.java
View file

@ -14,7 +14,7 @@ public class DF01ObjectTag extends ObjectTag<SDf01> {
private static final ETable PREFIX = ETable.DF_01;
private static final Class<SDf01> CLAZZ = SDf01.class;
private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf01;
private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yy");
private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("dd.MM.yy");
public DF01ObjectTag() {
super(PREFIX, CLAZZ, NAME_OF_HZ_MAP);
@ -66,7 +66,7 @@ public class DF01ObjectTag extends ObjectTag<SDf01> {
result.setRemainder(this.getRemainder());
result.setDeal(this.getDeal());
result.setAcc_code(this.getAccCode());
result.setDat(this.getDat() == null ? null : this.getDat().format(formatter));
result.setDat(this.getDat() == null ? null : this.getDat().format(FORMATTER));
result.setMarket(this.getMarket());
result.setAcc_name(this.getAccName());
result.setAcc_type(this.getAccType());

137
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/sdf/objects/DF04ObjectTag.java
View file

@ -5,6 +5,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import java.time.Instant;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Objects;
import ru.clearing.classes.statics.data.sdf.SDf04;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
@ -14,7 +15,7 @@ public class DF04ObjectTag extends ObjectTag<SDf04> {
private static final ETable PREFIX = ETable.DF_04;
private static final Class<SDf04> CLAZZ = SDf04.class;
private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf04;
private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yy");
private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("dd.MM.yy");
public DF04ObjectTag() {
super(PREFIX, CLAZZ, NAME_OF_HZ_MAP);
@ -36,21 +37,13 @@ public class DF04ObjectTag extends ObjectTag<SDf04> {
private String cAccDeb;
@JacksonXmlProperty(isAttribute = true, localName = "SBANKNAM")
private String sbanknam1;
private String sbanknam2;
private String sbanknam3;
private String sbanknam4;
private String sbanknam5;
private String sbanknam;
@JacksonXmlProperty(isAttribute = true, localName = "C_ACC_CRED")
private String cAccCred;
@JacksonXmlProperty(isAttribute = true, localName = "RBANKNAM")
private String rbanknam1;
private String rbanknam2;
private String rbanknam3;
private String rbanknam4;
private String rbanknam5;
private String rbanknam;
@JacksonXmlProperty(isAttribute = true, localName = "PAY_DATE")
@JsonFormat(pattern = "yyyy-MM-dd")
@ -72,23 +65,26 @@ public class DF04ObjectTag extends ObjectTag<SDf04> {
public SDf04 getSDfEntity() {
SDf04 result = new SDf04();
List<String> sbanknamList = splitStringByNum(sbanknam, 35, 5);
List<String> rbanknamList = splitStringByNum(rbanknam, 35, 5);
result.setSeg_type(this.getSegType());
result.setDoc_type(this.getDocType());
result.setDocnm_ref(this.getDocnmRef());
result.setDocnmprev(this.getDocnmprev());
result.setC_acc_deb(this.getcAccDeb());
result.setSbanknam1(this.getSbanknam1());
result.setSbanknam2(this.getSbanknam1());
result.setSbanknam3(this.getSbanknam1());
result.setSbanknam4(this.getSbanknam1());
result.setSbanknam5(this.getSbanknam1());
result.setSbanknam1(sbanknamList.get(0));
result.setSbanknam2(sbanknamList.get(1));
result.setSbanknam3(sbanknamList.get(2));
result.setSbanknam4(sbanknamList.get(3));
result.setSbanknam5(sbanknamList.get(4));
result.setC_acc_cred(this.getcAccCred());
result.setRbanknam1(this.getRbanknam1());
result.setRbanknam2(this.getRbanknam1());
result.setRbanknam3(this.getRbanknam1());
result.setRbanknam4(this.getRbanknam1());
result.setRbanknam5(this.getRbanknam1());
result.setPay_date(this.getPayDate() == null ? null : this.getPayDate().format(formatter));
result.setRbanknam1(rbanknamList.get(0));
result.setRbanknam2(rbanknamList.get(1));
result.setRbanknam3(rbanknamList.get(2));
result.setRbanknam4(rbanknamList.get(3));
result.setRbanknam5(rbanknamList.get(4));
result.setPay_date(this.getPayDate() == null ? null : this.getPayDate().format(FORMATTER));
result.setPay_val(this.getPayVal());
result.setSum_deb(this.getSumDeb());
result.setSpecif_1(this.getSpecif1());
@ -140,44 +136,12 @@ public class DF04ObjectTag extends ObjectTag<SDf04> {
this.cAccDeb = cAccDeb;
}
public String getSbanknam1() {
return sbanknam1;
public String getSbanknam() {
return sbanknam;
}
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 void setSbanknam(String sbanknam) {
this.sbanknam = sbanknam;
}
public String getcAccCred() {
@ -188,44 +152,12 @@ public class DF04ObjectTag extends ObjectTag<SDf04> {
this.cAccCred = cAccCred;
}
public String getRbanknam1() {
return rbanknam1;
public String getRbanknam() {
return rbanknam;
}
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 void setRbanknam(String rbanknam) {
this.rbanknam = rbanknam;
}
public LocalDate getPayDate() {
@ -270,15 +202,14 @@ public class DF04ObjectTag extends ObjectTag<SDf04> {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
DF04ObjectTag that = (DF04ObjectTag) o;
return Objects.equals(segType, that.segType) && Objects.equals(docType, that.docType) && Objects.equals(docnmRef, that.docnmRef) && Objects.equals(docnmprev, that.docnmprev) && Objects.equals(cAccDeb, that.cAccDeb) && Objects.equals(sbanknam1, that.sbanknam1) && Objects.equals(sbanknam2, that.sbanknam2) && Objects.equals(sbanknam3, that.sbanknam3) && Objects.equals(sbanknam4, that.sbanknam4) && Objects.equals(sbanknam5, that.sbanknam5) && Objects.equals(cAccCred, that.cAccCred) && Objects.equals(rbanknam1, that.rbanknam1) && Objects.equals(rbanknam2, that.rbanknam2) && Objects.equals(rbanknam3, that.rbanknam3) && Objects.equals(rbanknam4, that.rbanknam4) && Objects.equals(rbanknam5, that.rbanknam5) && Objects.equals(payDate, that.payDate) && Objects.equals(payVal, that.payVal) && Objects.equals(sumDeb, that.sumDeb) && Objects.equals(specif1, that.specif1) && Objects.equals(impResult, that.impResult);
return Objects.equals(segType, that.segType) && Objects.equals(docType, that.docType) && Objects.equals(docnmRef, that.docnmRef) && Objects.equals(docnmprev, that.docnmprev) && Objects.equals(cAccDeb, that.cAccDeb) && Objects.equals(sbanknam, that.sbanknam) && Objects.equals(cAccCred, that.cAccCred) && Objects.equals(rbanknam, that.rbanknam) && Objects.equals(payDate, that.payDate) && Objects.equals(payVal, that.payVal) && Objects.equals(sumDeb, that.sumDeb) && Objects.equals(specif1, that.specif1) && Objects.equals(impResult, that.impResult);
}
@Override
public int hashCode() {
return Objects.hash(segType, docType, docnmRef, docnmprev, cAccDeb, sbanknam1, sbanknam2, sbanknam3, sbanknam4, sbanknam5, cAccCred, rbanknam1, rbanknam2, rbanknam3, rbanknam4, rbanknam5, payDate, payVal, sumDeb, specif1, impResult);
return Objects.hash(segType, docType, docnmRef, docnmprev, cAccDeb, sbanknam, cAccCred, rbanknam, payDate, payVal, sumDeb, specif1, impResult);
}
@Override
@ -289,17 +220,9 @@ public class DF04ObjectTag extends ObjectTag<SDf04> {
", docnmRef='" + docnmRef + '\'' +
", docnmprev='" + docnmprev + '\'' +
", cAccDeb='" + cAccDeb + '\'' +
", sbanknam1='" + sbanknam1 + '\'' +
", sbanknam2='" + sbanknam2 + '\'' +
", sbanknam3='" + sbanknam3 + '\'' +
", sbanknam4='" + sbanknam4 + '\'' +
", sbanknam5='" + sbanknam5 + '\'' +
", sbanknam='" + sbanknam + '\'' +
", cAccCred='" + cAccCred + '\'' +
", rbanknam1='" + rbanknam1 + '\'' +
", rbanknam2='" + rbanknam2 + '\'' +
", rbanknam3='" + rbanknam3 + '\'' +
", rbanknam4='" + rbanknam4 + '\'' +
", rbanknam5='" + rbanknam5 + '\'' +
", rbanknam='" + rbanknam + '\'' +
", payDate=" + payDate +
", payVal='" + payVal + '\'' +
", sumDeb='" + sumDeb + '\'' +

4
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/sdf/objects/DF06ObjectTag.java
View file

@ -15,7 +15,7 @@ public class DF06ObjectTag extends ObjectTag<SDf06> {
private static final ETable PREFIX = ETable.DF_06;
private static final Class<SDf06> CLAZZ = SDf06.class;
private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf06;
private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yy");
private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("dd.MM.yy");
public DF06ObjectTag() {
super(PREFIX, CLAZZ, NAME_OF_HZ_MAP);
@ -76,7 +76,7 @@ public class DF06ObjectTag extends ObjectTag<SDf06> {
result.setSpec(this.getSpec());
result.setNumber(this.getNumber());
result.setDoc_num(this.getDocNum());
result.setDoc_date(this.getDocDate() == null ? null : this.getDocDate().format(formatter));
result.setDoc_date(this.getDocDate() == null ? null : this.getDocDate().format(FORMATTER));
result.setPay_val(this.getPayVal());
result.setFileName(this.getFileName());
result.setGenerationTime(Instant.now());

4
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/sdf/objects/DF52ObjectTag.java
View file

@ -14,7 +14,7 @@ public class DF52ObjectTag extends ObjectTag<SDf52> {
private static final ETable PREFIX = ETable.DF_52;
private static final Class<SDf52> CLAZZ = SDf52.class;
private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf52;
private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yy");
private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("dd.MM.yy");
public DF52ObjectTag() {
super(PREFIX, CLAZZ, NAME_OF_HZ_MAP);
@ -46,7 +46,7 @@ public class DF52ObjectTag extends ObjectTag<SDf52> {
result.setAccount(this.getAccount());
result.setAcc_name(this.getAccName());
result.setDeal(this.getDeal());
result.setDate(this.getDate() == null ? null : this.getDate().format(formatter));
result.setDate(this.getDate() == null ? null : this.getDate().format(FORMATTER));
result.setAcc_type(this.getAccType());
result.setStatus(this.getStatus());
result.setFileName(this.getFileName());

243
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/sdf/objects/DF55ObjectTag.java
View file

@ -5,6 +5,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import java.time.Instant;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Objects;
import ru.clearing.classes.statics.data.sdf.SDf55;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
@ -14,7 +15,7 @@ public class DF55ObjectTag extends ObjectTag<SDf55> {
private static final ETable PREFIX = ETable.DF_55;
private static final Class<SDf55> CLAZZ = SDf55.class;
private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf55;
private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yy");
private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("dd.MM.yy");
public DF55ObjectTag() {
super(PREFIX, CLAZZ, NAME_OF_HZ_MAP);
@ -39,11 +40,7 @@ public class DF55ObjectTag extends ObjectTag<SDf55> {
private String cAccDeb;
@JacksonXmlProperty(isAttribute = true, localName = "SBANKNAM")
private String sbanknam1;
private String sbanknam2;
private String sbanknam3;
private String sbanknam4;
private String sbanknam5;
private String sbanknam;
@JacksonXmlProperty(isAttribute = true, localName = "RBANKCODE")
private String rbankcode;
@ -52,11 +49,7 @@ public class DF55ObjectTag extends ObjectTag<SDf55> {
private String cAccCred;
@JacksonXmlProperty(isAttribute = true, localName = "RBANKNAM")
private String rbanknam1;
private String rbanknam2;
private String rbanknam3;
private String rbanknam4;
private String rbanknam5;
private String rbanknam;
@JacksonXmlProperty(isAttribute = true, localName = "OP_TYPE")
private String opType;
@ -75,10 +68,7 @@ public class DF55ObjectTag extends ObjectTag<SDf55> {
private String sumDeb;
@JacksonXmlProperty(isAttribute = true, localName = "SCLIENTN")
private String sclientn1;
private String sclientn2;
private String sclientn3;
private String sclientn4;
private String sclientn;
@JacksonXmlProperty(isAttribute = true, localName = "INN_DEB")
private String innDeb;
@ -90,10 +80,7 @@ public class DF55ObjectTag extends ObjectTag<SDf55> {
private String accDeb;
@JacksonXmlProperty(isAttribute = true, localName = "RCLIENTN")
private String rclientn1;
private String rclientn2;
private String rclientn3;
private String rclientn4;
private String rclientn;
@JacksonXmlProperty(isAttribute = true, localName = "INN_CRED")
private String innCred;
@ -134,40 +121,45 @@ public class DF55ObjectTag extends ObjectTag<SDf55> {
public SDf55 getSDfEntity() {
SDf55 result = new SDf55();
List<String> sbanknamList = splitStringByNum(sbanknam, 35, 5);
List<String> rbanknamList = splitStringByNum(rbanknam, 35, 5);
List<String> sclientnList = splitStringByNum(sclientn, 35, 4);
List<String> rclientnList = splitStringByNum(rclientn, 35, 4);
result.setSeg_type(this.getSegType());
result.setDoc_type(this.getDocType());
result.setDocnm_ref(this.getDocnmRef());
result.setDocnmprev(this.getDocnmprev());
result.setSbankcode(this.getSbankcode());
result.setC_acc_deb(this.getcAccDeb());
result.setSbanknam1(this.getSbanknam1());
result.setSbanknam2(this.getSbanknam1());
result.setSbanknam3(this.getSbanknam1());
result.setSbanknam4(this.getSbanknam1());
result.setSbanknam5(this.getSbanknam1());
result.setSbanknam1(sbanknamList.get(0));
result.setSbanknam2(sbanknamList.get(1));
result.setSbanknam3(sbanknamList.get(2));
result.setSbanknam4(sbanknamList.get(3));
result.setSbanknam5(sbanknamList.get(4));
result.setRbankcode(this.getRbankcode());
result.setC_acc_cred(this.getcAccCred());
result.setRbanknam1(this.getRbanknam1());
result.setRbanknam2(this.getRbanknam1());
result.setRbanknam3(this.getRbanknam1());
result.setRbanknam4(this.getRbanknam1());
result.setRbanknam5(this.getRbanknam1());
result.setRbanknam1(rbanknamList.get(0));
result.setRbanknam2(rbanknamList.get(1));
result.setRbanknam3(rbanknamList.get(2));
result.setRbanknam4(rbanknamList.get(3));
result.setRbanknam5(rbanknamList.get(4));
result.setOp_type(this.getOpType());
result.setOp_order(this.getOpOrder());
result.setPay_date(this.getPayDate() == null ? null : this.getPayDate().format(formatter));
result.setPay_date(this.getPayDate() == null ? null : this.getPayDate().format(FORMATTER));
result.setPay_val(this.getPayVal());
result.setSum_deb(this.getSumDeb());
result.setSclientn1(this.getSclientn1());
result.setSclientn2(this.getSclientn1());
result.setSclientn3(this.getSclientn1());
result.setSclientn4(this.getSclientn1());
result.setSclientn1(sclientnList.get(0));
result.setSclientn2(sclientnList.get(1));
result.setSclientn3(sclientnList.get(2));
result.setSclientn4(sclientnList.get(3));
result.setInn_deb(this.getInnDeb());
result.setKpp_deb(this.getKppDeb());
result.setAcc_deb(this.getAccDeb());
result.setRclientn1(this.getRclientn1());
result.setRclientn2(this.getRclientn1());
result.setRclientn3(this.getRclientn1());
result.setRclientn4(this.getRclientn1());
result.setRclientn1(rclientnList.get(0));
result.setRclientn2(rclientnList.get(1));
result.setRclientn3(rclientnList.get(2));
result.setRclientn4(rclientnList.get(3));
result.setInn_cred(this.getInnCred());
result.setKpp_cred(this.getKppCred());
result.setAcc_kr_1(this.getAccKr1());
@ -175,8 +167,8 @@ public class DF55ObjectTag extends ObjectTag<SDf55> {
result.setSend_type(this.getSendType());
result.setDoc_result(this.getDocResult());
result.setDoc_num(this.getDocNum());
result.setDoc_date(this.getDocDate() == null ? null : this.getDocDate().format(formatter));
result.setValue_date(this.getValueDate() == null ? null : this.getValueDate().format(formatter));
result.setDoc_date(this.getDocDate() == null ? null : this.getDocDate().format(FORMATTER));
result.setValue_date(this.getValueDate() == null ? null : this.getValueDate().format(FORMATTER));
result.setSwift_ben(this.getSwiftBen());
result.setSwift_int(this.getSwiftInt());
result.setFileName(this.getFileName());
@ -234,44 +226,12 @@ public class DF55ObjectTag extends ObjectTag<SDf55> {
this.cAccDeb = cAccDeb;
}
public String getSbanknam1() {
return sbanknam1;
public String getSbanknam() {
return sbanknam;
}
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 void setSbanknam(String sbanknam) {
this.sbanknam = sbanknam;
}
public String getRbankcode() {
@ -290,44 +250,12 @@ public class DF55ObjectTag extends ObjectTag<SDf55> {
this.cAccCred = cAccCred;
}
public String getRbanknam1() {
return rbanknam1;
public String getRbanknam() {
return rbanknam;
}
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 void setRbanknam(String rbanknam) {
this.rbanknam = rbanknam;
}
public String getOpType() {
@ -370,36 +298,12 @@ public class DF55ObjectTag extends ObjectTag<SDf55> {
this.sumDeb = sumDeb;
}
public String getSclientn1() {
return sclientn1;
public String getSclientn() {
return sclientn;
}
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 void setSclientn(String sclientn) {
this.sclientn = sclientn;
}
public String getInnDeb() {
@ -426,36 +330,12 @@ public class DF55ObjectTag extends ObjectTag<SDf55> {
this.accDeb = accDeb;
}
public String getRclientn1() {
return rclientn1;
public String getRclientn() {
return rclientn;
}
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 void setRclientn(String rclientn) {
this.rclientn = rclientn;
}
public String getInnCred() {
@ -548,15 +428,14 @@ public class DF55ObjectTag extends ObjectTag<SDf55> {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
DF55ObjectTag that = (DF55ObjectTag) o;
return Objects.equals(segType, that.segType) && Objects.equals(docType, that.docType) && Objects.equals(docnmRef, that.docnmRef) && Objects.equals(docnmprev, that.docnmprev) && Objects.equals(sbankcode, that.sbankcode) && Objects.equals(cAccDeb, that.cAccDeb) && Objects.equals(sbanknam1, that.sbanknam1) && Objects.equals(sbanknam2, that.sbanknam2) && Objects.equals(sbanknam3, that.sbanknam3) && Objects.equals(sbanknam4, that.sbanknam4) && Objects.equals(sbanknam5, that.sbanknam5) && Objects.equals(rbankcode, that.rbankcode) && Objects.equals(cAccCred, that.cAccCred) && Objects.equals(rbanknam1, that.rbanknam1) && Objects.equals(rbanknam2, that.rbanknam2) && Objects.equals(rbanknam3, that.rbanknam3) && Objects.equals(rbanknam4, that.rbanknam4) && Objects.equals(rbanknam5, that.rbanknam5) && Objects.equals(opType, that.opType) && Objects.equals(opOrder, that.opOrder) && Objects.equals(payDate, that.payDate) && Objects.equals(payVal, that.payVal) && Objects.equals(sumDeb, that.sumDeb) && Objects.equals(sclientn1, that.sclientn1) && Objects.equals(sclientn2, that.sclientn2) && Objects.equals(sclientn3, that.sclientn3) && Objects.equals(sclientn4, that.sclientn4) && Objects.equals(innDeb, that.innDeb) && Objects.equals(kppDeb, that.kppDeb) && Objects.equals(accDeb, that.accDeb) && Objects.equals(rclientn1, that.rclientn1) && Objects.equals(rclientn2, that.rclientn2) && Objects.equals(rclientn3, that.rclientn3) && Objects.equals(rclientn4, that.rclientn4) && Objects.equals(innCred, that.innCred) && Objects.equals(kppCred, that.kppCred) && Objects.equals(accKr1, that.accKr1) && Objects.equals(specif1, that.specif1) && Objects.equals(sendType, that.sendType) && Objects.equals(docResult, that.docResult) && Objects.equals(docNum, that.docNum) && Objects.equals(docDate, that.docDate) && Objects.equals(valueDate, that.valueDate) && Objects.equals(swiftBen, that.swiftBen) && Objects.equals(swiftInt, that.swiftInt);
return Objects.equals(segType, that.segType) && Objects.equals(docType, that.docType) && Objects.equals(docnmRef, that.docnmRef) && Objects.equals(docnmprev, that.docnmprev) && Objects.equals(sbankcode, that.sbankcode) && Objects.equals(cAccDeb, that.cAccDeb) && Objects.equals(sbanknam, that.sbanknam) && Objects.equals(rbankcode, that.rbankcode) && Objects.equals(cAccCred, that.cAccCred) && Objects.equals(rbanknam, that.rbanknam) && Objects.equals(opType, that.opType) && Objects.equals(opOrder, that.opOrder) && Objects.equals(payDate, that.payDate) && Objects.equals(payVal, that.payVal) && Objects.equals(sumDeb, that.sumDeb) && Objects.equals(sclientn, that.sclientn) && Objects.equals(innDeb, that.innDeb) && Objects.equals(kppDeb, that.kppDeb) && Objects.equals(accDeb, that.accDeb) && Objects.equals(rclientn, that.rclientn) && Objects.equals(innCred, that.innCred) && Objects.equals(kppCred, that.kppCred) && Objects.equals(accKr1, that.accKr1) && Objects.equals(specif1, that.specif1) && Objects.equals(sendType, that.sendType) && Objects.equals(docResult, that.docResult) && Objects.equals(docNum, that.docNum) && Objects.equals(docDate, that.docDate) && Objects.equals(valueDate, that.valueDate) && Objects.equals(swiftBen, that.swiftBen) && Objects.equals(swiftInt, that.swiftInt);
}
@Override
public int hashCode() {
return Objects.hash(segType, docType, docnmRef, docnmprev, sbankcode, cAccDeb, sbanknam1, sbanknam2, sbanknam3, sbanknam4, sbanknam5, rbankcode, cAccCred, rbanknam1, rbanknam2, rbanknam3, rbanknam4, rbanknam5, opType, opOrder, payDate, payVal, sumDeb, sclientn1, sclientn2, sclientn3, sclientn4, innDeb, kppDeb, accDeb, rclientn1, rclientn2, rclientn3, rclientn4, innCred, kppCred, accKr1, specif1, sendType, docResult, docNum, docDate, valueDate, swiftBen, swiftInt);
return Objects.hash(segType, docType, docnmRef, docnmprev, sbankcode, cAccDeb, sbanknam, rbankcode, cAccCred, rbanknam, opType, opOrder, payDate, payVal, sumDeb, sclientn, innDeb, kppDeb, accDeb, rclientn, innCred, kppCred, accKr1, specif1, sendType, docResult, docNum, docDate, valueDate, swiftBen, swiftInt);
}
@Override
@ -568,34 +447,20 @@ public class DF55ObjectTag extends ObjectTag<SDf55> {
", docnmprev='" + docnmprev + '\'' +
", sbankcode='" + sbankcode + '\'' +
", cAccDeb='" + cAccDeb + '\'' +
", sbanknam1='" + sbanknam1 + '\'' +
", sbanknam2='" + sbanknam2 + '\'' +
", sbanknam3='" + sbanknam3 + '\'' +
", sbanknam4='" + sbanknam4 + '\'' +
", sbanknam5='" + sbanknam5 + '\'' +
", sbanknam='" + sbanknam + '\'' +
", rbankcode='" + rbankcode + '\'' +
", cAccCred='" + cAccCred + '\'' +
", rbanknam1='" + rbanknam1 + '\'' +
", rbanknam2='" + rbanknam2 + '\'' +
", rbanknam3='" + rbanknam3 + '\'' +
", rbanknam4='" + rbanknam4 + '\'' +
", rbanknam5='" + rbanknam5 + '\'' +
", rbanknam='" + rbanknam + '\'' +
", opType='" + opType + '\'' +
", opOrder='" + opOrder + '\'' +
", payDate=" + payDate +
", payVal='" + payVal + '\'' +
", sumDeb='" + sumDeb + '\'' +
", sclientn1='" + sclientn1 + '\'' +
", sclientn2='" + sclientn2 + '\'' +
", sclientn3='" + sclientn3 + '\'' +
", sclientn4='" + sclientn4 + '\'' +
", sclientn='" + sclientn + '\'' +
", innDeb='" + innDeb + '\'' +
", kppDeb='" + kppDeb + '\'' +
", accDeb='" + accDeb + '\'' +
", rclientn1='" + rclientn1 + '\'' +
", rclientn2='" + rclientn2 + '\'' +
", rclientn3='" + rclientn3 + '\'' +
", rclientn4='" + rclientn4 + '\'' +
", rclientn='" + rclientn + '\'' +
", innCred='" + innCred + '\'' +
", kppCred='" + kppCred + '\'' +
", accKr1='" + accKr1 + '\'' +

241
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/sdf/objects/DF57ObjectTag.java
View file

@ -6,6 +6,7 @@ import java.time.Instant;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import org.slf4j.Logger;
@ -19,7 +20,7 @@ public class DF57ObjectTag extends ObjectTag<SDf57> {
private static final ETable PREFIX = ETable.DF_57;
private static final Class<SDf57> CLAZZ = SDf57.class;
private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf57;
private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yy");
private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("dd.MM.yy");
public DF57ObjectTag() {
super(PREFIX, CLAZZ, NAME_OF_HZ_MAP);
@ -41,11 +42,7 @@ public class DF57ObjectTag extends ObjectTag<SDf57> {
private String cAccDeb;
@JacksonXmlProperty(isAttribute = true, localName = "SBANKNAM")
private String sbanknam1;
private String sbanknam2;
private String sbanknam3;
private String sbanknam4;
private String sbanknam5;
private String sbanknam;
@JacksonXmlProperty(isAttribute = true, localName = "RBANKCODE")
private String rbankcode;
@ -54,11 +51,7 @@ public class DF57ObjectTag extends ObjectTag<SDf57> {
private String cAccCred;
@JacksonXmlProperty(isAttribute = true, localName = "RBANKNAM")
private String rbanknam1;
private String rbanknam2;
private String rbanknam3;
private String rbanknam4;
private String rbanknam5;
private String rbanknam;
@JacksonXmlProperty(isAttribute = true, localName = "OP_TYPE")
private String opType;
@ -77,10 +70,7 @@ public class DF57ObjectTag extends ObjectTag<SDf57> {
private String sumDeb;
@JacksonXmlProperty(isAttribute = true, localName = "SCLIENTN")
private String sclientn1;
private String sclientn2;
private String sclientn3;
private String sclientn4;
private String sclientn;
@JacksonXmlProperty(isAttribute = true, localName = "INN_DEB")
private String innDeb;
@ -92,10 +82,7 @@ public class DF57ObjectTag extends ObjectTag<SDf57> {
private String accDeb;
@JacksonXmlProperty(isAttribute = true, localName = "RCLIENTN")
private String rclientn1;
private String rclientn2;
private String rclientn3;
private String rclientn4;
private String rclientn;
@JacksonXmlProperty(isAttribute = true, localName = "INN_CRED")
private String innCred;
@ -132,45 +119,50 @@ public class DF57ObjectTag extends ObjectTag<SDf57> {
public SDf57 getSDfEntity() {
SDf57 result = new SDf57();
List<String> sbanknamList = splitStringByNum(sbanknam, 35, 5);
List<String> rbanknamList = splitStringByNum(rbanknam, 35, 5);
List<String> sclientnList = splitStringByNum(sclientn, 35, 4);
List<String> rclientnList = splitStringByNum(rclientn, 35, 4);
result.setDbfId(this.getId());
result.setDeal_deb(this.getDealDeb());
result.setDeal_cred(this.getDealCred());
result.setSbankcode(this.getSbankcode());
result.setC_acc_deb(this.getcAccDeb());
result.setSbanknam1(this.getSbanknam1());
result.setSbanknam2(this.getSbanknam1());
result.setSbanknam3(this.getSbanknam1());
result.setSbanknam4(this.getSbanknam1());
result.setSbanknam5(this.getSbanknam1());
result.setSbanknam1(sbanknamList.get(0));
result.setSbanknam2(sbanknamList.get(1));
result.setSbanknam3(sbanknamList.get(2));
result.setSbanknam4(sbanknamList.get(3));
result.setSbanknam5(sbanknamList.get(4));
result.setRbankcode(this.getRbankcode());
result.setC_acc_cred(this.getcAccCred());
result.setRbanknam1(this.getRbanknam1());
result.setRbanknam2(this.getRbanknam1());
result.setRbanknam3(this.getRbanknam1());
result.setRbanknam4(this.getRbanknam1());
result.setRbanknam5(this.getRbanknam1());
result.setRbanknam1(rbanknamList.get(0));
result.setRbanknam2(rbanknamList.get(1));
result.setRbanknam3(rbanknamList.get(2));
result.setRbanknam4(rbanknamList.get(3));
result.setRbanknam5(rbanknamList.get(4));
result.setOp_type(this.getOpType());
result.setPay_date(this.getPayDate() == null ? null : this.getPayDate().format(formatter));
result.setPay_date(this.getPayDate() == null ? null : this.getPayDate().format(FORMATTER));
result.setExt_date(this.getExtDate() == null ? null : this.getExtDate().toString());
result.setPay_val(this.getPayVal());
result.setSum_deb(this.getSumDeb());
result.setSclientn1(this.getSclientn1());
result.setSclientn2(this.getSclientn1());
result.setSclientn3(this.getSclientn1());
result.setSclientn4(this.getSclientn1());
result.setSclientn1(sclientnList.get(0));
result.setSclientn2(sclientnList.get(1));
result.setSclientn3(sclientnList.get(2));
result.setSclientn4(sclientnList.get(3));
result.setInn_deb(this.getInnDeb());
result.setKpp_deb(this.getKppDeb());
result.setAcc_deb(this.getAccDeb());
result.setRclientn1(this.getRclientn1());
result.setRclientn2(this.getRclientn1());
result.setRclientn3(this.getRclientn1());
result.setRclientn4(this.getRclientn1());
result.setRclientn1(rclientnList.get(0));
result.setRclientn2(rclientnList.get(1));
result.setRclientn3(rclientnList.get(2));
result.setRclientn4(rclientnList.get(3));
result.setInn_cred(this.getInnCred());
result.setKpp_cred(this.getKppCred());
result.setAcc_kr(this.getAccKr());
result.setSpecif(this.getSpecif());
result.setDoc_num(this.getDocNum());
result.setDoc_date(this.getDocDate() == null ? null : this.getDocDate().format(formatter));
result.setDoc_date(this.getDocDate() == null ? null : this.getDocDate().format(FORMATTER));
result.setDt_in(this.getDtIn());
result.setKt_in(this.getKtIn());
result.setDt_out(this.getDtOut());
@ -234,44 +226,12 @@ public class DF57ObjectTag extends ObjectTag<SDf57> {
this.cAccDeb = cAccDeb;
}
public String getSbanknam1() {
return sbanknam1;
public String getSbanknam() {
return sbanknam;
}
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 void setSbanknam(String sbanknam) {
this.sbanknam = sbanknam;
}
public String getRbankcode() {
@ -290,44 +250,12 @@ public class DF57ObjectTag extends ObjectTag<SDf57> {
this.cAccCred = cAccCred;
}
public String getRbanknam1() {
return rbanknam1;
public String getRbanknam() {
return rbanknam;
}
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 void setRbanknam(String rbanknam) {
this.rbanknam = rbanknam;
}
public String getOpType() {
@ -370,36 +298,12 @@ public class DF57ObjectTag extends ObjectTag<SDf57> {
this.sumDeb = sumDeb;
}
public String getSclientn1() {
return sclientn1;
public String getSclientn() {
return sclientn;
}
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 void setSclientn(String sclientn) {
this.sclientn = sclientn;
}
public String getInnDeb() {
@ -426,36 +330,12 @@ public class DF57ObjectTag extends ObjectTag<SDf57> {
this.accDeb = accDeb;
}
public String getRclientn1() {
return rclientn1;
public String getRclientn() {
return rclientn;
}
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 void setRclientn(String rclientn) {
this.rclientn = rclientn;
}
public String getInnCred() {
@ -540,15 +420,14 @@ public class DF57ObjectTag extends ObjectTag<SDf57> {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
DF57ObjectTag that = (DF57ObjectTag) o;
return Objects.equals(id, that.id) && Objects.equals(dealDeb, that.dealDeb) && Objects.equals(dealCred, that.dealCred) && Objects.equals(sbankcode, that.sbankcode) && Objects.equals(cAccDeb, that.cAccDeb) && Objects.equals(sbanknam1, that.sbanknam1) && Objects.equals(sbanknam2, that.sbanknam2) && Objects.equals(sbanknam3, that.sbanknam3) && Objects.equals(sbanknam4, that.sbanknam4) && Objects.equals(sbanknam5, that.sbanknam5) && Objects.equals(rbankcode, that.rbankcode) && Objects.equals(cAccCred, that.cAccCred) && Objects.equals(rbanknam1, that.rbanknam1) && Objects.equals(rbanknam2, that.rbanknam2) && Objects.equals(rbanknam3, that.rbanknam3) && Objects.equals(rbanknam4, that.rbanknam4) && Objects.equals(rbanknam5, that.rbanknam5) && Objects.equals(opType, that.opType) && Objects.equals(payDate, that.payDate) && Objects.equals(extDate, that.extDate) && Objects.equals(payVal, that.payVal) && Objects.equals(sumDeb, that.sumDeb) && Objects.equals(sclientn1, that.sclientn1) && Objects.equals(sclientn2, that.sclientn2) && Objects.equals(sclientn3, that.sclientn3) && Objects.equals(sclientn4, that.sclientn4) && Objects.equals(innDeb, that.innDeb) && Objects.equals(kppDeb, that.kppDeb) && Objects.equals(accDeb, that.accDeb) && Objects.equals(rclientn1, that.rclientn1) && Objects.equals(rclientn2, that.rclientn2) && Objects.equals(rclientn3, that.rclientn3) && Objects.equals(rclientn4, that.rclientn4) && Objects.equals(innCred, that.innCred) && Objects.equals(kppCred, that.kppCred) && Objects.equals(accKr, that.accKr) && Objects.equals(specif, that.specif) && Objects.equals(docNum, that.docNum) && Objects.equals(docDate, that.docDate) && Objects.equals(dtIn, that.dtIn) && Objects.equals(ktIn, that.ktIn) && Objects.equals(dtOut, that.dtOut) && Objects.equals(ktOut, that.ktOut);
return Objects.equals(id, that.id) && Objects.equals(dealDeb, that.dealDeb) && Objects.equals(dealCred, that.dealCred) && Objects.equals(sbankcode, that.sbankcode) && Objects.equals(cAccDeb, that.cAccDeb) && Objects.equals(sbanknam, that.sbanknam) && Objects.equals(rbankcode, that.rbankcode) && Objects.equals(cAccCred, that.cAccCred) && Objects.equals(rbanknam, that.rbanknam) && Objects.equals(opType, that.opType) && Objects.equals(payDate, that.payDate) && Objects.equals(extDate, that.extDate) && Objects.equals(payVal, that.payVal) && Objects.equals(sumDeb, that.sumDeb) && Objects.equals(sclientn, that.sclientn) && Objects.equals(innDeb, that.innDeb) && Objects.equals(kppDeb, that.kppDeb) && Objects.equals(accDeb, that.accDeb) && Objects.equals(rclientn, that.rclientn) && Objects.equals(innCred, that.innCred) && Objects.equals(kppCred, that.kppCred) && Objects.equals(accKr, that.accKr) && Objects.equals(specif, that.specif) && Objects.equals(docNum, that.docNum) && Objects.equals(docDate, that.docDate) && Objects.equals(dtIn, that.dtIn) && Objects.equals(ktIn, that.ktIn) && Objects.equals(dtOut, that.dtOut) && Objects.equals(ktOut, that.ktOut);
}
@Override
public int hashCode() {
return Objects.hash(id, dealDeb, dealCred, sbankcode, cAccDeb, sbanknam1, sbanknam2, sbanknam3, sbanknam4, sbanknam5, rbankcode, cAccCred, rbanknam1, rbanknam2, rbanknam3, rbanknam4, rbanknam5, opType, payDate, extDate, payVal, sumDeb, sclientn1, sclientn2, sclientn3, sclientn4, innDeb, kppDeb, accDeb, rclientn1, rclientn2, rclientn3, rclientn4, innCred, kppCred, accKr, specif, docNum, docDate, dtIn, ktIn, dtOut, ktOut);
return Objects.hash(id, dealDeb, dealCred, sbankcode, cAccDeb, sbanknam, rbankcode, cAccCred, rbanknam, opType, payDate, extDate, payVal, sumDeb, sclientn, innDeb, kppDeb, accDeb, rclientn, innCred, kppCred, accKr, specif, docNum, docDate, dtIn, ktIn, dtOut, ktOut);
}
@Override
@ -559,34 +438,20 @@ public class DF57ObjectTag extends ObjectTag<SDf57> {
", dealCred='" + dealCred + '\'' +
", sbankcode='" + sbankcode + '\'' +
", cAccDeb='" + cAccDeb + '\'' +
", sbanknam1='" + sbanknam1 + '\'' +
", sbanknam2='" + sbanknam2 + '\'' +
", sbanknam3='" + sbanknam3 + '\'' +
", sbanknam4='" + sbanknam4 + '\'' +
", sbanknam5='" + sbanknam5 + '\'' +
", sbanknam='" + sbanknam + '\'' +
", rbankcode='" + rbankcode + '\'' +
", cAccCred='" + cAccCred + '\'' +
", rbanknam1='" + rbanknam1 + '\'' +
", rbanknam2='" + rbanknam2 + '\'' +
", rbanknam3='" + rbanknam3 + '\'' +
", rbanknam4='" + rbanknam4 + '\'' +
", rbanknam5='" + rbanknam5 + '\'' +
", rbanknam='" + rbanknam + '\'' +
", opType='" + opType + '\'' +
", payDate=" + payDate +
", extDate=" + extDate +
", payVal='" + payVal + '\'' +
", sumDeb='" + sumDeb + '\'' +
", sclientn1='" + sclientn1 + '\'' +
", sclientn2='" + sclientn2 + '\'' +
", sclientn3='" + sclientn3 + '\'' +
", sclientn4='" + sclientn4 + '\'' +
", sclientn='" + sclientn + '\'' +
", innDeb='" + innDeb + '\'' +
", kppDeb='" + kppDeb + '\'' +
", accDeb='" + accDeb + '\'' +
", rclientn1='" + rclientn1 + '\'' +
", rclientn2='" + rclientn2 + '\'' +
", rclientn3='" + rclientn3 + '\'' +
", rclientn4='" + rclientn4 + '\'' +
", rclientn='" + rclientn + '\'' +
", innCred='" + innCred + '\'' +
", kppCred='" + kppCred + '\'' +
", accKr='" + accKr + '\'' +

20
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/sdf/objects/ObjectTag.java
View file

@ -3,6 +3,9 @@ package ru.spcex.clearing.xml.importer.logic.data.tags.sdf.objects;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.IntStream;
import ru.spcex.clearing.xml.importer.logic.data.enums.ETable;
import ru.spcex.platform.classes.base.SpcexObjectBase;
import ru.spcex.platform.imdg.iml.hazelcast.adapter.ImdgHazelcast;
@ -75,4 +78,21 @@ public abstract class ObjectTag<T extends SpcexObjectBase> {
protected void bootMap() {
map = (ImdgHazelcast<T>) hazelcastService.getImdg(nameOfMap, clazz);
}
public List<String> splitStringByNum(String str, int splitByNum, int totalFields) {
if (str == null || str.isEmpty()) {
return IntStream.range(0, totalFields).mapToObj(i -> "").toList();
}
List<String> result = new ArrayList<>(List.of(str.split("(?<=\\G.{" + splitByNum + "})")));
if (result.size() < totalFields) {
for (int i = result.size(); i < totalFields; i++) {
result.add("");
}
}
return result;
}
}

76
clearing-parent/xml-importer/src/test/java/ru/spcex/clearing/xml/importer/logic/steps/ImportToDBTest.java
View file

@ -138,9 +138,9 @@ class ImportToDBTest {
expectedObjectTag.setDocnmRef("test3");
expectedObjectTag.setDocnmprev("test4");
expectedObjectTag.setcAccDeb("test5");
expectedObjectTag.setSbanknam1("test6");
expectedObjectTag.setSbanknam("1111111111111111111111111111111111111111111111111111111111111111111111");
expectedObjectTag.setcAccCred("test7");
expectedObjectTag.setRbanknam1("test8");
expectedObjectTag.setRbanknam("1111111111111111111111111111111111111111111111111111111111111111111111");
expectedObjectTag.setPayDate(LocalDate.parse("2024-03-14"));
expectedObjectTag.setPayVal("test9");
expectedObjectTag.setSumDeb("test10");
@ -178,9 +178,17 @@ class ImportToDBTest {
Assertions.assertThat(actualSDf04.getDocnm_ref()).isEqualTo(expectedObjectTag.getDocnmRef());
Assertions.assertThat(actualSDf04.getDocnmprev()).isEqualTo(expectedObjectTag.getDocnmprev());
Assertions.assertThat(actualSDf04.getC_acc_deb()).isEqualTo(expectedObjectTag.getcAccDeb());
Assertions.assertThat(actualSDf04.getSbanknam1()).isEqualTo(expectedObjectTag.getSbanknam1());
Assertions.assertThat(actualSDf04.getSbanknam1()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf04.getSbanknam2()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf04.getSbanknam3()).isEqualTo("");
Assertions.assertThat(actualSDf04.getSbanknam4()).isEqualTo("");
Assertions.assertThat(actualSDf04.getSbanknam5()).isEqualTo("");
Assertions.assertThat(actualSDf04.getC_acc_cred()).isEqualTo(expectedObjectTag.getcAccCred());
Assertions.assertThat(actualSDf04.getRbanknam1()).isEqualTo(expectedObjectTag.getRbanknam1());
Assertions.assertThat(actualSDf04.getRbanknam1()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf04.getRbanknam2()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf04.getRbanknam3()).isEqualTo("");
Assertions.assertThat(actualSDf04.getRbanknam4()).isEqualTo("");
Assertions.assertThat(actualSDf04.getRbanknam5()).isEqualTo("");
Assertions.assertThat(actualSDf04.getPay_date()).isEqualTo(expectedObjectTag.getPayDate().format(formatter));
Assertions.assertThat(actualSDf04.getPay_val()).isEqualTo(expectedObjectTag.getPayVal());
Assertions.assertThat(actualSDf04.getSum_deb()).isEqualTo(expectedObjectTag.getSumDeb());
@ -305,20 +313,20 @@ class ImportToDBTest {
expectedObjectTag.setDocnmprev("test4");
expectedObjectTag.setSbankcode("test5");
expectedObjectTag.setcAccDeb("test6");
expectedObjectTag.setSbanknam1("test7");
expectedObjectTag.setSbanknam("1111111111111111111111111111111111111111111111111111111111111111111111");
expectedObjectTag.setRbankcode("test8");
expectedObjectTag.setcAccCred("test9");
expectedObjectTag.setRbanknam1("test10");
expectedObjectTag.setRbanknam("1111111111111111111111111111111111111111111111111111111111111111111111");
expectedObjectTag.setOpType("test11");
expectedObjectTag.setOpOrder("test12");
expectedObjectTag.setPayDate(LocalDate.parse("2024-03-14"));
expectedObjectTag.setPayVal("test13");
expectedObjectTag.setSumDeb("test14");
expectedObjectTag.setSclientn1("test15");
expectedObjectTag.setSclientn("1111111111111111111111111111111111111111111111111111111111111111111111");
expectedObjectTag.setInnDeb("test16");
expectedObjectTag.setKppDeb("test17");
expectedObjectTag.setAccDeb("test18");
expectedObjectTag.setRclientn1("test19");
expectedObjectTag.setRclientn("1111111111111111111111111111111111111111111111111111111111111111111111");
expectedObjectTag.setInnCred("test20");
expectedObjectTag.setKppCred("test21");
expectedObjectTag.setAccKr1("test22");
@ -363,20 +371,34 @@ class ImportToDBTest {
Assertions.assertThat(actualSDf55.getDocnmprev()).isEqualTo(expectedObjectTag.getDocnmprev());
Assertions.assertThat(actualSDf55.getSbankcode()).isEqualTo(expectedObjectTag.getSbankcode());
Assertions.assertThat(actualSDf55.getC_acc_deb()).isEqualTo(expectedObjectTag.getcAccDeb());
Assertions.assertThat(actualSDf55.getSbanknam1()).isEqualTo(expectedObjectTag.getSbanknam1());
Assertions.assertThat(actualSDf55.getSbanknam1()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf55.getSbanknam2()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf55.getSbanknam3()).isEqualTo("");
Assertions.assertThat(actualSDf55.getSbanknam4()).isEqualTo("");
Assertions.assertThat(actualSDf55.getSbanknam5()).isEqualTo("");
Assertions.assertThat(actualSDf55.getRbankcode()).isEqualTo(expectedObjectTag.getRbankcode());
Assertions.assertThat(actualSDf55.getC_acc_cred()).isEqualTo(expectedObjectTag.getcAccCred());
Assertions.assertThat(actualSDf55.getRbanknam1()).isEqualTo(expectedObjectTag.getRbanknam1());
Assertions.assertThat(actualSDf55.getRbanknam1()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf55.getRbanknam2()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf55.getRbanknam3()).isEqualTo("");
Assertions.assertThat(actualSDf55.getRbanknam4()).isEqualTo("");
Assertions.assertThat(actualSDf55.getRbanknam5()).isEqualTo("");
Assertions.assertThat(actualSDf55.getOp_type()).isEqualTo(expectedObjectTag.getOpType());
Assertions.assertThat(actualSDf55.getOp_order()).isEqualTo(expectedObjectTag.getOpOrder());
Assertions.assertThat(actualSDf55.getPay_date()).isEqualTo(expectedObjectTag.getPayDate().format(formatter));
Assertions.assertThat(actualSDf55.getPay_val()).isEqualTo(expectedObjectTag.getPayVal());
Assertions.assertThat(actualSDf55.getSum_deb()).isEqualTo(expectedObjectTag.getSumDeb());
Assertions.assertThat(actualSDf55.getSclientn1()).isEqualTo(expectedObjectTag.getSclientn1());
Assertions.assertThat(actualSDf55.getSclientn1()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf55.getSclientn2()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf55.getSclientn3()).isEqualTo("");
Assertions.assertThat(actualSDf55.getSclientn4()).isEqualTo("");
Assertions.assertThat(actualSDf55.getInn_deb()).isEqualTo(expectedObjectTag.getInnDeb());
Assertions.assertThat(actualSDf55.getKpp_deb()).isEqualTo(expectedObjectTag.getKppDeb());
Assertions.assertThat(actualSDf55.getAcc_deb()).isEqualTo(expectedObjectTag.getAccDeb());
Assertions.assertThat(actualSDf55.getRclientn1()).isEqualTo(expectedObjectTag.getRclientn1());
Assertions.assertThat(actualSDf55.getRclientn1()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf55.getRclientn2()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf55.getRclientn3()).isEqualTo("");
Assertions.assertThat(actualSDf55.getRclientn4()).isEqualTo("");
Assertions.assertThat(actualSDf55.getInn_cred()).isEqualTo(expectedObjectTag.getInnCred());
Assertions.assertThat(actualSDf55.getKpp_cred()).isEqualTo(expectedObjectTag.getKppCred());
Assertions.assertThat(actualSDf55.getAcc_kr_1()).isEqualTo(expectedObjectTag.getAccKr1());
@ -400,20 +422,20 @@ class ImportToDBTest {
expectedObjectTag.setDealCred("test3");
expectedObjectTag.setSbankcode("test4");
expectedObjectTag.setcAccDeb("test5");
expectedObjectTag.setSbanknam1("test6");
expectedObjectTag.setSbanknam("1111111111111111111111111111111111111111111111111111111111111111111111");
expectedObjectTag.setRbankcode("test7");
expectedObjectTag.setcAccCred("test8");
expectedObjectTag.setRbanknam1("test9");
expectedObjectTag.setRbanknam("1111111111111111111111111111111111111111111111111111111111111111111111");
expectedObjectTag.setOpType("test10");
expectedObjectTag.setPayDate(LocalDate.parse("2024-03-15"));
expectedObjectTag.setExtDate(111L);
expectedObjectTag.setPayVal("test11");
expectedObjectTag.setSumDeb("test12");
expectedObjectTag.setSclientn1("test13");
expectedObjectTag.setSclientn("1111111111111111111111111111111111111111111111111111111111111111111111");
expectedObjectTag.setInnDeb("test14");
expectedObjectTag.setKppDeb("test15");
expectedObjectTag.setAccDeb("test16");
expectedObjectTag.setRclientn1("test17");
expectedObjectTag.setRclientn("1111111111111111111111111111111111111111111111111111111111111111111111");
expectedObjectTag.setInnCred("test18");
expectedObjectTag.setKppCred("test19");
expectedObjectTag.setAccKr("test20");
@ -456,20 +478,34 @@ class ImportToDBTest {
Assertions.assertThat(actualSDf57.getDeal_cred()).isEqualTo(expectedObjectTag.getDealCred());
Assertions.assertThat(actualSDf57.getSbankcode()).isEqualTo(expectedObjectTag.getSbankcode());
Assertions.assertThat(actualSDf57.getC_acc_deb()).isEqualTo(expectedObjectTag.getcAccDeb());
Assertions.assertThat(actualSDf57.getSbanknam1()).isEqualTo(expectedObjectTag.getSbanknam1());
Assertions.assertThat(actualSDf57.getSbanknam1()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf57.getSbanknam2()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf57.getSbanknam3()).isEqualTo("");
Assertions.assertThat(actualSDf57.getSbanknam4()).isEqualTo("");
Assertions.assertThat(actualSDf57.getSbanknam5()).isEqualTo("");
Assertions.assertThat(actualSDf57.getRbankcode()).isEqualTo(expectedObjectTag.getRbankcode());
Assertions.assertThat(actualSDf57.getC_acc_cred()).isEqualTo(expectedObjectTag.getcAccCred());
Assertions.assertThat(actualSDf57.getRbanknam1()).isEqualTo(expectedObjectTag.getRbanknam1());
Assertions.assertThat(actualSDf57.getRbanknam1()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf57.getRbanknam2()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf57.getRbanknam3()).isEqualTo("");
Assertions.assertThat(actualSDf57.getRbanknam4()).isEqualTo("");
Assertions.assertThat(actualSDf57.getRbanknam5()).isEqualTo("");
Assertions.assertThat(actualSDf57.getOp_type()).isEqualTo(expectedObjectTag.getOpType());
Assertions.assertThat(actualSDf57.getPay_date()).isEqualTo(expectedObjectTag.getPayDate().format(formatter));
Assertions.assertThat(Long.parseLong(actualSDf57.getExt_date())).isEqualTo(expectedObjectTag.getExtDate());
Assertions.assertThat(actualSDf57.getPay_val()).isEqualTo(expectedObjectTag.getPayVal());
Assertions.assertThat(actualSDf57.getSum_deb()).isEqualTo(expectedObjectTag.getSumDeb());
Assertions.assertThat(actualSDf57.getSclientn1()).isEqualTo(expectedObjectTag.getSclientn1());
Assertions.assertThat(actualSDf57.getSclientn1()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf57.getSclientn2()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf57.getSclientn3()).isEqualTo("");
Assertions.assertThat(actualSDf57.getSclientn4()).isEqualTo("");
Assertions.assertThat(actualSDf57.getInn_deb()).isEqualTo(expectedObjectTag.getInnDeb());
Assertions.assertThat(actualSDf57.getKpp_deb()).isEqualTo(expectedObjectTag.getKppDeb());
Assertions.assertThat(actualSDf57.getAcc_deb()).isEqualTo(expectedObjectTag.getAccDeb());
Assertions.assertThat(actualSDf57.getRclientn1()).isEqualTo(expectedObjectTag.getRclientn1());
Assertions.assertThat(actualSDf57.getRclientn1()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf57.getRclientn2()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf57.getRclientn3()).isEqualTo("");
Assertions.assertThat(actualSDf57.getRclientn4()).isEqualTo("");
Assertions.assertThat(actualSDf57.getInn_cred()).isEqualTo(expectedObjectTag.getInnCred());
Assertions.assertThat(actualSDf57.getKpp_cred()).isEqualTo(expectedObjectTag.getKppCred());
Assertions.assertThat(actualSDf57.getAcc_kr()).isEqualTo(expectedObjectTag.getAccKr());

41
clearing-parent/xml-importer/src/test/java/ru/spcex/clearing/xml/importer/logic/steps/ReadXMLFileTest.java
View file

@ -14,7 +14,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
import ru.spcex.clearing.test.config.ImdgTestConfig;
import ru.spcex.clearing.xml.importer.config.ImporterImdgTestConfig;
import ru.spcex.clearing.xml.importer.config.KafkaTestConfig;
import ru.spcex.clearing.xml.importer.config.XMLImporterConfig;
@ -140,9 +139,9 @@ class ReadXMLFileTest {
expectedObjectTag.setDocnmRef("test3");
expectedObjectTag.setDocnmprev("test4");
expectedObjectTag.setcAccDeb("test5");
expectedObjectTag.setSbanknam1("test6");
expectedObjectTag.setSbanknam("test6");
expectedObjectTag.setcAccCred("test7");
expectedObjectTag.setRbanknam1("test8");
expectedObjectTag.setRbanknam("test8");
expectedObjectTag.setPayDate(LocalDate.parse("2024-03-14"));
expectedObjectTag.setPayVal("test9");
expectedObjectTag.setSumDeb("test10");
@ -157,9 +156,9 @@ class ReadXMLFileTest {
Assertions.assertThat(actualObjectTag.getDocnmRef()).isEqualTo(expectedObjectTag.getDocnmRef());
Assertions.assertThat(actualObjectTag.getDocnmprev()).isEqualTo(expectedObjectTag.getDocnmprev());
Assertions.assertThat(actualObjectTag.getcAccDeb()).isEqualTo(expectedObjectTag.getcAccDeb());
Assertions.assertThat(actualObjectTag.getSbanknam1()).isEqualTo(expectedObjectTag.getSbanknam1());
Assertions.assertThat(actualObjectTag.getSbanknam()).isEqualTo(expectedObjectTag.getSbanknam());
Assertions.assertThat(actualObjectTag.getcAccCred()).isEqualTo(expectedObjectTag.getcAccCred());
Assertions.assertThat(actualObjectTag.getRbanknam1()).isEqualTo(expectedObjectTag.getRbanknam1());
Assertions.assertThat(actualObjectTag.getRbanknam()).isEqualTo(expectedObjectTag.getRbanknam());
Assertions.assertThat(actualObjectTag.getPayDate()).isEqualTo(expectedObjectTag.getPayDate());
Assertions.assertThat(actualObjectTag.getPayVal()).isEqualTo(expectedObjectTag.getPayVal());
Assertions.assertThat(actualObjectTag.getSumDeb()).isEqualTo(expectedObjectTag.getSumDeb());
@ -253,20 +252,20 @@ class ReadXMLFileTest {
expectedObjectTag.setDocnmprev("test4");
expectedObjectTag.setSbankcode("test5");
expectedObjectTag.setcAccDeb("test6");
expectedObjectTag.setSbanknam1("test7");
expectedObjectTag.setSbanknam("test7");
expectedObjectTag.setRbankcode("test8");
expectedObjectTag.setcAccCred("test9");
expectedObjectTag.setRbanknam1("test10");
expectedObjectTag.setRbanknam("test10");
expectedObjectTag.setOpType("11");
expectedObjectTag.setOpOrder("2");
expectedObjectTag.setPayDate(LocalDate.parse("2024-03-14"));
expectedObjectTag.setPayVal("test13");
expectedObjectTag.setSumDeb("test14");
expectedObjectTag.setSclientn1("test15");
expectedObjectTag.setSclientn("test15");
expectedObjectTag.setInnDeb("test16");
expectedObjectTag.setKppDeb("test17");
expectedObjectTag.setAccDeb("test18");
expectedObjectTag.setRclientn1("test19");
expectedObjectTag.setRclientn("test19");
expectedObjectTag.setInnCred("test20");
expectedObjectTag.setKppCred("test21");
expectedObjectTag.setAccKr1("test22");
@ -288,20 +287,20 @@ class ReadXMLFileTest {
Assertions.assertThat(actualObjectTag.getDocnmprev()).isEqualTo(expectedObjectTag.getDocnmprev());
Assertions.assertThat(actualObjectTag.getSbankcode()).isEqualTo(expectedObjectTag.getSbankcode());
Assertions.assertThat(actualObjectTag.getcAccDeb()).isEqualTo(expectedObjectTag.getcAccDeb());
Assertions.assertThat(actualObjectTag.getSbanknam1()).isEqualTo(expectedObjectTag.getSbanknam1());
Assertions.assertThat(actualObjectTag.getSbanknam()).isEqualTo(expectedObjectTag.getSbanknam());
Assertions.assertThat(actualObjectTag.getRbankcode()).isEqualTo(expectedObjectTag.getRbankcode());
Assertions.assertThat(actualObjectTag.getcAccCred()).isEqualTo(expectedObjectTag.getcAccCred());
Assertions.assertThat(actualObjectTag.getRbanknam1()).isEqualTo(expectedObjectTag.getRbanknam1());
Assertions.assertThat(actualObjectTag.getRbanknam()).isEqualTo(expectedObjectTag.getRbanknam());
Assertions.assertThat(actualObjectTag.getOpType()).isEqualTo(expectedObjectTag.getOpType());
Assertions.assertThat(actualObjectTag.getOpOrder()).isEqualTo(expectedObjectTag.getOpOrder());
Assertions.assertThat(actualObjectTag.getPayDate()).isEqualTo(expectedObjectTag.getPayDate());
Assertions.assertThat(actualObjectTag.getPayVal()).isEqualTo(expectedObjectTag.getPayVal());
Assertions.assertThat(actualObjectTag.getSumDeb()).isEqualTo(expectedObjectTag.getSumDeb());
Assertions.assertThat(actualObjectTag.getSclientn1()).isEqualTo(expectedObjectTag.getSclientn1());
Assertions.assertThat(actualObjectTag.getSclientn()).isEqualTo(expectedObjectTag.getSclientn());
Assertions.assertThat(actualObjectTag.getInnDeb()).isEqualTo(expectedObjectTag.getInnDeb());
Assertions.assertThat(actualObjectTag.getKppDeb()).isEqualTo(expectedObjectTag.getKppDeb());
Assertions.assertThat(actualObjectTag.getAccDeb()).isEqualTo(expectedObjectTag.getAccDeb());
Assertions.assertThat(actualObjectTag.getRclientn1()).isEqualTo(expectedObjectTag.getRclientn1());
Assertions.assertThat(actualObjectTag.getRclientn()).isEqualTo(expectedObjectTag.getRclientn());
Assertions.assertThat(actualObjectTag.getInnCred()).isEqualTo(expectedObjectTag.getInnCred());
Assertions.assertThat(actualObjectTag.getKppCred()).isEqualTo(expectedObjectTag.getKppCred());
Assertions.assertThat(actualObjectTag.getAccKr1()).isEqualTo(expectedObjectTag.getAccKr1());
@ -330,20 +329,20 @@ class ReadXMLFileTest {
expectedObjectTag.setDealCred("test3");
expectedObjectTag.setSbankcode("test4");
expectedObjectTag.setcAccDeb("test5");
expectedObjectTag.setSbanknam1("test6");
expectedObjectTag.setSbanknam("test6");
expectedObjectTag.setRbankcode("test7");
expectedObjectTag.setcAccCred("test8");
expectedObjectTag.setRbanknam1("test9");
expectedObjectTag.setRbanknam("test9");
expectedObjectTag.setOpType("test10");
expectedObjectTag.setPayDate(LocalDate.parse("2024-03-15"));
expectedObjectTag.setExtDate(111L);
expectedObjectTag.setPayVal("test11");
expectedObjectTag.setSumDeb("test12");
expectedObjectTag.setSclientn1("test13");
expectedObjectTag.setSclientn("test13");
expectedObjectTag.setInnDeb("test14");
expectedObjectTag.setKppDeb("test15");
expectedObjectTag.setAccDeb("test16");
expectedObjectTag.setRclientn1("test17");
expectedObjectTag.setRclientn("test17");
expectedObjectTag.setInnCred("test18");
expectedObjectTag.setKppCred("test19");
expectedObjectTag.setAccKr("test20");
@ -363,20 +362,20 @@ class ReadXMLFileTest {
Assertions.assertThat(actualObjectTag.getDealCred()).isEqualTo(expectedObjectTag.getDealCred());
Assertions.assertThat(actualObjectTag.getSbankcode()).isEqualTo(expectedObjectTag.getSbankcode());
Assertions.assertThat(actualObjectTag.getcAccDeb()).isEqualTo(expectedObjectTag.getcAccDeb());
Assertions.assertThat(actualObjectTag.getSbanknam1()).isEqualTo(expectedObjectTag.getSbanknam1());
Assertions.assertThat(actualObjectTag.getSbanknam()).isEqualTo(expectedObjectTag.getSbanknam());
Assertions.assertThat(actualObjectTag.getRbankcode()).isEqualTo(expectedObjectTag.getRbankcode());
Assertions.assertThat(actualObjectTag.getcAccCred()).isEqualTo(expectedObjectTag.getcAccCred());
Assertions.assertThat(actualObjectTag.getRbanknam1()).isEqualTo(expectedObjectTag.getRbanknam1());
Assertions.assertThat(actualObjectTag.getRbanknam()).isEqualTo(expectedObjectTag.getRbanknam());
Assertions.assertThat(actualObjectTag.getOpType()).isEqualTo(expectedObjectTag.getOpType());
Assertions.assertThat(actualObjectTag.getPayDate()).isEqualTo(expectedObjectTag.getPayDate());
Assertions.assertThat(actualObjectTag.getExtDate()).isEqualTo(expectedObjectTag.getExtDate());
Assertions.assertThat(actualObjectTag.getPayVal()).isEqualTo(expectedObjectTag.getPayVal());
Assertions.assertThat(actualObjectTag.getSumDeb()).isEqualTo(expectedObjectTag.getSumDeb());
Assertions.assertThat(actualObjectTag.getSclientn1()).isEqualTo(expectedObjectTag.getSclientn1());
Assertions.assertThat(actualObjectTag.getSclientn()).isEqualTo(expectedObjectTag.getSclientn());
Assertions.assertThat(actualObjectTag.getInnDeb()).isEqualTo(expectedObjectTag.getInnDeb());
Assertions.assertThat(actualObjectTag.getKppDeb()).isEqualTo(expectedObjectTag.getKppDeb());
Assertions.assertThat(actualObjectTag.getAccDeb()).isEqualTo(expectedObjectTag.getAccDeb());
Assertions.assertThat(actualObjectTag.getRclientn1()).isEqualTo(expectedObjectTag.getRclientn1());
Assertions.assertThat(actualObjectTag.getRclientn()).isEqualTo(expectedObjectTag.getRclientn());
Assertions.assertThat(actualObjectTag.getInnCred()).isEqualTo(expectedObjectTag.getInnCred());
Assertions.assertThat(actualObjectTag.getKppCred()).isEqualTo(expectedObjectTag.getKppCred());
Assertions.assertThat(actualObjectTag.getAccKr()).isEqualTo(expectedObjectTag.getAccKr());