diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java index 358390a8e..ec596586e 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java @@ -50,7 +50,7 @@ public class AccountService extends QueueConsumer implements InitializingBean { for (AccountSdfRequestPart accountReq : req.getAccounts()) { Account account = new Account(); account.setAccount(accountReq.getAccount()); - //fixme account.setCompany(); + account.setCompanyId(accountReq.getCompanyId()); accountMap.insert(account); AccountSdfToStatementRequestPart responsePart = responsePart(accountReq.getSdfId()); accountToStatement.add(responsePart); diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/BankAccountService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/BankAccountService.java index a853bd6c3..3c1ad9ed6 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/BankAccountService.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/BankAccountService.java @@ -55,6 +55,7 @@ public class BankAccountService extends QueueConsumer implements InitializingBea bankAccount.setDestination(req.getDestination()); bankAccount.setTaxpayerIdentificationNumber(req.getTaxpayerIdentificationNumber()); bankAccount.setTaxRegistrationReasonCode(req.getTaxRegistrationReasonCode()); + bankAccount.setAccount(req.getAccount()); bankAccountMap.insert(bankAccount); log.debug("successfully processed, new id {}", bankAccount.getId()); @@ -72,6 +73,7 @@ public class BankAccountService extends QueueConsumer implements InitializingBea bankAccount.setDestination(req.getDestination()); bankAccount.setTaxpayerIdentificationNumber(req.getTaxpayerIdentificationNumber()); bankAccount.setTaxRegistrationReasonCode(req.getTaxRegistrationReasonCode()); + bankAccount.setAccount(req.getAccount()); bankAccountMap.update(bankAccount); log.debug("successfully update, existing bankAccount with id {}", bankAccount.getId()); diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountNewAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountNewAction.java index cd1e9d170..4eb28f6c3 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountNewAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountNewAction.java @@ -8,7 +8,9 @@ import ru.spcex.clearing.backendapi.errors.BackEndError; import ru.spcex.clearing.platform.messaging.domain.ActionType; import ru.spcex.clearing.platform.messaging.domain.cud.account.BankAccountNewRequest; import ru.spcex.platform.utils.enumeration.EnumMessage; +import ru.spcex.platform.utils.text.TextUtil; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -39,33 +41,39 @@ public class BankAccountNewAction implements IAction { @ApiModelProperty(value = "Код причины постановки (КПП)", example = "01") @JsonProperty private String taxRegistrationReasonCode; + @ApiModelProperty(value = "Номер счета", example = "1234567") + @JsonProperty + private String account; @Override public Collection validate() { + List errors = new ArrayList<>(); if (!StringUtils.hasLength(this.bankIdentificationCode)) - return List.of(new EnumMessage(BackEndError.ValidationError, "bankIdentificationCode")); + errors.add(new EnumMessage(BackEndError.ValidationError, "bankIdentificationCode")); if (!StringUtils.hasLength(this.bankName)) - return List.of(new EnumMessage(BackEndError.ValidationError, "bankIdentificationCode")); + errors.add(new EnumMessage(BackEndError.ValidationError, "bankIdentificationCode")); if ("RUB".equalsIgnoreCase(this.currency) && !StringUtils.hasLength(correspondentAccount)) { - return List.of(new EnumMessage(BackEndError.ValidationError, "correspondentAccount")); + errors.add(new EnumMessage(BackEndError.ValidationError, "correspondentAccount")); } if ("RUB".equalsIgnoreCase(this.currency) && !StringUtils.hasLength(correspondentAccountName)) { - return List.of(new EnumMessage(BackEndError.ValidationError, "correspondentAccountName")); + errors.add(new EnumMessage(BackEndError.ValidationError, "correspondentAccountName")); } if (!StringUtils.hasLength(currency)) { - return List.of(new EnumMessage(BackEndError.ValidationError, "currency")); + errors.add(new EnumMessage(BackEndError.ValidationError, "currency")); } if (!StringUtils.hasLength(destination)) { - return List.of(new EnumMessage(BackEndError.ValidationError, "destination")); + errors.add(new EnumMessage(BackEndError.ValidationError, "destination")); } if ("RUB".equalsIgnoreCase(this.currency) && !StringUtils.hasLength(taxpayerIdentificationNumber)) { - return List.of(new EnumMessage(BackEndError.ValidationError, "taxpayerIdentificationNumber")); + errors.add(new EnumMessage(BackEndError.ValidationError, "taxpayerIdentificationNumber")); } if ("RUB".equalsIgnoreCase(this.currency) && !StringUtils.hasLength(taxRegistrationReasonCode)) { - return List.of(new EnumMessage(BackEndError.ValidationError, "taxRegistrationReasonCode")); + errors.add(new EnumMessage(BackEndError.ValidationError, "taxRegistrationReasonCode")); } - - return Collections.emptyList(); + if (TextUtil.isEmpty(account)) { + errors.add(new EnumMessage(BackEndError.ValidationError, "account")); + } + return errors.isEmpty() ? Collections.emptyList() : errors; } @Override @@ -79,6 +87,7 @@ public class BankAccountNewAction implements IAction { req.setDestination(this.destination); req.setTaxpayerIdentificationNumber(this.taxpayerIdentificationNumber); req.setTaxRegistrationReasonCode(this.taxRegistrationReasonCode); + req.setAccount(this.account); return req; } @@ -151,4 +160,12 @@ public class BankAccountNewAction implements IAction { public void setTaxRegistrationReasonCode(String taxRegistrationReasonCode) { this.taxRegistrationReasonCode = taxRegistrationReasonCode; } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } } diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountUpdateAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountUpdateAction.java index 8fddae1b0..326bfed47 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountUpdateAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountUpdateAction.java @@ -40,6 +40,7 @@ public class BankAccountUpdateAction implements IAction validate() { @@ -58,6 +59,7 @@ public class BankAccountUpdateAction implements IAction userRequest) { log.debug("getAllBalance request received"); SDf08 sDf08 = new SDf08(); - sDf08.setNumber(BigDecimal.valueOf(Math.random())); + sDf08.setNumber(idGenerator.nextId().toString()); Instant now = Instant.now(); - sDf08.setDatetime(now); + sDf08.setDatetime(String.valueOf(now.toEpochMilli())); sDf08.setGenerationTime(now); sDf08.setGenerationId(idGenerator.nextId()); sdf8Map.insert(sDf08); diff --git a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf09Executor.java b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf09Executor.java index 20193293f..96e8608bc 100644 --- a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf09Executor.java +++ b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf09Executor.java @@ -162,7 +162,7 @@ public class Sdf09Executor extends AbstractExecutor { sDf10.setMarket(sdf09.getMarket()); sDf10.setType(sdf09.getType()); sDf10.setNumber(sdf09.getNumber()); - sDf10.setINN(sdf09.getInn()); + sDf10.setInn(sdf09.getInn()); sDf10.setResult("OK"); sDf10.setGenerationId(generationIdForGroup); sDf10.setGenerationTime(Instant.now()); diff --git a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf16Executor.java b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf16Executor.java index 62bb4b64d..373a4e0b1 100644 --- a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf16Executor.java +++ b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf16Executor.java @@ -176,9 +176,9 @@ public class Sdf16Executor extends AbstractExecutor { errorSdf.setSum(sdf.getSum()); errorSdf.setMarket(sdf.getMarket()); errorSdf.setType(sdf.getType()); - errorSdf.setINN(sdf.getInn()); - errorSdf.setBIC(sdf.getBic()); - errorSdf.setSPEC(sdf.getSpec()); + errorSdf.setInn(sdf.getInn()); + errorSdf.setBic(sdf.getBic()); + errorSdf.setSpec(sdf.getSpec()); errorSdf.setNumber(sdf.getNumber()); errorSdf.setResult(obtainResultNum(error)); errorSdf.setGenerationId(generationIdForGroup); @@ -193,9 +193,9 @@ public class Sdf16Executor extends AbstractExecutor { successSdf.setSum(sdf.getSum()); successSdf.setMarket(sdf.getMarket()); successSdf.setType(sdf.getType()); - successSdf.setINN(sdf.getInn()); - successSdf.setBIC(sdf.getBic()); - successSdf.setSPEC(sdf.getSpec()); + successSdf.setInn(sdf.getInn()); + successSdf.setBic(sdf.getBic()); + successSdf.setSpec(sdf.getSpec()); successSdf.setNumber(sdf.getNumber()); successSdf.setGenerationId(generationIdForGroup); successSdf.setGenerationTime(Instant.now()); diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/Account.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/Account.java index 766b9e6ba..7bc84b00c 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/Account.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/Account.java @@ -16,6 +16,7 @@ public class Account extends BusinessObject { private Long relationId; private String accountStatus; private String processingSign; + private Long companyId; public String getAccount() { return account; @@ -56,4 +57,12 @@ public class Account extends BusinessObject { public void setProcessingSign(String processingSign) { this.processingSign = processingSign; } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } } \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/BankAccount.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/BankAccount.java index 6a1bc2cef..57df0c509 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/BankAccount.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/BankAccount.java @@ -23,6 +23,8 @@ public class BankAccount extends SpcexObjectBase { private String swiftCode; private String taxpayerIdentificationNumber; private String taxRegistrationReasonCode; + private String account; + private Long companyId; public Long getAccountId() { return accountId; @@ -119,4 +121,20 @@ public class BankAccount extends SpcexObjectBase { public void setTaxRegistrationReasonCode(String value) { this.taxRegistrationReasonCode = value; } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } } \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/InformationAccount.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/InformationAccount.java index fda71b035..0c369fc5c 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/InformationAccount.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/InformationAccount.java @@ -13,6 +13,7 @@ public class InformationAccount extends SpcexObjectBase { private Long accountId; private Long clearingAccountId; + private Long companyId; public Long getAccountId() { return accountId; @@ -30,4 +31,11 @@ public class InformationAccount extends SpcexObjectBase { this.clearingAccountId = value; } + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } } \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/payment/PaymentInstruction.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/payment/PaymentInstruction.java index 8837e3ff7..d9e54e5e4 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/payment/PaymentInstruction.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/payment/PaymentInstruction.java @@ -10,9 +10,9 @@ public class PaymentInstruction extends BusinessObject { private static final long serialVersionUID = ConstSerializable.serialVersionUID; private Long senderId; // type="1" private Long addresseeId; // type="1" - private String adresseeBIC; // type="2" + private String adresseeBic; // type="2" private String payeeBankName; // type="2" - private String payeeBIC; // type="2" + private String payeeBic; // type="2" private String addresseeBankName; // type="2" private Instant paymentDate; // type="4" private String paymentPurpose; // type="2" @@ -49,12 +49,12 @@ public class PaymentInstruction extends BusinessObject { this.addresseeId = addresseeId; } - public String getAdresseeBIC() { - return adresseeBIC; + public String getAdresseeBic() { + return adresseeBic; } - public void setAdresseeBIC(String adresseeBIC) { - this.adresseeBIC = adresseeBIC; + public void setAdresseeBic(String adresseeBic) { + this.adresseeBic = adresseeBic; } public String getPayeeBankName() { @@ -65,12 +65,12 @@ public class PaymentInstruction extends BusinessObject { this.payeeBankName = payeeBankName; } - public String getPayeeBIC() { - return payeeBIC; + public String getPayeeBic() { + return payeeBic; } - public void setPayeeBIC(String payeeBIC) { - this.payeeBIC = payeeBIC; + public void setPayeeBic(String payeeBic) { + this.payeeBic = payeeBic; } public String getAddresseeBankName() { diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/PlannerAllToday.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/PlannerAllToday.java index 5c75befcc..80da5dc2e 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/PlannerAllToday.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/PlannerAllToday.java @@ -19,6 +19,7 @@ public class PlannerAllToday extends SpcexObjectBase { private LocalDate clearingDate; private String market; private String taskStatus; + private Long companyId; private Long securityId; private String parent; private Long parentId; @@ -87,4 +88,11 @@ public class PlannerAllToday extends SpcexObjectBase { this.parentId = value; } + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } } \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf08.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf08.java index 862fcb57b..ea7f7ad24 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf08.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf08.java @@ -3,7 +3,6 @@ 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; /** @@ -14,24 +13,24 @@ import java.time.Instant; public class SDf08 extends SpcexObjectBase { private static final long serialVersionUID = ConstSerializable.serialVersionUID; - private BigDecimal number; - private Instant datetime; + private String number; + private String datetime; private Instant generationTime; private Long generationId; - public BigDecimal getNumber() { + public String getNumber() { return number; } - public void setNumber(BigDecimal value) { + public void setNumber(String value) { this.number = value; } - public Instant getDatetime() { + public String getDatetime() { return datetime; } - public void setDatetime(Instant value) { + public void setDatetime(String value) { this.datetime = value; } 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 index 8ebf871ba..d8a2575b0 100644 --- 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 @@ -20,7 +20,7 @@ public class SDf10 extends SpcexObjectBase implements WithAccount { private String market; private String type; private BigDecimal number; - private BigDecimal INN; + private BigDecimal inn; private String result; private Instant generationTime; private Long generationId; @@ -67,12 +67,12 @@ public class SDf10 extends SpcexObjectBase implements WithAccount { this.number = number; } - public BigDecimal getINN() { - return INN; + public BigDecimal getInn() { + return inn; } - public void setINN(BigDecimal INN) { - this.INN = INN; + public void setInn(BigDecimal inn) { + this.inn = inn; } public String getResult() { 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 fd3ee5f18..d55f50c5b 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 @@ -19,9 +19,9 @@ public class SDf17 extends SpcexObjectBase implements WithAccount { private BigDecimal sum; private String market; private String type; - private BigDecimal INN; - private BigDecimal BIC; - private String SPEC; + private BigDecimal inn; + private BigDecimal bic; + private String spec; private BigDecimal number; private Integer result; private Instant generationTime; @@ -61,28 +61,28 @@ public class SDf17 extends SpcexObjectBase implements WithAccount { this.type = value; } - public BigDecimal getINN() { - return INN; + public BigDecimal getInn() { + return inn; } - public void setINN(BigDecimal value) { - this.INN = value; + public void setInn(BigDecimal value) { + this.inn = value; } - public BigDecimal getBIC() { - return BIC; + public BigDecimal getBic() { + return bic; } - public void setBIC(BigDecimal value) { - this.BIC = value; + public void setBic(BigDecimal value) { + this.bic = value; } - public String getSPEC() { - return SPEC; + public String getSpec() { + return spec; } - public void setSPEC(String value) { - this.SPEC = value; + public void setSpec(String value) { + this.spec = value; } public BigDecimal getNumber() { 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 index 3a9f71749..ce0204280 100644 --- 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 @@ -18,7 +18,7 @@ public class S_DF10_Converter extends DFConverter { values.add(typeMatch(entity.getMarket())); values.add(typeMatch(entity.getType())); values.add(typeMatch(entity.getNumber())); - values.add(typeMatch(entity.getINN())); + values.add(typeMatch(entity.getInn())); values.add(typeMatch(entity.getResult())); return values.toArray(Object[]::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 index 5a43a2255..0b00658b2 100644 --- 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 @@ -17,9 +17,9 @@ public class S_DF17_Converter extends DFConverter { 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.getInn())); + values.add(typeMatch(entity.getBic())); + values.add(typeMatch(entity.getSpec())); values.add(typeMatch(entity.getNumber())); values.add(typeMatch(entity.getResult())); return values.toArray(Object[]::new); diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/InformationAccountHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/InformationAccountHistoryMapStore.java index 8d768ae20..2cc1fb804 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/InformationAccountHistoryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/InformationAccountHistoryMapStore.java @@ -28,7 +28,7 @@ public class InformationAccountHistoryMapStore extends TemplateEventMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "CREATED_AT", "UPDATED_AT", "ACCOUNT", "ACCOUNT_TYPE", "RELATION_ID", "ACCOUNT_STATUS", "PROCESSING_SIGN" + "ID", "CREATED_AT", "UPDATED_AT", "ACCOUNT", "ACCOUNT_TYPE", "RELATION_ID", "ACCOUNT_STATUS", "PROCESSING_SIGN", "COMPANY_ID" }; } @@ -45,6 +45,7 @@ public class AccountMapStore extends TemplateMapStore { object.setRelationId(resultSet.getObject("RELATION_ID", Long.class)); object.setAccountStatus(resultSet.getObject("ACCOUNT_STATUS", String.class)); object.setProcessingSign(resultSet.getObject("PROCESSING_SIGN", String.class)); + object.setCompanyId(resultSet.getObject("COMPANY_ID", Long.class)); return object; } @@ -58,7 +59,8 @@ public class AccountMapStore extends TemplateMapStore { object.getAccountType(), object.getRelationId(), object.getAccountStatus(), - object.getProcessingSign() + object.getProcessingSign(), + object.getCompanyId() }; return args; } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/BankAccountMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/BankAccountMapStore.java index 4b28cc7d2..ba5f4d398 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/BankAccountMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/BankAccountMapStore.java @@ -29,7 +29,7 @@ public class BankAccountMapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "ACCOUNT_ID", "BANK_IDENTIFICATION_CODE", "BANK_NAME", "CORRESPONDENT_ACCOUNT", "CORRESPONDENT_ACCOUNT_NAME", "CURRENCY", "DESTINATION", "IBAN", "INTERNATIONAL_TRANSFER_SIGN", "SWIFT_CODE", "TAXPAYER_IDENTIFICATION_NUMBER", "TAX_REGISTRATION_REASON_CODE" + "ID", "ACCOUNT_ID", "BANK_IDENTIFICATION_CODE", "BANK_NAME", "CORRESPONDENT_ACCOUNT", "CORRESPONDENT_ACCOUNT_NAME", "CURRENCY", "DESTINATION", "IBAN", "INTERNATIONAL_TRANSFER_SIGN", "SWIFT_CODE", "TAXPAYER_IDENTIFICATION_NUMBER", "TAX_REGISTRATION_REASON_CODE", "ACCOUNT", "COMPANY_ID" }; } @@ -49,6 +49,8 @@ public class BankAccountMapStore extends TemplateMapStore { object.setSwiftCode(resultSet.getObject("SWIFT_CODE", String.class)); object.setTaxpayerIdentificationNumber(resultSet.getObject("TAXPAYER_IDENTIFICATION_NUMBER", String.class)); object.setTaxRegistrationReasonCode(resultSet.getObject("TAX_REGISTRATION_REASON_CODE", String.class)); + object.setAccount(resultSet.getObject("ACCOUNT", String.class)); + object.setCompanyId(resultSet.getObject("COMPANY_ID", Long.class)); return object; } @@ -68,6 +70,8 @@ public class BankAccountMapStore extends TemplateMapStore { object.getSwiftCode(), object.getTaxpayerIdentificationNumber(), object.getTaxRegistrationReasonCode(), + object.getAccount(), + object.getCompanyId(), }; return args; } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/InformationAccountMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/InformationAccountMapStore.java index 835d4681a..86d20cb6c 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/InformationAccountMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/InformationAccountMapStore.java @@ -29,7 +29,7 @@ public class InformationAccountMapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "TASK", "TASK_TIME", "CLEARING_DATE", "MARKET", "TASK_STATUS", "SECURITY_ID", "PARENT", "PARENT_ID" + "ID", "TASK", "TASK_TIME", "CLEARING_DATE", "MARKET", "TASK_STATUS", "COMPANY_ID", "SECURITY_ID", "PARENT", "PARENT_ID" }; } @@ -43,6 +43,7 @@ public class PlannerAllTodayMapStore extends TemplateMapStore { object.setClearingDate(getLocalDateFromSqlDate(resultSet, "CLEARING_DATE")); object.setMarket(resultSet.getObject("MARKET", String.class)); object.setTaskStatus(resultSet.getObject("TASK_STATUS", String.class)); + object.setCompanyId(resultSet.getObject("COMPANY_ID", Long.class)); object.setSecurityId(resultSet.getObject("SECURITY_ID", Long.class)); object.setParent(resultSet.getObject("PARENT", String.class)); object.setParentId(resultSet.getObject("PARENT_ID", Long.class)); @@ -58,6 +59,7 @@ public class PlannerAllTodayMapStore extends TemplateMapStore { TimeUtil.toDateFromLocalDate(object.getClearingDate()), object.getMarket(), object.getTaskStatus(), + object.getCompanyId(), object.getSecurityId(), object.getParent(), object.getParentId() diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf08MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf08MapStore.java index 6681bef28..b81be7113 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf08MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf08MapStore.java @@ -7,7 +7,6 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.base.TemplateMapStore; import ru.spcex.platform.utils.time.TimeUtil; -import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; @@ -39,8 +38,8 @@ public class SDf08MapStore extends TemplateMapStore { public SDf08 objectReader(ResultSet resultSet) throws SQLException { SDf08 object = new SDf08(); object.setId(resultSet.getObject("ID", Long.class)); - object.setNumber(resultSet.getObject("NUMBER", BigDecimal.class)); - object.setDatetime(getInstantFromTimestamp(resultSet, "DATETIME")); + object.setNumber(resultSet.getObject("NUMBER", String.class)); + object.setDatetime(resultSet.getObject("DATETIME", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); return object; @@ -51,7 +50,7 @@ public class SDf08MapStore extends TemplateMapStore { Object[] args = new Object[]{ object.getId(), object.getNumber(), - TimeUtil.toDateFromInstant(object.getDatetime()), + object.getDatetime(), TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId() }; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf09MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf09MapStore.java index 34a9269b3..2cc841e7d 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf09MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf09MapStore.java @@ -31,7 +31,7 @@ public class SDf09MapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "ACCOUNT", "SUM", "MARKET", "TYPE", "NUMBER", "_I_N_N", "FILE_NAME", "GENERATION_TIME", + "ID", "ACCOUNT", "SUM", "MARKET", "TYPE", "NUMBER", "INN", "FILE_NAME", "GENERATION_TIME", "GENERATION_ID" }; } @@ -45,7 +45,7 @@ public class SDf09MapStore extends TemplateMapStore { object.setMarket(resultSet.getString("MARKET")); object.setType(resultSet.getString("TYPE")); object.setNumber(resultSet.getObject("NUMBER", BigDecimal.class)); - object.setInn(resultSet.getObject("_I_N_N", BigDecimal.class)); + object.setInn(resultSet.getObject("INN", BigDecimal.class)); object.setFileName(resultSet.getString("FILE_NAME")); 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/SDf10MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf10MapStore.java index 98120f165..fab361ee3 100644 --- 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 @@ -31,7 +31,7 @@ public class SDf10MapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "ACCOUNT", "SUM", "MARKET", "TYPE", "NUMBER", "_I_N_N", + "ID", "ACCOUNT", "SUM", "MARKET", "TYPE", "NUMBER", "INN", "RESULT", "GENERATION_TIME", "GENERATION_ID", "IN_S_DF09_ID" }; } @@ -45,7 +45,7 @@ public class SDf10MapStore extends TemplateMapStore { 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.setInn(resultSet.getObject("INN", BigDecimal.class)); object.setResult(resultSet.getObject("RESULT", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); @@ -62,7 +62,7 @@ public class SDf10MapStore extends TemplateMapStore { object.getMarket(), object.getType(), object.getNumber(), - object.getINN(), + object.getInn(), object.getResult(), 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 23dbfe7c0..ca6190d50 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", "ACCOUNT", "SUM", "MARKET", "TYPE", "_I_N_N", "_B_I_C", "_S_P_E_C", "NUMBER", "FILE_NAME", "GENERATION_TIME", "GENERATION_ID" + "ID", "ACCOUNT", "SUM", "MARKET", "TYPE", "INN", "BIC", "SPEC", "NUMBER", "FILE_NAME", "GENERATION_TIME", "GENERATION_ID" }; } @@ -43,9 +43,9 @@ public class SDf16MapStore extends TemplateMapStore { 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.setInn(resultSet.getObject("INN", BigDecimal.class)); + object.setBic(resultSet.getObject("BIC", BigDecimal.class)); + object.setSpec(resultSet.getObject("SPEC", String.class)); object.setNumber(resultSet.getObject("NUMBER", BigDecimal.class)); object.setFileName(resultSet.getObject("FILE_NAME", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); 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 8f3b60e9a..b20011140 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 @@ -31,7 +31,7 @@ public class SDf17MapStore extends TemplateMapStore { @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" + "ID", "ACCOUNT", "SUM", "MARKET", "TYPE", "INN", "BIC", "SPEC", "NUMBER", "RESULT", "GENERATION_TIME", "GENERATION_ID", "IN_S_DF16_ID" }; } @@ -43,9 +43,9 @@ public class SDf17MapStore extends TemplateMapStore { 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.setInn(resultSet.getObject("INN", BigDecimal.class)); + object.setBic(resultSet.getObject("BIC", BigDecimal.class)); + object.setSpec(resultSet.getObject("SPEC", String.class)); object.setNumber(resultSet.getObject("NUMBER", BigDecimal.class)); object.setResult(resultSet.getObject("RESULT", Integer.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); @@ -62,9 +62,9 @@ public class SDf17MapStore extends TemplateMapStore { object.getSum(), object.getMarket(), object.getType(), - object.getINN(), - object.getBIC(), - object.getSPEC(), + object.getInn(), + object.getBic(), + object.getSpec(), object.getNumber(), object.getResult(), TimeUtil.toDateFromInstant(object.getGenerationTime()), diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/util/Util.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/util/Util.java index 8e75d85fc..9ad1d2551 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/util/Util.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/util/Util.java @@ -93,6 +93,7 @@ public class Util { res.setClearingDate(planner.getClearingDate()); res.setMarket(planner.getMarket()); res.setTaskStatus(planner.getTaskStatus()); + res.setCompanyId(planner.getCompanyId()); res.setSecurityId(planner.getSecurityId()); res.setParent("PLNR"); res.setParentId(planner.getId());