diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf12.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf12.java index 42f1a00f6..5102a038a 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf12.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf12.java @@ -16,7 +16,7 @@ public class SDf12 extends SpcexObjectBase { private String account; private String deal; - private BigDecimal status; + private Long status; private String fileName; private Instant generationTime; private Long generationId; @@ -37,11 +37,11 @@ public class SDf12 extends SpcexObjectBase { this.deal = value; } - public BigDecimal getStatus() { + public Long getStatus() { return status; } - public void setStatus(BigDecimal value) { + public void setStatus(Long value) { this.status = value; } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf13.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf13.java index c52ebf7bb..0f88d7aa9 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf13.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf13.java @@ -6,9 +6,8 @@ import ru.spcex.platform.classes.base.SpcexObjectBase; import java.time.Instant; /** - * ДФ 013 - Вывод свободных средств для инициаторов категории В - * с клирингового счета 30414/7 - платежное поручение АО СПВБ на вывод средств из РО. - * + * ДФ-13 Вывод свободных средств для инициаторов категории В с клирингового счета 30414/7 - платежное поручение АО СПВБ на вывод средств из РО + *

* DB table: S_DF13 **/ public class SDf13 extends SpcexObjectBase { @@ -44,6 +43,7 @@ public class SDf13 extends SpcexObjectBase { private String sc_code; private String acc_deb; private String rclientn1; + private String inn_cred; private String kpp_cred; private String rclientn4; private String acc_kr_1; @@ -301,6 +301,14 @@ public class SDf13 extends SpcexObjectBase { this.rclientn1 = rclientn1; } + public String getInn_cred() { + return inn_cred; + } + + public void setInn_cred(String inn_cred) { + this.inn_cred = inn_cred; + } + public String getKpp_cred() { return kpp_cred; } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf16.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf16.java index e1c291584..755552aca 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf16.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf16.java @@ -7,14 +7,13 @@ import java.math.BigDecimal; import java.time.Instant; /** - * ДФ 16 - Ответ КС на запрос на дозачисление/списание денежных средств + * ДФ-16 Формат запроса по возврату депозита или дозачисление/списание денежных средств *

* DB table: S_DF16 **/ public class SDf16 extends SpcexObjectBase { private static final long serialVersionUID = ConstSerializable.serialVersionUID; - private Instant date; private String account; private BigDecimal sum; private String market; @@ -23,19 +22,10 @@ public class SDf16 extends SpcexObjectBase { private BigDecimal BIC; private String SPEC; private BigDecimal number; - private String resultCode; private String fileName; private Instant generationTime; private Long generationId; - public Instant getDate() { - return date; - } - - public void setDate(Instant value) { - this.date = value; - } - public String getAccount() { return account; } @@ -100,14 +90,6 @@ public class SDf16 extends SpcexObjectBase { this.number = value; } - public String getResultCode() { - return resultCode; - } - - public void setResultCode(String value) { - this.resultCode = value; - } - public String getFileName() { return fileName; } 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 index e952baa38..39a18eb66 100644 --- 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 @@ -8,7 +8,7 @@ import java.time.Instant; /** * ДФ-17 Формат ответа на запрос по возврату депозита или дозачисление/списание денежных средств - * + *

* DB table: S_DF17 **/ public class SDf17 extends SpcexObjectBase { @@ -22,105 +22,105 @@ public class SDf17 extends SpcexObjectBase { private BigDecimal BIC; private String SPEC; private BigDecimal number; - private String result; + private BigDecimal result; private Instant generationTime; private Long generationId; - private Long in_s_df16_id; - + private Long inSDf16Id; public String getAccount() { return account; } - public void setAccount(String account) { - this.account = account; + public void setAccount(String value) { + this.account = value; } public BigDecimal getSum() { return sum; } - public void setSum(BigDecimal sum) { - this.sum = sum; + public void setSum(BigDecimal value) { + this.sum = value; } public String getMarket() { return market; } - public void setMarket(String market) { - this.market = market; + public void setMarket(String value) { + this.market = value; } public String getType() { return type; } - public void setType(String type) { - this.type = type; + public void setType(String value) { + this.type = value; } public BigDecimal getINN() { return INN; } - public void setINN(BigDecimal INN) { - this.INN = INN; + public void setINN(BigDecimal value) { + this.INN = value; } public BigDecimal getBIC() { return BIC; } - public void setBIC(BigDecimal BIC) { - this.BIC = BIC; + public void setBIC(BigDecimal value) { + this.BIC = value; } public String getSPEC() { return SPEC; } - public void setSPEC(String SPEC) { - this.SPEC = SPEC; + public void setSPEC(String value) { + this.SPEC = value; } public BigDecimal getNumber() { return number; } - public void setNumber(BigDecimal number) { - this.number = number; + public void setNumber(BigDecimal value) { + this.number = value; } - public String getResult() { + public BigDecimal getResult() { return result; } - public void setResult(String result) { - this.result = result; + public void setResult(BigDecimal value) { + this.result = value; } public Instant getGenerationTime() { return generationTime; } - public void setGenerationTime(Instant generationTime) { - this.generationTime = generationTime; + public void setGenerationTime(Instant value) { + this.generationTime = value; } public Long getGenerationId() { return generationId; } - public void setGenerationId(Long generationId) { - this.generationId = generationId; + public void setGenerationId(Long value) { + this.generationId = value; } - public Long getIn_s_df16_id() { - return in_s_df16_id; + public Long getInSDf16Id() { + return inSDf16Id; } - public void setIn_s_df16_id(Long in_s_df16_id) { - this.in_s_df16_id = in_s_df16_id; + public void setInSDf16Id(Long value) { + this.inSDf16Id = value; } + } \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf18.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf18.java index 3bd48ccdf..c388f3c4b 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf18.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf18.java @@ -16,7 +16,7 @@ public class SDf18 extends SpcexObjectBase { private String account; private String deal; - private BigDecimal status; + private Long status; private BigDecimal result; private Instant generationTime; private Long generationId; @@ -38,11 +38,11 @@ public class SDf18 extends SpcexObjectBase { this.deal = value; } - public BigDecimal getStatus() { + public Long getStatus() { return status; } - public void setStatus(BigDecimal value) { + public void setStatus(Long value) { this.status = value; } diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java index 887df0c1e..85775c9bb 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyInfoService.java @@ -6,6 +6,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.profile.CompanyInfo; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; @@ -18,13 +19,15 @@ import ru.spcex.platform.imdg.api.ImdgProvider; @Service public class CompanyInfoService extends QueueConsumer implements InitializingBean { private final Logger log = LoggerFactory.getLogger(getClass()); - private final Imdg companyInfoMap; +// private final Imdg companyInfoMap; + private final Imdg companyMap; @Autowired public CompanyInfoService(Consumer kafkaQueue, ImdgProvider imdgProvider) { super(kafkaQueue); - this.companyInfoMap = imdgProvider.getImdg(IMDGDistributedNames.Map_CompanyInfo, CompanyInfo.class); +// this.companyInfoMap = imdgProvider.getImdg(IMDGDistributedNames.Map_CompanyInfo, CompanyInfo.class); + this.companyMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class); } @Override @@ -38,7 +41,9 @@ public class CompanyInfoService extends QueueConsumer implements InitializingBea public void companyInfoUpdate(BaseRequest userRequest) { CompanyInfoUpdateRequest req = userRequest.getRequestPayload(); log.debug("CompanyInfoUpdateRequest received"); - CompanyInfo companyInfo = companyInfoMap.getSingleObjectByID(req.getId()); +// CompanyInfo companyInfo = companyInfoMap.getSingleObjectByID(req.getId()); + Company company = companyMap.getSingleObjectByID(req.getId()); + CompanyInfo companyInfo = company == null ? null : company.getProfile(); companyInfo.setCorporationSoleType(req.getCorporationSoleType()); companyInfo.setCountryCode(req.getCountryCode()); @@ -51,7 +56,8 @@ public class CompanyInfoService extends QueueConsumer implements InitializingBea companyInfo.setFullNameEng(req.getFullNameEng()); companyInfo.setShortName(req.getShortName()); companyInfo.setFullName(req.getFullName()); - companyInfoMap.update(companyInfo); +// companyInfoMap.update(companyInfo); + companyMap.update(company); log.debug("successfully processed, id {}", companyInfo.getId()); } } diff --git a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf12Table.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf12Table.java index 0fec7223c..f14dcbb46 100644 --- a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf12Table.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf12Table.java @@ -22,7 +22,7 @@ public class SDf12Table extends AbstractTable { SDf12 result = new SDf12(); result.setAccount((String) entity[0]); result.setDeal((String) entity[1]); - result.setStatus((BigDecimal) entity[2]); + result.setStatus((Long) entity[2]); result.setFileName(filename); result.setGenerationTime(Instant.now()); result.setGenerationId(fileId); diff --git a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf16Table.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf16Table.java index 06a263f40..9be1b54e6 100644 --- a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf16Table.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/tables/SDf16Table.java @@ -21,7 +21,7 @@ public class SDf16Table extends AbstractTable { @Override public SDf16 getEntity(Object[] entity) { SDf16 result = new SDf16(); - result.setDate(TimeUtil.strToInstant((String) entity[0])); +// result.setDate(TimeUtil.strToInstant((String) entity[0])); result.setAccount((String) entity[1]); result.setSum((BigDecimal) entity[2]); result.setMarket((String) entity[3]); diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/HazelcastConfiguration.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/HazelcastConfiguration.java index 01f53add1..cf408f0ce 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/HazelcastConfiguration.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/HazelcastConfiguration.java @@ -62,12 +62,7 @@ public class HazelcastConfiguration { config.addMapConfig(poolMapConfigs.map_OrganizationTypeDictionary()); config.addMapConfig(poolMapConfigs.map_WorkflowStatusDictionary()); -// config.addMapConfig(poolMapConfigs.map_CompanyRoleSet()); todo протестировать автоконфигуратор конфигурации мапсторов - config.addMapConfig(poolMapConfigs.map_CompanySymbols()); - config.addMapConfig(poolMapConfigs.map_ProfileDocument()); - config.addMapConfig(poolMapConfigs.map_Contact()); - config.addMapConfig(poolMapConfigs.map_Company()); -// config.addMapConfig(poolMapConfigs.map_CompanyUpdate()); + config.addMapConfig(poolMapConfigs.map_Company()); //todo убедиться, что CompanyMapStore extends BusinessObjectMapStore теперь будет TemplateMapStore. // Автоподключение мап List autoMapCfg = poolMapConfigs.autoconfiguratorOfMapstorages(); diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/PoolMapConfigs.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/PoolMapConfigs.java index 9f2178bdd..7b2d9d7c2 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/PoolMapConfigs.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/PoolMapConfigs.java @@ -132,14 +132,15 @@ public class PoolMapConfigs { -// @Autowired todo эксперимент с мапстором, см. ниже autoconfiguratorOfMapstorage. -// private CompanyRoleSetMapStore companyRoleSetMapStore; -// -// public MapConfig map_CompanyRoleSet() { -// return makeDefaultMapConfig(IMDGDistributedNames.Map_CompanyRoleSet, companyRoleSetMapStore) -// .addMapIndexConfig(makeMapIndexConfig("companyId")); -// } + @Autowired + private CompanyMapStore companyMapStore; + public MapConfig map_Company() { + return makeDefaultMapConfig(IMDGDistributedNames.Map_Company, companyMapStore); + } + + + // Автоконфигурируемые мапсторы: @Autowired private List> listOfAutopluginStores; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf12MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf12MapStore.java index 46c8663b4..0fa7ad736 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf12MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf12MapStore.java @@ -42,7 +42,7 @@ public class SDf12MapStore extends TemplateMapStore { object.setId(resultSet.getObject("ID", Long.class)); object.setAccount(resultSet.getObject("ACCOUNT", String.class)); object.setDeal(resultSet.getObject("DEAL", String.class)); - object.setStatus(resultSet.getObject("STATUS", BigDecimal.class)); + object.setStatus(resultSet.getObject("STATUS", Long.class)); object.setFileName(resultSet.getObject("FILE_NAME", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf13MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf13MapStore.java index 42925b4aa..01b9b80bf 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf13MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf13MapStore.java @@ -29,13 +29,13 @@ public class SDf13MapStore extends TemplateMapStore { @Override public String[] getFields() { - return new String[] { + 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" + "KPP_DEB", "SCLIENTN4", "SC_CODE", "ACC_DEB", "RCLIENTN1", "INN_CRED", "KPP_CRED", "RCLIENTN4", "ACC_KR_1", + "ACC_KR_2", "SP_CODE", "SPECIF_1", "SPECIF_2", "SPECIF_3", "SPECIF_4", "SPECIF_5", "SPECIF_6", "SEND_TYPE", + "SERVDATE", "DOC_RESULT", "GENERATION_TIME", "GENERATION_ID" }; } @@ -73,6 +73,7 @@ public class SDf13MapStore extends TemplateMapStore { object.setSc_code(resultSet.getObject("SC_CODE", String.class)); object.setAcc_deb(resultSet.getObject("ACC_DEB", String.class)); object.setRclientn1(resultSet.getObject("RCLIENTN1", String.class)); + object.setInn_cred(resultSet.getObject("INN_CRED", String.class)); object.setKpp_cred(resultSet.getObject("KPP_CRED", String.class)); object.setRclientn4(resultSet.getObject("RCLIENTN4", String.class)); object.setAcc_kr_1(resultSet.getObject("ACC_KR_1", String.class)); @@ -97,49 +98,50 @@ public class SDf13MapStore extends TemplateMapStore { Object[] args = new Object[]{ object.getId(), object.getSeg_type(), - object.getDoc_type(), - object.getDocnm_ref(), + 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(), + object.getPriority(), + object.getSbankcode(), + object.getC_acc_deb(), + object.getSbanknam1(), + object.getSbanknam2(), + object.getSbanknam3(), + object.getSbanknam4(), + object.getSbanknam5(), + object.getRbankcode(), + object.getC_acc_cred(), + object.getRbanknam1(), + object.getOp_type(), + object.getOp_order(), + object.getRbanknam4(), + object.getRbanknam5(), + object.getPay_date(), + object.getExt_date(), + object.getPay_val(), + object.getSum_deb(), + object.getSclientn1(), + object.getInn_deb(), + object.getKpp_deb(), + object.getSclientn4(), + object.getSc_code(), + object.getAcc_deb(), + object.getRclientn1(), + object.getInn_cred(), + object.getKpp_cred(), + object.getRclientn4(), + object.getAcc_kr_1(), + object.getAcc_kr_2(), + object.getSp_code(), + object.getSpecif_1(), + object.getSpecif_2(), + object.getSpecif_3(), + object.getSpecif_4(), + object.getSpecif_5(), + object.getSpecif_6(), + object.getSend_type(), + object.getServdate(), + object.getDoc_result(), TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId() }; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf16MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf16MapStore.java index edd7bf445..69fa4b308 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf16MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf16MapStore.java @@ -31,7 +31,7 @@ public class SDf16MapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "DATE", "ACCOUNT", "SUM", "MARKET", "TYPE", "_I_N_N", "_B_I_C", "_S_P_E_C", "NUMBER", "RESULT_CODE", "FILE_NAME", "GENERATION_TIME", "GENERATION_ID" + "ID", "ACCOUNT", "SUM", "MARKET", "TYPE", "_I_N_N", "_B_I_C", "_S_P_E_C", "NUMBER", "FILE_NAME", "GENERATION_TIME", "GENERATION_ID" }; } @@ -39,7 +39,6 @@ public class SDf16MapStore extends TemplateMapStore { public SDf16 objectReader(ResultSet resultSet) throws SQLException { SDf16 object = new SDf16(); object.setId(resultSet.getObject("ID", Long.class)); - object.setDate(getInstantFromTimestamp(resultSet, "DATE")); object.setAccount(resultSet.getObject("ACCOUNT", String.class)); object.setSum(resultSet.getObject("SUM", BigDecimal.class)); object.setMarket(resultSet.getObject("MARKET", String.class)); @@ -48,7 +47,6 @@ public class SDf16MapStore extends TemplateMapStore { 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.setResultCode(resultSet.getObject("RESULT_CODE", String.class)); object.setFileName(resultSet.getObject("FILE_NAME", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); @@ -59,7 +57,6 @@ public class SDf16MapStore extends TemplateMapStore { public Object[] objectToField(SDf16 object) { Object[] args = new Object[]{ object.getId(), - TimeUtil.toDateFromInstant(object.getDate()), object.getAccount(), object.getSum(), object.getMarket(), @@ -68,7 +65,6 @@ public class SDf16MapStore extends TemplateMapStore { object.getBIC(), object.getSPEC(), object.getNumber(), - object.getResultCode(), object.getFileName(), TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId() 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 index 369505d65..ad1f57bea 100644 --- 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 @@ -47,10 +47,10 @@ public class SDf17MapStore extends TemplateMapStore { 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.setResult(resultSet.getObject("RESULT", BigDecimal.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)); + object.setInSDf16Id(resultSet.getObject("IN_S_DF16_ID", Long.class)); return object; } @@ -69,7 +69,7 @@ public class SDf17MapStore extends TemplateMapStore { object.getResult(), TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId(), - object.getIn_s_df16_id() + object.getInSDf16Id() }; return args; } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf18MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf18MapStore.java index a7ab87623..7a785dc1c 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf18MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf18MapStore.java @@ -41,7 +41,7 @@ public class SDf18MapStore extends TemplateMapStore { object.setId(resultSet.getObject("ID", Long.class)); object.setAccount(resultSet.getObject("ACCOUNT", String.class)); object.setDeal(resultSet.getObject("DEAL", String.class)); - object.setStatus(resultSet.getObject("STATUS", BigDecimal.class)); + object.setStatus(resultSet.getObject("STATUS", Long.class)); object.setResult(resultSet.getObject("RESULT", BigDecimal.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class));