From f2a9a2663605f42d25536b2aa1c603e763442f09 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Thu, 15 Sep 2022 15:00:00 +0300 Subject: [PATCH] =?UTF-8?q?IMDG=20=D0=BF=D0=BE=20meta=20=D0=B7=D0=B0=D1=87?= =?UTF-8?q?=D0=B8=D1=81=D1=82=D0=BA=D0=B0=20=D0=BC=D0=B0=D0=BF=D1=81=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BE=D0=B2:=20http://jira.mfd.msk:8088/browse/CLS?= =?UTF-8?q?-46=20...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../classes/statics/data/sdf/RequestDf03.java | 410 ------------------ .../classes/statics/data/sdf/RequestDf05.java | 81 ---- .../classes/statics/data/sdf/RequestDf18.java | 90 ---- .../businessevent/UserHistoryMapStore.java | 2 +- .../imdg/object/RequestDf03MapStore.java | 153 ------- .../imdg/object/RequestDf05MapStore.java | 69 --- .../imdg/object/RequestDf18MapStore.java | 71 --- 7 files changed, 1 insertion(+), 875 deletions(-) delete mode 100644 clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/RequestDf03.java delete mode 100644 clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/RequestDf05.java delete mode 100644 clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/RequestDf18.java delete mode 100644 clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/RequestDf03MapStore.java delete mode 100644 clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/RequestDf05MapStore.java delete mode 100644 clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/RequestDf18MapStore.java diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/RequestDf03.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/RequestDf03.java deleted file mode 100644 index 20f2dacc0..000000000 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/RequestDf03.java +++ /dev/null @@ -1,410 +0,0 @@ -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; - -/** - * Платежное поручение - * - * DB table: REQUEST_DF03 - **/ -public class RequestDf03 extends SpcexObjectBase { - private static final long serialVersionUID = ConstSerializable.serialVersionUID; - - private Instant requestDate; - private Instant responseDate; - private String docType; - private String docnmRef; - private String docnmprev; - private String priority; - private String sbankcode; - private String cAccDeb; - private String sbanknam1; - private String sbanknam2; - private String sbanknam3; - private String sbanknam4; - private String sbanknam5; - private String rbankcode; - private String cAccCred; - private String rbanknam1; - private String rbanknam2; - private String rbanknam3; - private String rbanknam4; - private String rbanknam5; - private Instant payDate; - private String extDate; - private String payVal; - private BigDecimal sumDeb; - private String sclientn1; - private String sclientn2; - private String sclientn3; - private String sclientn4; - private String scCode; - private String accDeb; - private String rclientn1; - private String rclientn2; - private String rclientn3; - private String rclientn4; - private String accKr_1; - private String accKr_2; - private String spCode; - 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 sendType; - private String servdate; - private String docResult; - private String sendResult; - private String errorText; - private String responseResult; - - public Instant getRequestDate() { - return requestDate; - } - public void setRequestDate(Instant value) { - this.requestDate=value; - } - - public Instant getResponseDate() { - return responseDate; - } - public void setResponseDate(Instant value) { - this.responseDate=value; - } - - public String getDocType() { - return docType; - } - public void setDocType(String value) { - this.docType=value; - } - - public String getDocnmRef() { - return docnmRef; - } - public void setDocnmRef(String value) { - this.docnmRef=value; - } - - public String getDocnmprev() { - return docnmprev; - } - public void setDocnmprev(String value) { - this.docnmprev=value; - } - - public String getPriority() { - return priority; - } - public void setPriority(String value) { - this.priority=value; - } - - public String getSbankcode() { - return sbankcode; - } - public void setSbankcode(String value) { - this.sbankcode=value; - } - - public String getCAccDeb() { - return cAccDeb; - } - public void setCAccDeb(String value) { - this.cAccDeb=value; - } - - public String getSbanknam1() { - return sbanknam1; - } - public void setSbanknam1(String value) { - this.sbanknam1=value; - } - - public String getSbanknam2() { - return sbanknam2; - } - public void setSbanknam2(String value) { - this.sbanknam2=value; - } - - public String getSbanknam3() { - return sbanknam3; - } - public void setSbanknam3(String value) { - this.sbanknam3=value; - } - - public String getSbanknam4() { - return sbanknam4; - } - public void setSbanknam4(String value) { - this.sbanknam4=value; - } - - public String getSbanknam5() { - return sbanknam5; - } - public void setSbanknam5(String value) { - this.sbanknam5=value; - } - - public String getRbankcode() { - return rbankcode; - } - public void setRbankcode(String value) { - this.rbankcode=value; - } - - public String getCAccCred() { - return cAccCred; - } - public void setCAccCred(String value) { - this.cAccCred=value; - } - - public String getRbanknam1() { - return rbanknam1; - } - public void setRbanknam1(String value) { - this.rbanknam1=value; - } - - public String getRbanknam2() { - return rbanknam2; - } - public void setRbanknam2(String value) { - this.rbanknam2=value; - } - - public String getRbanknam3() { - return rbanknam3; - } - public void setRbanknam3(String value) { - this.rbanknam3=value; - } - - public String getRbanknam4() { - return rbanknam4; - } - public void setRbanknam4(String value) { - this.rbanknam4=value; - } - - public String getRbanknam5() { - return rbanknam5; - } - public void setRbanknam5(String value) { - this.rbanknam5=value; - } - - public Instant getPayDate() { - return payDate; - } - public void setPayDate(Instant value) { - this.payDate=value; - } - - public String getExtDate() { - return extDate; - } - public void setExtDate(String value) { - this.extDate=value; - } - - public String getPayVal() { - return payVal; - } - public void setPayVal(String value) { - this.payVal=value; - } - - public BigDecimal getSumDeb() { - return sumDeb; - } - public void setSumDeb(BigDecimal value) { - this.sumDeb=value; - } - - public String getSclientn1() { - return sclientn1; - } - public void setSclientn1(String value) { - this.sclientn1=value; - } - - public String getSclientn2() { - return sclientn2; - } - public void setSclientn2(String value) { - this.sclientn2=value; - } - - public String getSclientn3() { - return sclientn3; - } - public void setSclientn3(String value) { - this.sclientn3=value; - } - - public String getSclientn4() { - return sclientn4; - } - public void setSclientn4(String value) { - this.sclientn4=value; - } - - public String getScCode() { - return scCode; - } - public void setScCode(String value) { - this.scCode=value; - } - - public String getAccDeb() { - return accDeb; - } - public void setAccDeb(String value) { - this.accDeb=value; - } - - public String getRclientn1() { - return rclientn1; - } - public void setRclientn1(String value) { - this.rclientn1=value; - } - - public String getRclientn2() { - return rclientn2; - } - public void setRclientn2(String value) { - this.rclientn2=value; - } - - public String getRclientn3() { - return rclientn3; - } - public void setRclientn3(String value) { - this.rclientn3=value; - } - - public String getRclientn4() { - return rclientn4; - } - public void setRclientn4(String value) { - this.rclientn4=value; - } - - public String getAccKr_1() { - return accKr_1; - } - public void setAccKr_1(String value) { - this.accKr_1=value; - } - - public String getAccKr_2() { - return accKr_2; - } - public void setAccKr_2(String value) { - this.accKr_2=value; - } - - public String getSpCode() { - return spCode; - } - public void setSpCode(String value) { - this.spCode=value; - } - - public String getSpecif_1() { - return specif_1; - } - public void setSpecif_1(String value) { - this.specif_1=value; - } - - public String getSpecif_2() { - return specif_2; - } - public void setSpecif_2(String value) { - this.specif_2=value; - } - - public String getSpecif_3() { - return specif_3; - } - public void setSpecif_3(String value) { - this.specif_3=value; - } - - public String getSpecif_4() { - return specif_4; - } - public void setSpecif_4(String value) { - this.specif_4=value; - } - - public String getSpecif_5() { - return specif_5; - } - public void setSpecif_5(String value) { - this.specif_5=value; - } - - public String getSpecif_6() { - return specif_6; - } - public void setSpecif_6(String value) { - this.specif_6=value; - } - - public String getSendType() { - return sendType; - } - public void setSendType(String value) { - this.sendType=value; - } - - public String getServdate() { - return servdate; - } - public void setServdate(String value) { - this.servdate=value; - } - - public String getDocResult() { - return docResult; - } - public void setDocResult(String value) { - this.docResult=value; - } - - public String getSendResult() { - return sendResult; - } - public void setSendResult(String value) { - this.sendResult=value; - } - - public String getErrorText() { - return errorText; - } - public void setErrorText(String value) { - this.errorText=value; - } - - public String getResponseResult() { - return responseResult; - } - public void setResponseResult(String value) { - this.responseResult=value; - } - -} \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/RequestDf05.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/RequestDf05.java deleted file mode 100644 index 7d1afd03f..000000000 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/RequestDf05.java +++ /dev/null @@ -1,81 +0,0 @@ -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; - -/** - * ДФ 05 - Уведомление о завершении расчетов в ПРЦ - *

