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 new file mode 100644 index 000000000..566690b89 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf03.java @@ -0,0 +1,439 @@ +package ru.clearing.classes.statics.data.sdf; + +import ru.clearing.classes.ConstSerializable; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +import java.time.Instant; + +/** + * ДФ-03 Сводное платежное поручение + * + * DB table: S_DF03 + **/ +public class SDf03 extends SpcexObjectBase { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private String seg_type; + private String doc_type; + private String docnm_ref; + 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 imp_result; + private Instant generationTime; + private Long generationId; + + public String getSeg_type() { + return seg_type; + } + + public void setSeg_type(String seg_type) { + this.seg_type = seg_type; + } + + public String getDoc_type() { + return doc_type; + } + + public void setDoc_type(String doc_type) { + this.doc_type = doc_type; + } + + public String getDocnm_ref() { + return docnm_ref; + } + + public void setDocnm_ref(String docnm_ref) { + this.docnm_ref = docnm_ref; + } + + 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; + } + + 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 String getImp_result() { + return imp_result; + } + + public void setImp_result(String imp_result) { + this.imp_result = imp_result; + } + + public Instant getGenerationTime() { + return generationTime; + } + + public void setGenerationTime(Instant generationTime) { + this.generationTime = generationTime; + } + + public Long getGenerationId() { + return generationId; + } + + public void setGenerationId(Long generationId) { + this.generationId = generationId; + } +} diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf05.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf05.java new file mode 100644 index 000000000..d27372237 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf05.java @@ -0,0 +1,73 @@ +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; +import java.time.LocalDate; +import java.time.LocalTime; + +/** + * ДФ-05 Уведомление о завершении расчетов в ПРЦ + * + * DB table: S_DF05 + */ +public class SDf05 extends SpcexObjectBase { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private BigDecimal tp; + private LocalDate dt; + private LocalTime tm; + private String pr; + private Instant generationTime; + private Long generationId; + + public BigDecimal getTp() { + return tp; + } + + public void setTp(BigDecimal tp) { + this.tp = tp; + } + + public LocalDate getDt() { + return dt; + } + + public void setDt(LocalDate dt) { + this.dt = dt; + } + + public LocalTime getTm() { + return tm; + } + + public void setTm(LocalTime tm) { + this.tm = tm; + } + + public String getPr() { + return pr; + } + + public void setPr(String pr) { + this.pr = pr; + } + + public Instant getGenerationTime() { + return generationTime; + } + + public void setGenerationTime(Instant generationTime) { + this.generationTime = generationTime; + } + + public Long getGenerationId() { + return generationId; + } + + public void setGenerationId(Long generationId) { + this.generationId = generationId; + } +} 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 new file mode 100644 index 000000000..6e2ea9670 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf10.java @@ -0,0 +1,107 @@ +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; + +/** + * ДФ-10 Подтверждение о загрузке по поступлению на клиринговый счет + * + * DB table: S_DF10 + */ +public class SDf10 extends SpcexObjectBase { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private String account; + private String sum; + private String market; + private String type; + private BigDecimal number; + private BigDecimal INN; + private String result; + private Instant generationTime; + private Long generationId; + private Long in_s_df09_id; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getSum() { + return sum; + } + + public void setSum(String sum) { + this.sum = sum; + } + + public String getMarket() { + return market; + } + + public void setMarket(String market) { + this.market = market; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public BigDecimal getNumber() { + return number; + } + + public void setNumber(BigDecimal number) { + this.number = number; + } + + public BigDecimal getINN() { + return INN; + } + + public void setINN(BigDecimal INN) { + this.INN = INN; + } + + public String getResult() { + return result; + } + + public void setResult(String result) { + this.result = result; + } + + public Instant getGenerationTime() { + return generationTime; + } + + public void setGenerationTime(Instant generationTime) { + this.generationTime = generationTime; + } + + public Long getGenerationId() { + return generationId; + } + + public void setGenerationId(Long generationId) { + this.generationId = generationId; + } + + public Long getIn_s_df09_id() { + return in_s_df09_id; + } + + public void setIn_s_df09_id(Long in_s_df09_id) { + this.in_s_df09_id = in_s_df09_id; + } +} 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 new file mode 100644 index 000000000..b8e2f2c69 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf11.java @@ -0,0 +1,439 @@ +package ru.clearing.classes.statics.data.sdf; + +import ru.clearing.classes.ConstSerializable; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +import java.time.Instant; + +/** + * ДФ-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 Instant generationTime; + private Long generationId; + + public String getSeg_type() { + return seg_type; + } + + public void setSeg_type(String seg_type) { + this.seg_type = seg_type; + } + + public String getDoc_type() { + return doc_type; + } + + public void setDoc_type(String doc_type) { + this.doc_type = doc_type; + } + + public String getDocnm_ref() { + return docnm_ref; + } + + public void setDocnm_ref(String docnm_ref) { + this.docnm_ref = docnm_ref; + } + + public String getDocnmprev() { + return docnmprev; + } + + public void setDocnmprev(String docnmprev) { + 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; + } + + 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 Instant getGenerationTime() { + return generationTime; + } + + public void setGenerationTime(Instant generationTime) { + this.generationTime = generationTime; + } + + public Long getGenerationId() { + return generationId; + } + + public void setGenerationId(Long generationId) { + this.generationId = generationId; + } +} 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 new file mode 100644 index 000000000..c52ebf7bb --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf13.java @@ -0,0 +1,431 @@ +package ru.clearing.classes.statics.data.sdf; + +import ru.clearing.classes.ConstSerializable; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +import java.time.Instant; + +/** + * ДФ 013 - Вывод свободных средств для инициаторов категории В + * с клирингового счета 30414/7 - платежное поручение АО СПВБ на вывод средств из РО. + * + * 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 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 Instant generationTime; + private Long generationId; + + public String getSeg_type() { + return seg_type; + } + + public void setSeg_type(String seg_type) { + this.seg_type = seg_type; + } + + public String getDoc_type() { + return doc_type; + } + + public void setDoc_type(String doc_type) { + this.doc_type = doc_type; + } + + public String getDocnm_ref() { + return docnm_ref; + } + + public void setDocnm_ref(String docnm_ref) { + this.docnm_ref = docnm_ref; + } + + public String getDocnmprev() { + return docnmprev; + } + + public void setDocnmprev(String docnmprev) { + 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; + } + + 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 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 Instant getGenerationTime() { + return generationTime; + } + + public void setGenerationTime(Instant generationTime) { + this.generationTime = generationTime; + } + + public Long getGenerationId() { + return generationId; + } + + public void setGenerationId(Long generationId) { + this.generationId = generationId; + } +} diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf17.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf17.java new file mode 100644 index 000000000..e952baa38 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf17.java @@ -0,0 +1,126 @@ +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; + +/** + * ДФ-17 Формат ответа на запрос по возврату депозита или дозачисление/списание денежных средств + * + * DB table: S_DF17 + **/ +public class SDf17 extends SpcexObjectBase { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private String account; + private BigDecimal sum; + private String market; + private String type; + private BigDecimal INN; + private BigDecimal BIC; + private String SPEC; + private BigDecimal number; + private String result; + private Instant generationTime; + private Long generationId; + private Long in_s_df16_id; + + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public BigDecimal getSum() { + return sum; + } + + public void setSum(BigDecimal sum) { + this.sum = sum; + } + + public String getMarket() { + return market; + } + + public void setMarket(String market) { + this.market = market; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public BigDecimal getINN() { + return INN; + } + + public void setINN(BigDecimal INN) { + this.INN = INN; + } + + public BigDecimal getBIC() { + return BIC; + } + + public void setBIC(BigDecimal BIC) { + this.BIC = BIC; + } + + public String getSPEC() { + return SPEC; + } + + public void setSPEC(String SPEC) { + this.SPEC = SPEC; + } + + public BigDecimal getNumber() { + return number; + } + + public void setNumber(BigDecimal number) { + this.number = number; + } + + public String getResult() { + return result; + } + + public void setResult(String result) { + this.result = result; + } + + public Instant getGenerationTime() { + return generationTime; + } + + public void setGenerationTime(Instant generationTime) { + this.generationTime = generationTime; + } + + public Long getGenerationId() { + return generationId; + } + + public void setGenerationId(Long generationId) { + this.generationId = generationId; + } + + public Long getIn_s_df16_id() { + return in_s_df16_id; + } + + public void setIn_s_df16_id(Long in_s_df16_id) { + this.in_s_df16_id = in_s_df16_id; + } +} \ No newline at end of file diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/Table.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/Table.java index 740ad040b..b7ebb6e43 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/Table.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/Table.java @@ -5,12 +5,15 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.platform.classes.base.SpcexObjectBase; public enum Table { - S_DF01("DF-01", IMDGDistributedNames.Map_SDf01, SDf01.class), S_DF02("DF-02", IMDGDistributedNames.Map_SDf02, SDf02.class), S_DF08("DF-08", IMDGDistributedNames.Map_SDf08, SDf08.class), - S_DF12("DF-12", IMDGDistributedNames.Map_SDf12, SDf12.class), - S_DF16("DF-16", IMDGDistributedNames.Map_SDf16, SDf16.class), - S_DF18("DF-18", IMDGDistributedNames.Map_SDf18, SDf18.class); + S_DF18("DF-18", IMDGDistributedNames.Map_SDf18, SDf18.class), + S_DF03("DF-03", IMDGDistributedNames.Map_SDf03, SDf03.class), + S_DF05("DF-05", IMDGDistributedNames.Map_SDf05, SDf05.class), + S_DF10("DF-10", IMDGDistributedNames.Map_SDf10, SDf10.class), + S_DF11("DF-11", IMDGDistributedNames.Map_SDf11, SDf11.class), + S_DF13("DF-13", IMDGDistributedNames.Map_SDf13, SDf13.class), + S_DF17("DF-17", IMDGDistributedNames.Map_SDf17, SDf17.class); /** * Префикс имени файла для экспорта diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/ExportFromHazelcast.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/ExportFromHazelcast.java index 5a4c8dd81..4c918245d 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/ExportFromHazelcast.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/ExportFromHazelcast.java @@ -32,32 +32,41 @@ public class ExportFromHazelcast extends Stage implements InitializingBean { private final AProperties properties; private final ImdgProvider imdgProvider; - private final S_DF01_Converter s_df01_converter; private final S_DF02_Converter s_df02_converter; private final S_DF08_Converter s_df08_converter; - private final S_DF12_Converter s_df12_converter; - private final S_DF16_Converter s_df16_converter; private final S_DF18_Converter s_df18_converter; + private final S_DF03_Converter s_df03_converter; + private final S_DF05_Converter s_df05_converter; + private final S_DF10_Converter s_df10_converter; + private final S_DF11_Converter s_df11_converter; + private final S_DF13_Converter s_df13_converter; + private final S_DF17_Converter s_df17_converter; private final Map dbfFieldsForTable = new HashMap<>(); private Charset dbfCharset; public ExportFromHazelcast(@Qualifier("dbfExporterProperties") AProperties properties, @Qualifier("imdgProvider") ImdgProvider imdgProvider, - S_DF01_Converter s_df01_converter, S_DF02_Converter s_df02_converter, S_DF08_Converter s_df08_converter, - S_DF12_Converter s_df12_converter, - S_DF16_Converter s_df16_converter, - S_DF18_Converter s_df18_converter) { + S_DF18_Converter s_df18_converter, + S_DF03_Converter s_df03_converter, + S_DF05_Converter s_df05_converter, + S_DF10_Converter s_df10_converter, + S_DF11_Converter s_df11_converter, + S_DF13_Converter s_df13_converter, + S_DF17_Converter s_df17_converter) { this.properties = properties; this.imdgProvider = imdgProvider; - this.s_df01_converter = s_df01_converter; this.s_df02_converter = s_df02_converter; this.s_df08_converter = s_df08_converter; - this.s_df12_converter = s_df12_converter; - this.s_df16_converter = s_df16_converter; this.s_df18_converter = s_df18_converter; + this.s_df03_converter = s_df03_converter; + this.s_df05_converter = s_df05_converter; + this.s_df10_converter = s_df10_converter; + this.s_df11_converter = s_df11_converter; + this.s_df13_converter = s_df13_converter; + this.s_df17_converter = s_df17_converter; } @Override @@ -81,12 +90,15 @@ public class ExportFromHazelcast extends Stage implements InitializingBean { } for (SpcexObjectBase value : allValues) { Object[] values; - if (value instanceof SDf01 sdf01Value) values = s_df01_converter.toObjectArray(sdf01Value); - else if (value instanceof SDf02 sDf02Value) values = s_df02_converter.toObjectArray(sDf02Value); + if (value instanceof SDf02 sDf02Value) values = s_df02_converter.toObjectArray(sDf02Value); else if (value instanceof SDf08 sDf08Value) values = s_df08_converter.toObjectArray(sDf08Value); - else if (value instanceof SDf12 sDf12Value) values = s_df12_converter.toObjectArray(sDf12Value); - else if (value instanceof SDf16 sDf16Value) values = s_df16_converter.toObjectArray(sDf16Value); else if (value instanceof SDf18 sDf18Value) values = s_df18_converter.toObjectArray(sDf18Value); + else if (value instanceof SDf03 sDf03Value) values = s_df03_converter.toObjectArray(sDf03Value); + else if (value instanceof SDf05 sDf05Value) values = s_df05_converter.toObjectArray(sDf05Value); + else if (value instanceof SDf10 sDf10Value) values = s_df10_converter.toObjectArray(sDf10Value); + else if (value instanceof SDf11 sDf11Value) values = s_df11_converter.toObjectArray(sDf11Value); + else if (value instanceof SDf13 sDf13Value) values = s_df13_converter.toObjectArray(sDf13Value); + else if (value instanceof SDf17 sDf17Value) values = s_df17_converter.toObjectArray(sDf17Value); else throw new Exception("Get unknown object from imdg. Class: " + value.getClass().getSimpleName()); dbfWriter.addRecord(values); } @@ -121,12 +133,15 @@ public class ExportFromHazelcast extends Stage implements InitializingBean { * Инициализация структуры выходных файлов (заголовки столбцов) */ private void initExportFileStructure() { - dbfFieldsForTable.put(Table.S_DF01, s_df01_converter.getDBFHeaders()); dbfFieldsForTable.put(Table.S_DF02, s_df02_converter.getDBFHeaders()); dbfFieldsForTable.put(Table.S_DF08, s_df08_converter.getDBFHeaders()); - dbfFieldsForTable.put(Table.S_DF12, s_df12_converter.getDBFHeaders()); - dbfFieldsForTable.put(Table.S_DF16, s_df16_converter.getDBFHeaders()); dbfFieldsForTable.put(Table.S_DF18, s_df18_converter.getDBFHeaders()); + dbfFieldsForTable.put(Table.S_DF03, s_df03_converter.getDBFHeaders()); + dbfFieldsForTable.put(Table.S_DF05, s_df05_converter.getDBFHeaders()); + dbfFieldsForTable.put(Table.S_DF10, s_df10_converter.getDBFHeaders()); + dbfFieldsForTable.put(Table.S_DF11, s_df11_converter.getDBFHeaders()); + dbfFieldsForTable.put(Table.S_DF13, s_df13_converter.getDBFHeaders()); + dbfFieldsForTable.put(Table.S_DF17, s_df17_converter.getDBFHeaders()); } private void initDBFCharset() { diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/PrepareDBFFile.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/PrepareDBFFile.java index 49297d4b1..86b7ea82d 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/PrepareDBFFile.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/PrepareDBFFile.java @@ -74,14 +74,14 @@ public class PrepareDBFFile extends Stage implements InitializingBean { result.append(section); result.append('_'); result.append(time); - result.append('_'); - if (!prefixOfTable.equalsIgnoreCase("DF-05")) { - result.append(countSameFilesInDir(prefixOfTable, outDir) + 1); + if (table != Table.S_DF05) { result.append('_'); + result.append(countSameFilesInDir(prefixOfTable, outDir) + 1); } if (codeOfMember != null) { + result.append('_'); result.append(codeOfMember); } result.append(".DBF"); @@ -89,7 +89,7 @@ public class PrepareDBFFile extends Stage implements InitializingBean { } private Integer countSameFilesInDir(String prefixOfTable, String outDir) { - int res = 1; + int res = 0; File directory = new File(outDir); if (directory.exists()) { for (File file : Objects.requireNonNull(directory.listFiles())) { diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/DFConverter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/DFConverter.java index ddf25db63..34ade61a5 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/DFConverter.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/DFConverter.java @@ -4,9 +4,11 @@ import com.linuxense.javadbf.DBFField; import ru.spcex.platform.classes.base.SpcexObjectBase; import java.sql.Date; +import java.sql.Time; import java.sql.Timestamp; import java.time.Instant; import java.time.LocalDate; +import java.time.LocalTime; public abstract class DFConverter { public abstract Object[] toObjectArray(T entity); @@ -20,6 +22,7 @@ public abstract class DFConverter { protected Object typeMatch(Object src) { if (src instanceof Instant srcInstant) return Timestamp.from(srcInstant); if (src instanceof LocalDate srcLocalDate) return Date.valueOf(srcLocalDate); + if (src instanceof LocalTime srcLocalTime) return Time.valueOf(srcLocalTime); return src; } } diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF01_Converter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF01_Converter.java deleted file mode 100644 index e404d4d9f..000000000 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF01_Converter.java +++ /dev/null @@ -1,49 +0,0 @@ -package ru.spcex.clearing.dbf.exporter.services.converters; - -import com.linuxense.javadbf.DBFDataType; -import com.linuxense.javadbf.DBFField; -import org.springframework.stereotype.Service; -import ru.clearing.classes.statics.data.sdf.SDf01; - -import java.util.LinkedList; -import java.util.List; - -@Service -public class S_DF01_Converter extends DFConverter { - @Override - public Object[] toObjectArray(SDf01 entity) { - List values = new LinkedList<>(); - values.add(typeMatch(entity.getCurr_code())); - values.add(typeMatch(entity.getAccount())); - values.add(typeMatch(entity.getRemainder())); - values.add(typeMatch(entity.getDeal())); - values.add(typeMatch(entity.getAcc_code())); - values.add(typeMatch(entity.getDat())); - values.add(typeMatch(entity.getMarket())); - values.add(typeMatch(entity.getAcc_name())); - values.add(typeMatch(entity.getAcc_type())); - values.add(typeMatch(entity.getSumengage())); - values.add(typeMatch(entity.getSumunblock())); - values.add(typeMatch(entity.getFile_type())); - return values.toArray(Object[]::new); - } - - @Override - public DBFField[] getDBFHeaders() { - List dbfFields = new LinkedList<>(); - dbfFields.add(new DBFField("curr_code", DBFDataType.CHARACTER, 12)); - dbfFields.add(new DBFField("account", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("reminder", DBFDataType.CHARACTER, 22)); - dbfFields.add(new DBFField("deal", DBFDataType.CHARACTER, 10)); - dbfFields.add(new DBFField("acc_code", DBFDataType.CHARACTER, 5)); - dbfFields.add(new DBFField("dat", DBFDataType.CHARACTER, 8)); - dbfFields.add(new DBFField("market", DBFDataType.CHARACTER, 1)); - dbfFields.add(new DBFField("acc_name", DBFDataType.CHARACTER, 30)); - dbfFields.add(new DBFField("acc_type", DBFDataType.CHARACTER, 2)); - dbfFields.add(new DBFField("sumengage", DBFDataType.CHARACTER, 22)); - dbfFields.add(new DBFField("sumunblock", DBFDataType.CHARACTER, 22)); - dbfFields.add(new DBFField("file_type", DBFDataType.CHARACTER, 22)); - return dbfFields.toArray(DBFField[]::new); - } - -} diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF02_Converter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF02_Converter.java index 15f1e4e9f..d0accdf72 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF02_Converter.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF02_Converter.java @@ -26,31 +26,27 @@ public class S_DF02_Converter extends DFConverter { values.add(typeMatch(entity.getSumunblock())); values.add(typeMatch(entity.getFile_type())); values.add(typeMatch(entity.getResult())); - values.add(typeMatch(entity.getGenerationTime())); - values.add(typeMatch(entity.getGenerationId())); - values.add(typeMatch(entity.getInSDf01Id())); +// values.add(typeMatch(entity.getInSDf01Id())); return values.toArray(Object[]::new); } @Override public DBFField[] getDBFHeaders() { List dbfFields = new LinkedList<>(); - dbfFields.add(new DBFField("curr_code", DBFDataType.CHARACTER, 12)); - dbfFields.add(new DBFField("account", DBFDataType.CHARACTER, 35)); - dbfFields.add(new DBFField("reminder", DBFDataType.CHARACTER, 22)); - dbfFields.add(new DBFField("deal", DBFDataType.CHARACTER, 10)); - dbfFields.add(new DBFField("acc_code", DBFDataType.CHARACTER, 5)); - dbfFields.add(new DBFField("dat", DBFDataType.CHARACTER, 8)); - dbfFields.add(new DBFField("market", DBFDataType.CHARACTER, 1)); - dbfFields.add(new DBFField("acc_name", DBFDataType.CHARACTER, 30)); - dbfFields.add(new DBFField("acc_type", DBFDataType.CHARACTER, 2)); - dbfFields.add(new DBFField("sumengage", DBFDataType.CHARACTER, 22)); - dbfFields.add(new DBFField("sumunblock", DBFDataType.CHARACTER, 22)); - dbfFields.add(new DBFField("file_type", DBFDataType.CHARACTER, 22)); - dbfFields.add(new DBFField("result", DBFDataType.CHARACTER, 3)); - dbfFields.add(new DBFField("gen_time", DBFDataType.DATE)); - dbfFields.add(new DBFField("gen_id", DBFDataType.NUMERIC)); - dbfFields.add(new DBFField("insdf01_id", DBFDataType.NUMERIC)); + dbfFields.add(new DBFField("CURR_CODE", DBFDataType.CHARACTER, 12)); + dbfFields.add(new DBFField("ACCOUNT", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("REMINDER", DBFDataType.CHARACTER, 22)); + dbfFields.add(new DBFField("DEAL", DBFDataType.CHARACTER, 10)); + dbfFields.add(new DBFField("ACC_CODE", DBFDataType.CHARACTER, 5)); + dbfFields.add(new DBFField("DAT", DBFDataType.CHARACTER, 8)); + dbfFields.add(new DBFField("MARKET", DBFDataType.CHARACTER, 1)); + dbfFields.add(new DBFField("ACC_NAME", DBFDataType.CHARACTER, 30)); + dbfFields.add(new DBFField("ACC_TYPE", DBFDataType.CHARACTER, 2)); + dbfFields.add(new DBFField("SUMENGAGE", DBFDataType.CHARACTER, 22)); + dbfFields.add(new DBFField("SUMUNBLOCK", DBFDataType.CHARACTER, 22)); + dbfFields.add(new DBFField("FILE_TYPE", DBFDataType.CHARACTER, 22)); + dbfFields.add(new DBFField("RESULT", DBFDataType.CHARACTER, 3)); +// dbfFields.add(new DBFField("INSDF01_ID", DBFDataType.NUMERIC)); return dbfFields.toArray(DBFField[]::new); } diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF03_Converter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF03_Converter.java new file mode 100644 index 000000000..4f7cb234b --- /dev/null +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF03_Converter.java @@ -0,0 +1,115 @@ +package ru.spcex.clearing.dbf.exporter.services.converters; + +import com.linuxense.javadbf.DBFDataType; +import com.linuxense.javadbf.DBFField; +import org.springframework.stereotype.Service; +import ru.clearing.classes.statics.data.sdf.SDf03; + +import java.util.LinkedList; +import java.util.List; + +@Service +public class S_DF03_Converter extends DFConverter { + @Override + public Object[] toObjectArray(SDf03 entity) { + List values = new LinkedList<>(); + values.add(typeMatch(entity.getSeg_type())); + values.add(typeMatch(entity.getDoc_type())); + values.add(typeMatch(entity.getDocnm_ref())); + values.add(typeMatch(entity.getPriority())); + values.add(typeMatch(entity.getSbankcode())); + values.add(typeMatch(entity.getC_acc_deb())); + values.add(typeMatch(entity.getSbanknam1())); + values.add(typeMatch(entity.getSbanknam2())); + values.add(typeMatch(entity.getSbanknam3())); + values.add(typeMatch(entity.getSbanknam4())); + values.add(typeMatch(entity.getSbanknam5())); + values.add(typeMatch(entity.getRbankcode())); + values.add(typeMatch(entity.getC_acc_cred())); + values.add(typeMatch(entity.getRbanknam1())); + values.add(typeMatch(entity.getRbanknam2())); + values.add(typeMatch(entity.getRbanknam3())); + values.add(typeMatch(entity.getRbanknam4())); + values.add(typeMatch(entity.getRbanknam5())); + values.add(typeMatch(entity.getPay_date())); + values.add(typeMatch(entity.getExt_date())); + values.add(typeMatch(entity.getPay_val())); + values.add(typeMatch(entity.getSum_deb())); + values.add(typeMatch(entity.getSclientn1())); + values.add(typeMatch(entity.getSclientn2())); + values.add(typeMatch(entity.getSclientn3())); + values.add(typeMatch(entity.getSclientn4())); + values.add(typeMatch(entity.getSc_code())); + values.add(typeMatch(entity.getAcc_deb())); + values.add(typeMatch(entity.getRclientn1())); + values.add(typeMatch(entity.getRclientn2())); + values.add(typeMatch(entity.getRclientn3())); + values.add(typeMatch(entity.getRclientn4())); + values.add(typeMatch(entity.getAcc_kr_1())); + values.add(typeMatch(entity.getAcc_kr_2())); + values.add(typeMatch(entity.getSp_code())); + values.add(typeMatch(entity.getSpecif_1())); + values.add(typeMatch(entity.getSpecif_2())); + values.add(typeMatch(entity.getSpecif_3())); + values.add(typeMatch(entity.getSpecif_4())); + values.add(typeMatch(entity.getSpecif_5())); + values.add(typeMatch(entity.getSpecif_6())); + values.add(typeMatch(entity.getSend_type())); + values.add(typeMatch(entity.getServdate())); + values.add(typeMatch(entity.getDoc_result())); + values.add(typeMatch(entity.getImp_result())); + return values.toArray(Object[]::new); + } + + @Override + public DBFField[] getDBFHeaders() { + List dbfFields = new LinkedList<>(); + dbfFields.add(new DBFField("SEG_TYPE", DBFDataType.CHARACTER, 1)); + dbfFields.add(new DBFField("DOC_TYPE", DBFDataType.CHARACTER, 254)); + dbfFields.add(new DBFField("DOCNM_REF", DBFDataType.CHARACTER, 16)); + dbfFields.add(new DBFField("PRIORITY", DBFDataType.CHARACTER, 1)); + dbfFields.add(new DBFField("SBANKCODE", DBFDataType.CHARACTER, 12)); + dbfFields.add(new DBFField("C_ACC_DEB", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SBANKNAM1", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SBANKNAM2", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SBANKNAM3", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SBANKNAM4", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SBANKNAM5", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("RBANKCODE", DBFDataType.CHARACTER, 12)); + dbfFields.add(new DBFField("C_ACC_CRED", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("RBANKNAM1", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("RBANKNAM2", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("RBANKNAM3", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("RBANKNAM4", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("RBANKNAM5", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("PAY_DATE", DBFDataType.CHARACTER, 254)); + dbfFields.add(new DBFField("EXT_DATE", DBFDataType.CHARACTER, 254)); + dbfFields.add(new DBFField("PAY_VAL", DBFDataType.CHARACTER, 12)); + dbfFields.add(new DBFField("SUM_DEB", DBFDataType.CHARACTER, 254)); + dbfFields.add(new DBFField("SCLIENTN1", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SCLIENTN2", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SCLIENTN3", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SCLIENTN4", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SC_CODE", DBFDataType.CHARACTER, 12)); + dbfFields.add(new DBFField("ACC_DEB", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("RCLIENTN1", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("RCLIENTN2", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("RCLIENTN3", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("RCLIENTN4", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("ACC_KR_1", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("ACC_KR_2", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SP_CODE", DBFDataType.CHARACTER, 2)); + dbfFields.add(new DBFField("SPECIF_1", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SPECIF_2", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SPECIF_3", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SPECIF_4", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SPECIF_5", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SPECIF_6", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SEND_TYPE", DBFDataType.CHARACTER, 10)); + dbfFields.add(new DBFField("SERVDATE", DBFDataType.CHARACTER, 8)); + dbfFields.add(new DBFField("DOC_RESULT", DBFDataType.CHARACTER, 2)); + dbfFields.add(new DBFField("IMP_RESULT", DBFDataType.CHARACTER, 3)); + return dbfFields.toArray(DBFField[]::new); + } + +} diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF05_Converter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF05_Converter.java new file mode 100644 index 000000000..f54b7c48f --- /dev/null +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF05_Converter.java @@ -0,0 +1,33 @@ +package ru.spcex.clearing.dbf.exporter.services.converters; + +import com.linuxense.javadbf.DBFDataType; +import com.linuxense.javadbf.DBFField; +import org.springframework.stereotype.Service; +import ru.clearing.classes.statics.data.sdf.SDf05; + +import java.util.LinkedList; +import java.util.List; + +@Service +public class S_DF05_Converter extends DFConverter { + @Override + public Object[] toObjectArray(SDf05 entity) { + List values = new LinkedList<>(); + values.add(typeMatch(entity.getTp())); + values.add(typeMatch(entity.getDt())); + values.add(typeMatch(entity.getTm())); + values.add(typeMatch(entity.getPr())); + return values.toArray(Object[]::new); + } + + @Override + public DBFField[] getDBFHeaders() { + List dbfFields = new LinkedList<>(); + dbfFields.add(new DBFField("TP", DBFDataType.NUMERIC, 32, 18)); + dbfFields.add(new DBFField("DT", DBFDataType.DATE)); + dbfFields.add(new DBFField("TM", DBFDataType.DATE)); + dbfFields.add(new DBFField("PR", DBFDataType.CHARACTER, 1)); + return dbfFields.toArray(DBFField[]::new); + } + +} diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF08_Converter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF08_Converter.java index 5c6845cb8..48bfbd4f9 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF08_Converter.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF08_Converter.java @@ -15,18 +15,14 @@ public class S_DF08_Converter extends DFConverter { List values = new LinkedList<>(); values.add(typeMatch(entity.getNumber())); values.add(typeMatch(entity.getDatetime())); - values.add(typeMatch(entity.getGenerationTime())); - values.add(typeMatch(entity.getGenerationId())); return values.toArray(Object[]::new); } @Override public DBFField[] getDBFHeaders() { List dbfFields = new LinkedList<>(); - dbfFields.add(new DBFField("number", DBFDataType.NUMERIC, 32)); - dbfFields.add(new DBFField("datetime", DBFDataType.DATE)); - dbfFields.add(new DBFField("gen_time", DBFDataType.DATE)); - dbfFields.add(new DBFField("gen_id", DBFDataType.NUMERIC)); + dbfFields.add(new DBFField("NUMBER", DBFDataType.NUMERIC, 32, 18)); + dbfFields.add(new DBFField("DATETIME", DBFDataType.DATE)); return dbfFields.toArray(DBFField[]::new); } diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF10_Converter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF10_Converter.java new file mode 100644 index 000000000..05cfaccd0 --- /dev/null +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF10_Converter.java @@ -0,0 +1,41 @@ +package ru.spcex.clearing.dbf.exporter.services.converters; + +import com.linuxense.javadbf.DBFDataType; +import com.linuxense.javadbf.DBFField; +import org.springframework.stereotype.Service; +import ru.clearing.classes.statics.data.sdf.SDf10; + +import java.util.LinkedList; +import java.util.List; + +@Service +public class S_DF10_Converter extends DFConverter { + @Override + public Object[] toObjectArray(SDf10 entity) { + List values = new LinkedList<>(); + values.add(typeMatch(entity.getAccount())); + values.add(typeMatch(entity.getSum())); + values.add(typeMatch(entity.getMarket())); + values.add(typeMatch(entity.getType())); + values.add(typeMatch(entity.getNumber())); + values.add(typeMatch(entity.getINN())); + values.add(typeMatch(entity.getResult())); +// values.add(typeMatch(entity.getIn_s_df09_id())); + return values.toArray(Object[]::new); + } + + @Override + public DBFField[] getDBFHeaders() { + List dbfFields = new LinkedList<>(); + dbfFields.add(new DBFField("ACCOUNT", DBFDataType.CHARACTER, 20)); + dbfFields.add(new DBFField("SUM", DBFDataType.NUMERIC, 32, 18)); + dbfFields.add(new DBFField("MARKET", DBFDataType.CHARACTER, 1)); + dbfFields.add(new DBFField("TYPE", DBFDataType.CHARACTER, 1)); + dbfFields.add(new DBFField("NUMBER", DBFDataType.NUMERIC, 32, 18)); + dbfFields.add(new DBFField("_I_N_N", DBFDataType.NUMERIC, 32, 18)); + dbfFields.add(new DBFField("RESULT", DBFDataType.CHARACTER, 3)); +// dbfFields.add(new DBFField("INSDF09_ID", DBFDataType.NUMERIC)); + return dbfFields.toArray(DBFField[]::new); + } + +} diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF11_Converter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF11_Converter.java new file mode 100644 index 000000000..e54e55a00 --- /dev/null +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF11_Converter.java @@ -0,0 +1,115 @@ +package ru.spcex.clearing.dbf.exporter.services.converters; + +import com.linuxense.javadbf.DBFDataType; +import com.linuxense.javadbf.DBFField; +import org.springframework.stereotype.Service; +import ru.clearing.classes.statics.data.sdf.SDf11; + +import java.util.LinkedList; +import java.util.List; + +@Service +public class S_DF11_Converter extends DFConverter { + @Override + public Object[] toObjectArray(SDf11 entity) { + List values = new LinkedList<>(); + values.add(typeMatch(entity.getSeg_type())); + values.add(typeMatch(entity.getDoc_type())); + values.add(typeMatch(entity.getDocnm_ref())); + values.add(typeMatch(entity.getDocnmprev())); + values.add(typeMatch(entity.getPriority())); + values.add(typeMatch(entity.getSbankcode())); + values.add(typeMatch(entity.getC_acc_deb())); + values.add(typeMatch(entity.getSbanknam1())); + values.add(typeMatch(entity.getSbanknam2())); + values.add(typeMatch(entity.getSbanknam3())); + values.add(typeMatch(entity.getSbanknam4())); + values.add(typeMatch(entity.getSbanknam5())); + values.add(typeMatch(entity.getRbankcode())); + values.add(typeMatch(entity.getC_acc_cred())); + values.add(typeMatch(entity.getRbanknam1())); + values.add(typeMatch(entity.getRbanknam2())); + values.add(typeMatch(entity.getRbanknam3())); + values.add(typeMatch(entity.getRbanknam4())); + values.add(typeMatch(entity.getRbanknam5())); + values.add(typeMatch(entity.getPay_date())); + values.add(typeMatch(entity.getExt_date())); + values.add(typeMatch(entity.getPay_val())); + values.add(typeMatch(entity.getSum_deb())); + values.add(typeMatch(entity.getSclientn1())); + values.add(typeMatch(entity.getSclientn2())); + values.add(typeMatch(entity.getSclientn3())); + values.add(typeMatch(entity.getSclientn4())); + values.add(typeMatch(entity.getSc_code())); + values.add(typeMatch(entity.getAcc_deb())); + values.add(typeMatch(entity.getRclientn1())); + values.add(typeMatch(entity.getRclientn2())); + values.add(typeMatch(entity.getRclientn3())); + values.add(typeMatch(entity.getRclientn4())); + values.add(typeMatch(entity.getAcc_kr_1())); + values.add(typeMatch(entity.getAcc_kr_2())); + values.add(typeMatch(entity.getSp_code())); + values.add(typeMatch(entity.getSpecif_1())); + values.add(typeMatch(entity.getSpecif_2())); + values.add(typeMatch(entity.getSpecif_3())); + values.add(typeMatch(entity.getSpecif_4())); + values.add(typeMatch(entity.getSpecif_5())); + values.add(typeMatch(entity.getSpecif_6())); + values.add(typeMatch(entity.getSend_type())); + values.add(typeMatch(entity.getServdate())); + values.add(typeMatch(entity.getDoc_result())); + return values.toArray(Object[]::new); + } + + @Override + public DBFField[] getDBFHeaders() { + List dbfFields = new LinkedList<>(); + dbfFields.add(new DBFField("SEG_TYPE", DBFDataType.CHARACTER, 1)); + dbfFields.add(new DBFField("DOC_TYPE", DBFDataType.CHARACTER, 254)); + dbfFields.add(new DBFField("DOCNM_REF", DBFDataType.CHARACTER, 16)); + dbfFields.add(new DBFField("DOCNMPREV", DBFDataType.CHARACTER, 16)); + dbfFields.add(new DBFField("PRIORITY", DBFDataType.CHARACTER, 1)); + dbfFields.add(new DBFField("SBANKCODE", DBFDataType.CHARACTER, 12)); + dbfFields.add(new DBFField("C_ACC_DEB", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SBANKNAM1", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SBANKNAM2", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SBANKNAM3", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SBANKNAM4", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SBANKNAM5", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("RBANKCODE", DBFDataType.CHARACTER, 12)); + dbfFields.add(new DBFField("C_ACC_CRED", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("RBANKNAM1", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("RBANKNAM2", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("RBANKNAM3", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("RBANKNAM4", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("RBANKNAM5", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("PAY_DATE", DBFDataType.CHARACTER, 254)); + dbfFields.add(new DBFField("EXT_DATE", DBFDataType.CHARACTER, 254)); + dbfFields.add(new DBFField("PAY_VAL", DBFDataType.CHARACTER, 12)); + dbfFields.add(new DBFField("SUM_DEB", DBFDataType.CHARACTER, 254)); + dbfFields.add(new DBFField("SCLIENTN1", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SCLIENTN2", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SCLIENTN3", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SCLIENTN4", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SC_CODE", DBFDataType.CHARACTER, 12)); + dbfFields.add(new DBFField("ACC_DEB", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("RCLIENTN1", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("RCLIENTN2", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("RCLIENTN3", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("RCLIENTN4", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("ACC_KR_1", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("ACC_KR_2", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SP_CODE", DBFDataType.CHARACTER, 2)); + dbfFields.add(new DBFField("SPECIF_1", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SPECIF_2", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SPECIF_3", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SPECIF_4", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SPECIF_5", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SPECIF_6", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SEND_TYPE", DBFDataType.CHARACTER, 10)); + dbfFields.add(new DBFField("SERVDATE", DBFDataType.CHARACTER, 8)); + dbfFields.add(new DBFField("DOC_RESULT", DBFDataType.CHARACTER, 2)); + return dbfFields.toArray(DBFField[]::new); + } + +} diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF12_Converter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF12_Converter.java deleted file mode 100644 index 53926b58e..000000000 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF12_Converter.java +++ /dev/null @@ -1,37 +0,0 @@ -package ru.spcex.clearing.dbf.exporter.services.converters; - -import com.linuxense.javadbf.DBFDataType; -import com.linuxense.javadbf.DBFField; -import org.springframework.stereotype.Service; -import ru.clearing.classes.statics.data.sdf.SDf12; - -import java.util.LinkedList; -import java.util.List; - -@Service -public class S_DF12_Converter extends DFConverter { - @Override - public Object[] toObjectArray(SDf12 entity) { - List values = new LinkedList<>(); - values.add(typeMatch(entity.getAccount())); - values.add(typeMatch(entity.getDeal())); - values.add(typeMatch(entity.getStatus())); - values.add(typeMatch(entity.getFileName())); - values.add(typeMatch(entity.getGenerationTime())); - values.add(typeMatch(entity.getGenerationId())); - return values.toArray(Object[]::new); - } - - @Override - public DBFField[] getDBFHeaders() { - List dbfFields = new LinkedList<>(); - dbfFields.add(new DBFField("account", DBFDataType.CHARACTER, 25)); - dbfFields.add(new DBFField("deal", DBFDataType.CHARACTER, 25)); - dbfFields.add(new DBFField("status", DBFDataType.NUMERIC, 32)); - dbfFields.add(new DBFField("file_name", DBFDataType.CHARACTER, 254)); - dbfFields.add(new DBFField("gen_time", DBFDataType.DATE)); - dbfFields.add(new DBFField("gen_id", DBFDataType.NUMERIC)); - return dbfFields.toArray(DBFField[]::new); - } - -} diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF13_Converter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF13_Converter.java new file mode 100644 index 000000000..81ee56697 --- /dev/null +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF13_Converter.java @@ -0,0 +1,113 @@ +package ru.spcex.clearing.dbf.exporter.services.converters; + +import com.linuxense.javadbf.DBFDataType; +import com.linuxense.javadbf.DBFField; +import org.springframework.stereotype.Service; +import ru.clearing.classes.statics.data.sdf.SDf13; + +import java.util.LinkedList; +import java.util.List; + +@Service +public class S_DF13_Converter extends DFConverter { + @Override + public Object[] toObjectArray(SDf13 entity) { + List values = new LinkedList<>(); + values.add(typeMatch(entity.getSeg_type())); + values.add(typeMatch(entity.getDoc_type())); + values.add(typeMatch(entity.getDocnm_ref())); + values.add(typeMatch(entity.getDocnmprev())); + values.add(typeMatch(entity.getPriority())); + values.add(typeMatch(entity.getSbankcode())); + values.add(typeMatch(entity.getC_acc_deb())); + values.add(typeMatch(entity.getSbanknam1())); + values.add(typeMatch(entity.getSbanknam2())); + values.add(typeMatch(entity.getSbanknam3())); + values.add(typeMatch(entity.getSbanknam4())); + values.add(typeMatch(entity.getSbanknam5())); + values.add(typeMatch(entity.getRbankcode())); + values.add(typeMatch(entity.getC_acc_cred())); + values.add(typeMatch(entity.getRbanknam1())); + values.add(typeMatch(entity.getOp_type())); + values.add(typeMatch(entity.getOp_order())); + values.add(typeMatch(entity.getRbanknam4())); + values.add(typeMatch(entity.getRbanknam5())); + values.add(typeMatch(entity.getPay_date())); + values.add(typeMatch(entity.getExt_date())); + values.add(typeMatch(entity.getPay_val())); + values.add(typeMatch(entity.getSum_deb())); + values.add(typeMatch(entity.getSclientn1())); + values.add(typeMatch(entity.getInn_deb())); + values.add(typeMatch(entity.getKpp_deb())); + values.add(typeMatch(entity.getSclientn4())); + values.add(typeMatch(entity.getSc_code())); + values.add(typeMatch(entity.getAcc_deb())); + values.add(typeMatch(entity.getRclientn1())); + values.add(typeMatch(entity.getKpp_cred())); + values.add(typeMatch(entity.getRclientn4())); + values.add(typeMatch(entity.getAcc_kr_1())); + values.add(typeMatch(entity.getAcc_kr_2())); + values.add(typeMatch(entity.getSp_code())); + values.add(typeMatch(entity.getSpecif_1())); + values.add(typeMatch(entity.getSpecif_2())); + values.add(typeMatch(entity.getSpecif_3())); + values.add(typeMatch(entity.getSpecif_4())); + values.add(typeMatch(entity.getSpecif_5())); + values.add(typeMatch(entity.getSpecif_6())); + values.add(typeMatch(entity.getSend_type())); + values.add(typeMatch(entity.getServdate())); + values.add(typeMatch(entity.getDoc_result())); + return values.toArray(Object[]::new); + } + + @Override + public DBFField[] getDBFHeaders() { + List dbfFields = new LinkedList<>(); + dbfFields.add(new DBFField("SEG_TYPE", DBFDataType.CHARACTER, 1)); + dbfFields.add(new DBFField("DOC_TYPE", DBFDataType.CHARACTER, 254)); + dbfFields.add(new DBFField("DOCNM_REF", DBFDataType.CHARACTER, 16)); + dbfFields.add(new DBFField("DOCNMPREV", DBFDataType.CHARACTER, 16)); + dbfFields.add(new DBFField("PRIORITY", DBFDataType.CHARACTER, 1)); + dbfFields.add(new DBFField("SBANKCODE", DBFDataType.CHARACTER, 12)); + dbfFields.add(new DBFField("C_ACC_DEB", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SBANKNAM1", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SBANKNAM2", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SBANKNAM3", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SBANKNAM4", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SBANKNAM5", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("RBANKCODE", DBFDataType.CHARACTER, 12)); + dbfFields.add(new DBFField("C_ACC_CRED", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("RBANKNAM1", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("OP_TYPE", DBFDataType.CHARACTER, 2)); + dbfFields.add(new DBFField("OP_ORDER", DBFDataType.CHARACTER, 1)); + dbfFields.add(new DBFField("RBANKNAM4", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("RBANKNAM5", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("PAY_DATE", DBFDataType.CHARACTER, 254)); + dbfFields.add(new DBFField("EXT_DATE", DBFDataType.CHARACTER, 254)); + dbfFields.add(new DBFField("PAY_VAL", DBFDataType.CHARACTER, 12)); + dbfFields.add(new DBFField("SUM_DEB", DBFDataType.CHARACTER, 254)); + dbfFields.add(new DBFField("SCLIENTN1", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("INN_DEB", DBFDataType.CHARACTER, 12)); + dbfFields.add(new DBFField("KPP_DEB", DBFDataType.CHARACTER, 9)); + dbfFields.add(new DBFField("SCLIENTN4", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SC_CODE", DBFDataType.CHARACTER, 12)); + dbfFields.add(new DBFField("ACC_DEB", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("RCLIENTN1", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("KPP_CRED", DBFDataType.CHARACTER, 9)); + dbfFields.add(new DBFField("RCLIENTN4", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("ACC_KR_1", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("ACC_KR_2", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SP_CODE", DBFDataType.CHARACTER, 2)); + dbfFields.add(new DBFField("SPECIF_1", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SPECIF_2", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SPECIF_3", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SPECIF_4", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SPECIF_5", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SPECIF_6", DBFDataType.CHARACTER, 35)); + dbfFields.add(new DBFField("SEND_TYPE", DBFDataType.CHARACTER, 10)); + dbfFields.add(new DBFField("SERVDATE", DBFDataType.CHARACTER, 8)); + dbfFields.add(new DBFField("DOC_RESULT", DBFDataType.CHARACTER, 2)); + return dbfFields.toArray(DBFField[]::new); + } + +} diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF16_Converter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF16_Converter.java deleted file mode 100644 index 9bbba8576..000000000 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF16_Converter.java +++ /dev/null @@ -1,43 +0,0 @@ -package ru.spcex.clearing.dbf.exporter.services.converters; - -import com.linuxense.javadbf.DBFDataType; -import com.linuxense.javadbf.DBFField; -import org.springframework.stereotype.Service; -import ru.clearing.classes.statics.data.sdf.SDf16; - -import java.util.LinkedList; -import java.util.List; - -@Service -public class S_DF16_Converter extends DFConverter { - @Override - public Object[] toObjectArray(SDf16 entity) { - List values = new LinkedList<>(); - values.add(typeMatch(entity.getDate())); - values.add(typeMatch(entity.getAccount())); - values.add(typeMatch(entity.getSum())); - values.add(typeMatch(entity.getMarket())); - values.add(typeMatch(entity.getType())); - values.add(typeMatch(entity.getNumber())); - values.add(typeMatch(entity.getFileName())); - values.add(typeMatch(entity.getGenerationTime())); - values.add(typeMatch(entity.getGenerationId())); - return values.toArray(Object[]::new); - } - - @Override - public DBFField[] getDBFHeaders() { - List dbfFields = new LinkedList<>(); - dbfFields.add(new DBFField("date", DBFDataType.DATE)); - dbfFields.add(new DBFField("account", DBFDataType.CHARACTER, 20)); - dbfFields.add(new DBFField("sum", DBFDataType.NUMERIC, 32)); - dbfFields.add(new DBFField("market", DBFDataType.CHARACTER, 1)); - dbfFields.add(new DBFField("type", DBFDataType.CHARACTER, 1)); - dbfFields.add(new DBFField("number", DBFDataType.NUMERIC, 32)); - dbfFields.add(new DBFField("file_name", DBFDataType.CHARACTER, 254)); - dbfFields.add(new DBFField("gen_time", DBFDataType.DATE)); - dbfFields.add(new DBFField("gen_id", DBFDataType.NUMERIC)); - return dbfFields.toArray(DBFField[]::new); - } - -} diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF17_Converter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF17_Converter.java new file mode 100644 index 000000000..c64a2bcb3 --- /dev/null +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF17_Converter.java @@ -0,0 +1,45 @@ +package ru.spcex.clearing.dbf.exporter.services.converters; + +import com.linuxense.javadbf.DBFDataType; +import com.linuxense.javadbf.DBFField; +import org.springframework.stereotype.Service; +import ru.clearing.classes.statics.data.sdf.SDf17; + +import java.util.LinkedList; +import java.util.List; + +@Service +public class S_DF17_Converter extends DFConverter { + @Override + public Object[] toObjectArray(SDf17 entity) { + List values = new LinkedList<>(); + values.add(typeMatch(entity.getAccount())); + values.add(typeMatch(entity.getSum())); + values.add(typeMatch(entity.getMarket())); + values.add(typeMatch(entity.getType())); + values.add(typeMatch(entity.getINN())); + values.add(typeMatch(entity.getBIC())); + values.add(typeMatch(entity.getSPEC())); + values.add(typeMatch(entity.getNumber())); + values.add(typeMatch(entity.getResult())); +// values.add(typeMatch(entity.getIn_s_df16_id())); + return values.toArray(Object[]::new); + } + + @Override + public DBFField[] getDBFHeaders() { + List dbfFields = new LinkedList<>(); + dbfFields.add(new DBFField("ACCOUNT", DBFDataType.CHARACTER, 20)); + dbfFields.add(new DBFField("SUM", DBFDataType.NUMERIC, 32, 18)); + dbfFields.add(new DBFField("MARKET", DBFDataType.CHARACTER, 1)); + dbfFields.add(new DBFField("TYPE", DBFDataType.CHARACTER, 1)); + dbfFields.add(new DBFField("_I_N_N", DBFDataType.NUMERIC, 32, 18)); + dbfFields.add(new DBFField("_B_I_C", DBFDataType.NUMERIC, 32, 18)); + dbfFields.add(new DBFField("_S_P_E_C", DBFDataType.NUMERIC, 32, 18)); + dbfFields.add(new DBFField("NUMBER", DBFDataType.NUMERIC, 32, 18)); + dbfFields.add(new DBFField("RESULT", DBFDataType.CHARACTER, 3)); +// dbfFields.add(new DBFField("INSDF16_ID", DBFDataType.NUMERIC)); + return dbfFields.toArray(DBFField[]::new); + } + +} diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF18_Converter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF18_Converter.java index 19193a85c..cd2540b4b 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF18_Converter.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF18_Converter.java @@ -19,20 +19,20 @@ public class S_DF18_Converter extends DFConverter { values.add(typeMatch(entity.getResult())); values.add(typeMatch(entity.getGenerationTime())); values.add(typeMatch(entity.getGenerationId())); - values.add(typeMatch(entity.getInSDf12Id())); +// values.add(typeMatch(entity.getInSDf12Id())); return values.toArray(Object[]::new); } @Override public DBFField[] getDBFHeaders() { List dbfFields = new LinkedList<>(); - dbfFields.add(new DBFField("account", DBFDataType.CHARACTER, 25)); - dbfFields.add(new DBFField("deal", DBFDataType.CHARACTER, 4)); - dbfFields.add(new DBFField("status", DBFDataType.NUMERIC, 32)); - dbfFields.add(new DBFField("result", DBFDataType.NUMERIC, 32)); - dbfFields.add(new DBFField("gen_time", DBFDataType.DATE)); - dbfFields.add(new DBFField("gen_id", DBFDataType.NUMERIC)); - dbfFields.add(new DBFField("insdf12_id", DBFDataType.NUMERIC)); + dbfFields.add(new DBFField("ACCOUNT", DBFDataType.CHARACTER, 25)); + dbfFields.add(new DBFField("DEAL", DBFDataType.CHARACTER, 4)); + dbfFields.add(new DBFField("STATUS", DBFDataType.NUMERIC, 32, 18)); + dbfFields.add(new DBFField("RESULT", DBFDataType.NUMERIC, 32, 18)); + dbfFields.add(new DBFField("GEN_TIME", DBFDataType.DATE)); + dbfFields.add(new DBFField("GEN_ID", DBFDataType.NUMERIC)); +// dbfFields.add(new DBFField("INSDF12_ID", DBFDataType.NUMERIC)); return dbfFields.toArray(DBFField[]::new); } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/ObjectBaseMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/ObjectBaseMapStore.java index c9b65f572..f89460479 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/ObjectBaseMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/ObjectBaseMapStore.java @@ -7,8 +7,12 @@ import ru.spcex.platform.classes.base.SpcexObjectBase; import java.sql.ResultSet; import java.sql.SQLException; +import java.sql.Time; import java.sql.Timestamp; import java.time.Instant; +import java.time.LocalDate; +import java.time.LocalTime; +import java.time.ZoneId; import java.util.*; public abstract class ObjectBaseMapStore extends SimpleObjectMapStore { @@ -82,4 +86,14 @@ public abstract class ObjectBaseMapStore extends Simp Timestamp date = rs.getTimestamp(column); return date != null ? date.toInstant() : null; } + + protected LocalDate getLocalDateFromSqlDate(ResultSet rs, String column) throws SQLException { + Date date = rs.getDate(column); + return date != null ? Instant.ofEpochMilli(date.getTime()).atZone(ZoneId.systemDefault()).toLocalDate() : null; + } + + protected LocalTime getLocalTimeFromSqlTime(ResultSet rs, String column) throws SQLException { + Time time = rs.getTime(column); + return time != null ? time.toLocalTime() : null; + } } 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 new file mode 100644 index 000000000..6bac1c8ee --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf03MapStore.java @@ -0,0 +1,151 @@ +package ru.spcex.clearing.imdg.object; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.sdf.SDf03; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.imdg.base.TemplateMapStore; +import ru.spcex.clearing.imdg.utils.TimeUtil; + +import java.sql.ResultSet; +import java.sql.SQLException; + +@Component +public class SDf03MapStore extends TemplateMapStore { + + public SDf03MapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_SDf03; + } + + @Override + public String getTableName() { + return "S_DF03"; + } + + @Override + public String[] getFields() { + return new String[] { + "ID", "SEG_TYPE", "DOC_TYPE", "DOCNM_REF", "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" + }; + } + + @Override + public SDf03 objectReader(ResultSet resultSet) throws SQLException { + SDf03 object = new SDf03(); + 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.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.setImp_result(resultSet.getObject("IMP_RESULT", String.class)); + object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); + object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); + return object; + } + + @Override + public Object[] objectToField(SDf03 object) { + Object[] args = new Object[]{ + object.getId(), + object.getSeg_type(), + object.getDoc_type(), + object.getDocnm_ref(), + 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.getImp_result(), + TimeUtil.fromInstant(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/SDf05MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf05MapStore.java new file mode 100644 index 000000000..01bb8340a --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf05MapStore.java @@ -0,0 +1,65 @@ +package ru.spcex.clearing.imdg.object; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.sdf.SDf05; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.imdg.base.TemplateMapStore; +import ru.spcex.clearing.imdg.utils.TimeUtil; + +import java.math.BigDecimal; +import java.sql.ResultSet; +import java.sql.SQLException; + +@Component +public class SDf05MapStore extends TemplateMapStore { + + public SDf05MapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_SDf05; + } + + @Override + public String getTableName() { + return "S_DF05"; + } + + @Override + public String[] getFields() { + return new String[]{ + "ID", "TP", "DT", "TM", "PR", "GENERATION_TIME", "GENERATION_ID" + }; + } + + @Override + public SDf05 objectReader(ResultSet resultSet) throws SQLException { + SDf05 object = new SDf05(); + object.setId(resultSet.getObject("ID", Long.class)); + object.setTp(resultSet.getObject("TP", BigDecimal.class)); + object.setDt(getLocalDateFromSqlDate(resultSet, "DT")); + object.setTm(getLocalTimeFromSqlTime(resultSet, "TM")); + object.setPr(resultSet.getObject("PR", String.class)); + object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); + object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); + return object; + } + + @Override + public Object[] objectToField(SDf05 object) { + Object[] args = new Object[]{ + object.getId(), + object.getTp(), + TimeUtil.from(object.getDt()), + TimeUtil.from(object.getTm()), + object.getPr(), + TimeUtil.fromInstant(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/SDf10MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf10MapStore.java new file mode 100644 index 000000000..8400341f7 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf10MapStore.java @@ -0,0 +1,72 @@ +package ru.spcex.clearing.imdg.object; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.sdf.SDf10; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.imdg.base.TemplateMapStore; +import ru.spcex.clearing.imdg.utils.TimeUtil; + +import java.math.BigDecimal; +import java.sql.ResultSet; +import java.sql.SQLException; + +@Component +public class SDf10MapStore extends TemplateMapStore { + + public SDf10MapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_SDf10; + } + + @Override + public String getTableName() { + return "S_DF10"; + } + + @Override + public String[] getFields() { + return new String[]{ + "ID", "ACCOUNT", "SUM", "MARKET", "TYPE", "NUMBER", "_I_N_N", + "RESULT", "GENERATION_TIME", "GENERATION_ID", "IN_S_DF09_ID" + }; + } + + @Override + 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.setMarket(resultSet.getObject("MARKET", String.class)); + object.setType(resultSet.getObject("TYPE", String.class)); + object.setNumber(resultSet.getObject("NUMBER", BigDecimal.class)); + object.setINN(resultSet.getObject("_I_N_N", BigDecimal.class)); + object.setResult(resultSet.getObject("RESULT", String.class)); + object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); + object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); + object.setIn_s_df09_id(resultSet.getObject("IN_S_DF09_ID", Long.class)); + return object; + } + + @Override + public Object[] objectToField(SDf10 object) { + Object[] args = new Object[]{ + object.getId(), + object.getAccount(), + object.getMarket(), + object.getType(), + object.getNumber(), + object.getINN(), + object.getResult(), + TimeUtil.fromInstant(object.getGenerationTime()), + object.getGenerationId(), + object.getIn_s_df09_id() + }; + 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 new file mode 100644 index 000000000..c9772ae51 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf11MapStore.java @@ -0,0 +1,151 @@ +package ru.spcex.clearing.imdg.object; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.sdf.SDf11; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.imdg.base.TemplateMapStore; +import ru.spcex.clearing.imdg.utils.TimeUtil; + +import java.sql.ResultSet; +import java.sql.SQLException; + +@Component +public class SDf11MapStore extends TemplateMapStore { + + public SDf11MapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_SDf11; + } + + @Override + public String getTableName() { + return "S_DF11"; + } + + @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" + }; + } + + @Override + 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.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); + object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); + return object; + } + + @Override + 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(), + TimeUtil.fromInstant(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/SDf13MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf13MapStore.java new file mode 100644 index 000000000..6ac85f0df --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf13MapStore.java @@ -0,0 +1,149 @@ +package ru.spcex.clearing.imdg.object; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.sdf.SDf13; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.imdg.base.TemplateMapStore; +import ru.spcex.clearing.imdg.utils.TimeUtil; + +import java.sql.ResultSet; +import java.sql.SQLException; + +@Component +public class SDf13MapStore extends TemplateMapStore { + + public SDf13MapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_SDf13; + } + + @Override + public String getTableName() { + return "S_DF13"; + } + + @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", "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" + }; + } + + @Override + 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.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.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); + object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); + return object; + } + + @Override + 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.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(), + TimeUtil.fromInstant(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/SDf17MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf17MapStore.java new file mode 100644 index 000000000..66b7a6518 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf17MapStore.java @@ -0,0 +1,77 @@ +package ru.spcex.clearing.imdg.object; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.sdf.SDf17; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.imdg.base.TemplateMapStore; +import ru.spcex.clearing.imdg.utils.TimeUtil; + +import java.math.BigDecimal; +import java.sql.ResultSet; +import java.sql.SQLException; + +@Component +public class SDf17MapStore extends TemplateMapStore { + + public SDf17MapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_SDf17; + } + + @Override + public String getTableName() { + return "S_DF17"; + } + + @Override + public String[] getFields() { + return new String[]{ + "ID", "ACCOUNT", "SUM", "MARKET", "TYPE", "_I_N_N", "_B_I_C", "_S_P_E_C", "NUMBER", "RESULT", "GENERATION_TIME", "GENERATION_ID", "IN_S_DF16_ID" + }; + } + + @Override + public SDf17 objectReader(ResultSet resultSet) throws SQLException { + SDf17 object = new SDf17(); + 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.setINN(resultSet.getObject("_I_N_N", BigDecimal.class)); + object.setBIC(resultSet.getObject("_B_I_C", BigDecimal.class)); + object.setSPEC(resultSet.getObject("_S_P_E_C", String.class)); + object.setNumber(resultSet.getObject("NUMBER", BigDecimal.class)); + object.setResult(resultSet.getObject("RESULT_CODE", String.class)); + object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); + object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); + object.setIn_s_df16_id(resultSet.getObject("IN_S_DF16_ID", Long.class)); + return object; + } + + @Override + public Object[] objectToField(SDf17 object) { + Object[] args = new Object[]{ + object.getId(), + object.getAccount(), + object.getSum(), + object.getMarket(), + object.getType(), + object.getINN(), + object.getBIC(), + object.getSPEC(), + object.getNumber(), + object.getResult(), + TimeUtil.fromInstant(object.getGenerationTime()), + object.getGenerationId(), + object.getIn_s_df16_id() + }; + return args; + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/utils/TimeUtil.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/utils/TimeUtil.java index 4cad30876..0bf9cd1fd 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/utils/TimeUtil.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/utils/TimeUtil.java @@ -4,6 +4,7 @@ import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.sql.Time; import java.time.*; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; @@ -139,6 +140,10 @@ public class TimeUtil { return localDateTime != null ? Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant()) : null; } + public static Time from(LocalTime localTime) { + return localTime != null ? Time.valueOf(localTime) : null; + } + public static Date from(LocalDate localDate) { return localDate != null ? Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant()) : null; } 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 fccab0989..c51576ca2 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 @@ -43,6 +43,13 @@ public final class IMDGDistributedNames { public static final String Map_Timetable = "Map_Timetable"; public static final String Map_InDocumentJournal = "Map_InDocumentJournal"; public static final String Map_OutDocumentJournal = "Map_OutDocumentJournal"; + + public static final String Map_SDf03 = "Map_SDf03"; + public static final String Map_SDf05 = "Map_SDf05"; + public static final String Map_SDf10 = "Map_SDf10"; + public static final String Map_SDf11 = "Map_SDf11"; + public static final String Map_SDf13 = "Map_SDf13"; + public static final String Map_SDf17 = "Map_SDf17"; public static final String Map_SDf16 = "Map_SDf16"; public static final String Map_SDf08 = "Map_SDf08"; public static final String Map_SDf02 = "Map_SDf02";