diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf04.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf04.java new file mode 100644 index 000000000..4f651e876 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf04.java @@ -0,0 +1,457 @@ +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 SDf04 extends SpcexObjectBase { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private String seg_type; + private String doc_type; + private String docnm_ref; + private String docnmprev; + private String priority; + private String sbankcode; + private String c_acc_deb; + private String sbanknam1; + private String sbanknam2; + private String sbanknam3; + private String sbanknam4; + private String sbanknam5; + private String rbankcode; + private String c_acc_cred; + private String rbanknam1; + private String rbanknam2; + private String rbanknam3; + private String rbanknam4; + private String rbanknam5; + private String pay_date; + private String ext_date; + private String pay_val; + private String sum_deb; + private String sclientn1; + private String sclientn2; + private String sclientn3; + private String sclientn4; + private String sc_code; + private String acc_deb; + private String rclientn1; + private String rclientn2; + private String rclientn3; + private String rclientn4; + private String acc_kr_1; + private String acc_kr_2; + private String sp_code; + private String specif_1; + private String specif_2; + private String specif_3; + private String specif_4; + private String specif_5; + private String specif_6; + private String send_type; + private String servdate; + private String doc_result; + private String imp_result; + private String file_name; + 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 String getImp_result() { + return imp_result; + } + + public void setImp_result(String imp_result) { + this.imp_result = imp_result; + } + + public String getFile_name() { + return file_name; + } + + public void setFile_name(String file_name) { + this.file_name = file_name; + } + + 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/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/controller/ImporterController.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/controller/ImporterController.java index a09fa31d9..5dcfe1a97 100644 --- a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/controller/ImporterController.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/controller/ImporterController.java @@ -28,7 +28,7 @@ public class ImporterController implements InitializingBean { return "importer controller test method"; } - @RequestMapping(method = RequestMethod.GET, path = "/check", produces = MediaType.TEXT_PLAIN_VALUE) + @RequestMapping(method = RequestMethod.GET, path = "/import", produces = MediaType.TEXT_PLAIN_VALUE) @ResponseBody public String checkFolder() { log.info("Call check method for importer controller"); diff --git a/clearing-parent/imdg/pom.xml b/clearing-parent/imdg/pom.xml index 79b0e9486..c9082ec35 100644 --- a/clearing-parent/imdg/pom.xml +++ b/clearing-parent/imdg/pom.xml @@ -64,6 +64,10 @@ hazelcast-all ${external_libraries.hazelcast.version} + + ru.spcex.platform + platform-imdg-api + ru.spcex.platform platform-imdg-api-hazelcast-impl diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf04MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf04MapStore.java new file mode 100644 index 000000000..bfd65f662 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf04MapStore.java @@ -0,0 +1,154 @@ +package ru.spcex.clearing.imdg.object; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.sdf.SDf04; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.imdg.base.TemplateMapStore; + +import java.sql.ResultSet; +import java.sql.SQLException; + +@Component +public class SDf04MapStore extends TemplateMapStore { + + public SDf04MapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_SDf04; + } + + @Override + public String getTableName() { + return "S_DF04"; + } + + @Override + public String[] getFields() { + return new String[]{ + "id", "seg_type", "doc_type", "docnm_ref", "docnmprev", "priority", "sbankcode", "c_acc_deb", "sbanknam1", + "sbanknam2", "sbanknam3", "sbanknam4", "sbanknam5", "rbankcode", "c_acc_cred", "rbanknam1", "rbanknam2", + "rbanknam3", "rbanknam4", "rbanknam5", "pay_date", "ext_date", "pay_val", "sum_deb", "sclientn1", "sclientn2", + "sclientn3", "sclientn4", "sc_code", "acc_deb", "rclientn1", "rclientn2", "rclientn3", "rclientn4", "acc_kr_1", + "acc_kr_2", "sp_code", "specif_1", "specif_2", "specif_3", "specif_4", "specif_5", "specif_6", "send_type", + "servdate", "doc_result", "imp_result", "file_name", "generation_time", "generation_id" + }; + } + + @Override + public SDf04 objectReader(ResultSet resultSet) throws SQLException { + SDf04 object = new SDf04(); + object.setId(resultSet.getObject("ID", Long.class)); + object.setSeg_type(resultSet.getString("seg_type")); + object.setDoc_type(resultSet.getString("doc_type")); + object.setDocnm_ref(resultSet.getString("docnm_ref")); + object.setDocnmprev(resultSet.getString("docnmprev")); + object.setPriority(resultSet.getString("priority")); + object.setSbankcode(resultSet.getString("sbankcode")); + object.setC_acc_deb(resultSet.getString("c_acc_deb")); + object.setSbanknam1(resultSet.getString("sbanknam1")); + object.setSbanknam2(resultSet.getString("sbanknam2")); + object.setSbanknam3(resultSet.getString("sbanknam3")); + object.setSbanknam4(resultSet.getString("sbanknam4")); + object.setSbanknam5(resultSet.getString("sbanknam5")); + object.setRbankcode(resultSet.getString("rbankcode")); + object.setC_acc_cred(resultSet.getString("c_acc_cred")); + object.setRbanknam1(resultSet.getString("rbanknam1")); + object.setRbanknam2(resultSet.getString("rbanknam2")); + object.setRbanknam3(resultSet.getString("rbanknam3")); + object.setRbanknam4(resultSet.getString("rbanknam4")); + object.setRbanknam5(resultSet.getString("rbanknam5")); + object.setPay_date(resultSet.getString("pay_date")); + object.setExt_date(resultSet.getString("ext_date")); + object.setPay_val(resultSet.getString("pay_val")); + object.setSum_deb(resultSet.getString("sum_deb")); + object.setSclientn1(resultSet.getString("sclientn1")); + object.setSclientn2(resultSet.getString("sclientn2")); + object.setSclientn3(resultSet.getString("sclientn3")); + object.setSclientn4(resultSet.getString("sclientn4")); + object.setSc_code(resultSet.getString("sc_code")); + object.setAcc_deb(resultSet.getString("acc_deb")); + object.setRclientn1(resultSet.getString("rclientn1")); + object.setRclientn2(resultSet.getString("rclientn2")); + object.setRclientn3(resultSet.getString("rclientn3")); + object.setRclientn4(resultSet.getString("rclientn4")); + object.setAcc_kr_1(resultSet.getString("acc_kr_1")); + object.setAcc_kr_2(resultSet.getString("acc_kr_2")); + object.setSp_code(resultSet.getString("sp_code")); + object.setSpecif_1(resultSet.getString("specif_1")); + object.setSpecif_2(resultSet.getString("specif_2")); + object.setSpecif_3(resultSet.getString("specif_3")); + object.setSpecif_4(resultSet.getString("specif_4")); + object.setSpecif_5(resultSet.getString("specif_5")); + object.setSpecif_6(resultSet.getString("specif_6")); + object.setSend_type(resultSet.getString("send_type")); + object.setServdate(resultSet.getString("servdate")); + object.setDoc_result(resultSet.getString("doc_result")); + object.setImp_result(resultSet.getString("imp_result")); + object.setFile_name(resultSet.getString("file_name")); + object.setGenerationTime(getInstantFromTimestamp(resultSet, "generation_time")); + object.setGenerationId(resultSet.getObject("generation_id", Long.class)); + return object; + } + + @Override + public Object[] objectToField(SDf04 object) { + Object[] args = new Object[]{ + object.getId(), + object.getSeg_type(), + object.getDoc_type(), + object.getDocnm_ref(), + object.getDocnmprev(), + object.getPriority(), + object.getSbankcode(), + object.getC_acc_deb(), + object.getSbanknam1(), + object.getSbanknam2(), + object.getSbanknam3(), + object.getSbanknam4(), + object.getSbanknam5(), + object.getRbankcode(), + object.getC_acc_cred(), + object.getRbanknam1(), + object.getRbanknam2(), + object.getRbanknam3(), + object.getRbanknam4(), + object.getRbanknam5(), + object.getPay_date(), + object.getExt_date(), + object.getPay_val(), + object.getSum_deb(), + object.getSclientn1(), + object.getSclientn2(), + object.getSclientn3(), + object.getSclientn4(), + object.getSc_code(), + object.getAcc_deb(), + object.getRclientn1(), + object.getRclientn2(), + object.getRclientn3(), + object.getRclientn4(), + object.getAcc_kr_1(), + object.getAcc_kr_2(), + object.getSp_code(), + object.getSpecif_1(), + object.getSpecif_2(), + object.getSpecif_3(), + object.getSpecif_4(), + object.getSpecif_5(), + object.getSpecif_6(), + object.getSend_type(), + object.getServdate(), + object.getDoc_result(), + object.getImp_result(), + object.getFile_name(), + object.getGenerationTime(), + object.getGenerationId() + }; + return args; + } + +} \ No newline at end of file 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 80bf95b00..e8ae9a342 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 @@ -47,6 +47,7 @@ public final class IMDGDistributedNames { public static final String Map_SDf01 = "Map_SDf01"; public static final String Map_SDf02 = "Map_SDf02"; public static final String Map_SDf03 = "Map_SDf03"; + public static final String Map_SDf04 = "Map_SDf04"; public static final String Map_SDf05 = "Map_SDf05"; public static final String Map_SDf10 = "Map_SDf10"; public static final String Map_SDf11 = "Map_SDf11";