- * DB table: REQUEST_DF05 - **/ -public class RequestDf05 extends SpcexObjectBase { - private static final long serialVersionUID = ConstSerializable.serialVersionUID; - - private BigDecimal tp; - private Instant dt; - private Instant tm; - private String pr; - private String fileName; - private Instant generationTime; - private Long generationId; - - public BigDecimal getTp() { - return tp; - } - - public void setTp(BigDecimal value) { - this.tp = value; - } - - public Instant getDt() { - return dt; - } - - public void setDt(Instant value) { - this.dt = value; - } - - public Instant getTm() { - return tm; - } - - public void setTm(Instant value) { - this.tm = value; - } - - public String getPr() { - return pr; - } - - public void setPr(String value) { - this.pr = value; - } - - public String getFileName() { - return fileName; - } - - public void setFileName(String value) { - this.fileName = value; - } - - public Instant getGenerationTime() { - return generationTime; - } - - public void setGenerationTime(Instant value) { - this.generationTime = value; - } - - public Long getGenerationId() { - return generationId; - } - - public void setGenerationId(Long value) { - this.generationId = value; - } - -} \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/RequestDf18.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/RequestDf18.java deleted file mode 100644 index 74363898e..000000000 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/RequestDf18.java +++ /dev/null @@ -1,90 +0,0 @@ -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; - -/** - * ДФ18 – Квитанция о получении Информации о состоянии счета - *

- * DB table: REQUEST_DF18 - **/ -public class RequestDf18 extends SpcexObjectBase { - private static final long serialVersionUID = ConstSerializable.serialVersionUID; - - private Instant datetime; - private String account; - private String deal; - private BigDecimal status; - private BigDecimal result; - private String fileName; - private Instant generationTime; - private Long generationId; - - public Instant getDatetime() { - return datetime; - } - - public void setDatetime(Instant value) { - this.datetime = value; - } - - public String getAccount() { - return account; - } - - public void setAccount(String value) { - this.account = value; - } - - public String getDeal() { - return deal; - } - - public void setDeal(String value) { - this.deal = value; - } - - public BigDecimal getStatus() { - return status; - } - - public void setStatus(BigDecimal value) { - this.status = value; - } - - public BigDecimal getResult() { - return result; - } - - public void setResult(BigDecimal value) { - this.result = value; - } - - public String getFileName() { - return fileName; - } - - public void setFileName(String value) { - this.fileName = value; - } - - public Instant getGenerationTime() { - return generationTime; - } - - public void setGenerationTime(Instant value) { - this.generationTime = value; - } - - public Long getGenerationId() { - return generationId; - } - - public void setGenerationId(Long value) { - this.generationId = value; - } - -} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/UserHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/UserHistoryMapStore.java index f82cdc318..5f94290cd 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/UserHistoryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/UserHistoryMapStore.java @@ -22,7 +22,7 @@ public class UserHistoryMapStore extends TemplateEventMapStore { @Override public String getTableName() { - return "USER_HISTORY"; + return "USER_CLR_HISTORY"; } @Override diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/RequestDf03MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/RequestDf03MapStore.java deleted file mode 100644 index e8d615a44..000000000 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/RequestDf03MapStore.java +++ /dev/null @@ -1,153 +0,0 @@ -package ru.spcex.clearing.imdg.object; - -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.stereotype.Component; -import ru.clearing.classes.statics.data.sdf.RequestDf03; -import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.imdg.base.TemplateMapStore; -import ru.spcex.clearing.imdg.utils.DbUtilsHelper; -import ru.spcex.clearing.imdg.utils.TimeUtil; - -import java.math.BigDecimal; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.*; - -@Component -public class RequestDf03MapStore extends TemplateMapStore { - - public RequestDf03MapStore(JdbcTemplate jdbcTemplate) { - super(jdbcTemplate); - } - - @Override - public String getMapName() { - return IMDGDistributedNames.Map_RequestDf03; - } - - @Override - public String getTableName() { - return "REQUEST_DF03"; - } - - @Override - public String[] getFields() { - return new String[]{ - "ID", "REQUEST_DATE", "RESPONSE_DATE", "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", "SEND_RESULT", "ERROR_TEXT", "RESPONSE_RESULT" - }; - } - - @Override - public RequestDf03 objectReader(ResultSet resultSet) throws SQLException { - RequestDf03 object = new RequestDf03(); - object.setId(resultSet.getObject("ID", Long.class)); - object.setRequestDate(getInstantFromTimestamp(resultSet, "REQUEST_DATE")); - object.setResponseDate(getInstantFromTimestamp(resultSet, "RESPONSE_DATE")); - object.setDocType(resultSet.getObject("DOC_TYPE", String.class)); - object.setDocnmRef(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.setCAccDeb(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.setCAccCred(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.setPayDate(getInstantFromTimestamp(resultSet, "PAY_DATE")); - object.setExtDate(resultSet.getObject("EXT_DATE", String.class)); - object.setPayVal(resultSet.getObject("PAY_VAL", String.class)); - object.setSumDeb(resultSet.getObject("SUM_DEB", BigDecimal.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.setScCode(resultSet.getObject("SC_CODE", String.class)); - object.setAccDeb(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.setAccKr_1(resultSet.getObject("ACC_KR_1", String.class)); - object.setAccKr_2(resultSet.getObject("ACC_KR_2", String.class)); - object.setSpCode(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.setSendType(resultSet.getObject("SEND_TYPE", String.class)); - object.setServdate(resultSet.getObject("SERVDATE", String.class)); - object.setDocResult(resultSet.getObject("DOC_RESULT", String.class)); - object.setSendResult(resultSet.getObject("SEND_RESULT", String.class)); - object.setErrorText(resultSet.getObject("ERROR_TEXT", String.class)); - object.setResponseResult(resultSet.getObject("RESPONSE_RESULT", String.class)); - return object; - } - - @Override - public Object[] objectToField(RequestDf03 object) { - Object[] args = new Object[]{ - object.getId(), - TimeUtil.fromInstant(object.getRequestDate()), - TimeUtil.fromInstant(object.getResponseDate()), - object.getDocType(), - object.getDocnmRef(), - object.getDocnmprev(), - object.getPriority(), - object.getSbankcode(), - object.getCAccDeb(), - object.getSbanknam1(), - object.getSbanknam2(), - object.getSbanknam3(), - object.getSbanknam4(), - object.getSbanknam5(), - object.getRbankcode(), - object.getCAccCred(), - object.getRbanknam1(), - object.getRbanknam2(), - object.getRbanknam3(), - object.getRbanknam4(), - object.getRbanknam5(), - TimeUtil.fromInstant(object.getPayDate()), - object.getExtDate(), - object.getPayVal(), - object.getSumDeb(), - object.getSclientn1(), - object.getSclientn2(), - object.getSclientn3(), - object.getSclientn4(), - object.getScCode(), - object.getAccDeb(), - object.getRclientn1(), - object.getRclientn2(), - object.getRclientn3(), - object.getRclientn4(), - object.getAccKr_1(), - object.getAccKr_2(), - object.getSpCode(), - object.getSpecif_1(), - object.getSpecif_2(), - object.getSpecif_3(), - object.getSpecif_4(), - object.getSpecif_5(), - object.getSpecif_6(), - object.getSendType(), - object.getServdate(), - object.getDocResult(), - object.getSendResult(), - object.getErrorText(), - object.getResponseResult() - }; - return args; - } - -} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/RequestDf05MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/RequestDf05MapStore.java deleted file mode 100644 index 6495ddeb2..000000000 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/RequestDf05MapStore.java +++ /dev/null @@ -1,69 +0,0 @@ -package ru.spcex.clearing.imdg.object; - -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.stereotype.Component; -import ru.clearing.classes.statics.data.sdf.RequestDf05; -import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.imdg.base.TemplateMapStore; -import ru.spcex.clearing.imdg.utils.DbUtilsHelper; -import ru.spcex.clearing.imdg.utils.TimeUtil; - -import java.math.BigDecimal; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.*; - -@Component -public class RequestDf05MapStore extends TemplateMapStore { - - public RequestDf05MapStore(JdbcTemplate jdbcTemplate) { - super(jdbcTemplate); - } - - @Override - public String getMapName() { - return IMDGDistributedNames.Map_RequestDf05; - } - - @Override - public String getTableName() { - return "REQUEST_DF05"; - } - - @Override - public String[] getFields() { - return new String[]{ - "ID", "TP", "DT", "TM", "PR", "FILE_NAME", "GENERATION_TIME", "GENERATION_ID" - }; - } - - @Override - public RequestDf05 objectReader(ResultSet resultSet) throws SQLException { - RequestDf05 object = new RequestDf05(); - object.setId(resultSet.getObject("ID", Long.class)); - object.setTp(resultSet.getObject("TP", BigDecimal.class)); - object.setDt(getInstantFromTimestamp(resultSet, "DT")); - object.setTm(getInstantFromTimestamp(resultSet, "TM")); - object.setPr(resultSet.getObject("PR", String.class)); - object.setFileName(resultSet.getObject("FILE_NAME", String.class)); - object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); - object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); - return object; - } - - @Override - public Object[] objectToField(RequestDf05 object) { - Object[] args = new Object[]{ - object.getId(), - object.getTp(), - TimeUtil.fromInstant(object.getDt()), - TimeUtil.fromInstant(object.getTm()), - object.getPr(), - object.getFileName(), - 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/RequestDf18MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/RequestDf18MapStore.java deleted file mode 100644 index 728a5708b..000000000 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/RequestDf18MapStore.java +++ /dev/null @@ -1,71 +0,0 @@ -package ru.spcex.clearing.imdg.object; - -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.stereotype.Component; -import ru.clearing.classes.statics.data.sdf.RequestDf18; -import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.imdg.base.TemplateMapStore; -import ru.spcex.clearing.imdg.utils.DbUtilsHelper; -import ru.spcex.clearing.imdg.utils.TimeUtil; - -import java.math.BigDecimal; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.*; - -@Component -public class RequestDf18MapStore extends TemplateMapStore { - - public RequestDf18MapStore(JdbcTemplate jdbcTemplate) { - super(jdbcTemplate); - } - - @Override - public String getMapName() { - return IMDGDistributedNames.Map_RequestDf18; - } - - @Override - public String getTableName() { - return "REQUEST_DF18"; - } - - @Override - public String[] getFields() { - return new String[]{ - "ID", "DATETIME", "ACCOUNT", "DEAL", "STATUS", "RESULT", "FILE_NAME", "GENERATION_TIME", "GENERATION_ID" - }; - } - - @Override - public RequestDf18 objectReader(ResultSet resultSet) throws SQLException { - RequestDf18 object = new RequestDf18(); - object.setId(resultSet.getObject("ID", Long.class)); - object.setDatetime(getInstantFromTimestamp(resultSet, "DATETIME")); - object.setAccount(resultSet.getObject("ACCOUNT", String.class)); - object.setDeal(resultSet.getObject("DEAL", String.class)); - object.setStatus(resultSet.getObject("STATUS", BigDecimal.class)); - object.setResult(resultSet.getObject("RESULT", BigDecimal.class)); - object.setFileName(resultSet.getObject("FILE_NAME", String.class)); - object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); - object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); - return object; - } - - @Override - public Object[] objectToField(RequestDf18 object) { - Object[] args = new Object[]{ - object.getId(), - TimeUtil.fromInstant(object.getDatetime()), - object.getAccount(), - object.getDeal(), - object.getStatus(), - object.getResult(), - object.getFileName(), - TimeUtil.fromInstant(object.getGenerationTime()), - object.getGenerationId() - }; - return args; - } - -} \ No newline at end of file