treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://jira.mfd.msk:8088/browse/CLS-198

Browse source
This commit is contained in:
ialbert 2022-12-22 17:27:07 +03:00
parent 64d889566d
commit 487752def2
29 changed files with 176 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java
View file

@ -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);

2
clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/BankAccountService.java
View file

@ -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());

37
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountNewAction.java
View file

@ -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<BankAccountNewRequest> {
@ApiModelProperty(value = "Код причины постановки (КПП)", example = "01")
@JsonProperty
private String taxRegistrationReasonCode;
@ApiModelProperty(value = "Номер счета", example = "1234567")
@JsonProperty
private String account;
@Override
public Collection<EnumMessage> validate() {
List<EnumMessage> 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<BankAccountNewRequest> {
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<BankAccountNewRequest> {
public void setTaxRegistrationReasonCode(String taxRegistrationReasonCode) {
this.taxRegistrationReasonCode = taxRegistrationReasonCode;
}
public String getAccount() {
return account;
}
public void setAccount(String account) {
this.account = account;
}
}

10
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountUpdateAction.java
View file

@ -40,6 +40,7 @@ public class BankAccountUpdateAction implements IAction<BankAccountUpdateRequest
private String taxRegistrationReasonCode;
@ApiModelProperty(value = "Номер счета", example = "11111222223333344444")
private String account;
@Override
public Collection<EnumMessage> validate() {
@ -58,6 +59,7 @@ public class BankAccountUpdateAction implements IAction<BankAccountUpdateRequest
req.setDestination(this.destination);
req.setTaxpayerIdentificationNumber(this.taxpayerIdentificationNumber);
req.setTaxRegistrationReasonCode(this.taxRegistrationReasonCode);
req.setAccount(this.account);
return req;
}
@ -138,4 +140,12 @@ public class BankAccountUpdateAction implements IAction<BankAccountUpdateRequest
public void setTaxRegistrationReasonCode(String taxRegistrationReasonCode) {
this.taxRegistrationReasonCode = taxRegistrationReasonCode;
}
public String getAccount() {
return account;
}
public void setAccount(String account) {
this.account = account;
}
}

5
clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf08Service.java
View file

@ -17,7 +17,6 @@ import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgId;
import ru.spcex.platform.imdg.api.ImdgProvider;
import java.math.BigDecimal;
import java.time.Instant;
@Service
@ -46,9 +45,9 @@ public class Sdf08Service extends QueueConsumer implements InitializingBean {
private void newSDf08(BaseRequest<Object> 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);

2
clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf09Executor.java
View file

@ -162,7 +162,7 @@ public class Sdf09Executor extends AbstractExecutor<SDf09> {
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());

12
clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf16Executor.java
View file

@ -176,9 +176,9 @@ public class Sdf16Executor extends AbstractExecutor<SDf16> {
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<SDf16> {
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());

9
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/Account.java
View file

@ -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;
}
}

18
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/BankAccount.java
View file

@ -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;
}
}

8
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/InformationAccount.java
View file

@ -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;
}
}

20
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/payment/PaymentInstruction.java
View file

@ -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() {

8
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/PlannerAllToday.java
View file

@ -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;
}
}

13
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf08.java
View file

@ -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;
}

10
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf10.java
View file

@ -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() {

30
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf17.java
View file

@ -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() {

2
clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF10_Converter.java
View file

@ -18,7 +18,7 @@ public class S_DF10_Converter extends DFConverter<SDf10> {
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);
}

6
clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/converters/S_DF17_Converter.java
View file

@ -17,9 +17,9 @@ public class S_DF17_Converter extends DFConverter<SDf17> {
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);

5
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/InformationAccountHistoryMapStore.java
View file

@ -28,7 +28,7 @@ public class InformationAccountHistoryMapStore extends TemplateEventMapStore<Inf
@Override
public String[] getFields() {
return new String[]{"ID", "EVENT_TIME", "EVENT_USER_ID",
"INFORMATION_ACCOUNT_ID", "ACCOUNT_ID", "CLEARING_ACCOUNT_ID"
"INFORMATION_ACCOUNT_ID", "ACCOUNT_ID", "CLEARING_ACCOUNT_ID", "COMPANY_ID"
};
}
@ -42,7 +42,8 @@ public class InformationAccountHistoryMapStore extends TemplateEventMapStore<Inf
object.getId(),
object.getAccountId(),
object.getClearingAccountId()
object.getClearingAccountId(),
object.getCompanyId()
};
return args;
}

6
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/AccountMapStore.java
View file

@ -30,7 +30,7 @@ public class AccountMapStore extends TemplateMapStore<Account> {
@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<Account> {
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<Account> {
object.getAccountType(),
object.getRelationId(),
object.getAccountStatus(),
object.getProcessingSign()
object.getProcessingSign(),
object.getCompanyId()
};
return args;
}

6
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/BankAccountMapStore.java
View file

@ -29,7 +29,7 @@ public class BankAccountMapStore extends TemplateMapStore<BankAccount> {
@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<BankAccount> {
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<BankAccount> {
object.getSwiftCode(),
object.getTaxpayerIdentificationNumber(),
object.getTaxRegistrationReasonCode(),
object.getAccount(),
object.getCompanyId(),
};
return args;
}

6
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/InformationAccountMapStore.java
View file

@ -29,7 +29,7 @@ public class InformationAccountMapStore extends TemplateMapStore<InformationAcco
@Override
public String[] getFields() {
return new String[]{
"ID", "ACCOUNT_ID", "CLEARING_ACCOUNT_ID"
"ID", "ACCOUNT_ID", "CLEARING_ACCOUNT_ID", "COMPANY_ID"
};
}
@ -39,6 +39,7 @@ public class InformationAccountMapStore extends TemplateMapStore<InformationAcco
object.setId(resultSet.getObject("ID", Long.class));
object.setAccountId(resultSet.getObject("ACCOUNT_ID", Long.class));
object.setClearingAccountId(resultSet.getObject("CLEARING_ACCOUNT_ID", Long.class));
object.setCompanyId(resultSet.getObject("COMPANY_ID", Long.class));
return object;
}
@ -47,7 +48,8 @@ public class InformationAccountMapStore extends TemplateMapStore<InformationAcco
Object[] args = new Object[]{
object.getId(),
object.getAccountId(),
object.getClearingAccountId()
object.getClearingAccountId(),
object.getCompanyId()
};
return args;
}

10
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/PaymentInstructionMapStore.java
View file

@ -29,7 +29,7 @@ public class PaymentInstructionMapStore extends TemplateMapStore<PaymentInstruct
@Override
public String[] getFields() {
return new String[]{"id", "created_at", "updated_at", "sender_id", "addressee_id", "adressee_b_i_c", "payee_bank_name", "payee_b_i_c", "addressee_bank_name", "payment_date",
return new String[]{"id", "created_at", "updated_at", "sender_id", "addressee_id", "adressee_bic", "payee_bank_name", "payee_bic", "addressee_bank_name", "payment_date",
"payment_purpose", "settlement_date", "credit_leg_amount", "debit_leg_amount", "credit_leg_account_id", "credit_cs_account", "credit_leg_account", "debit_leg_account_id",
"debit_cs_account", "debit_leg_account", "credit_leg_direction", "debit_leg_direction", "credit_leg_currency_code", "debit_leg_currency_code", "clearing_date", "transaction_status", "document_number"};
}
@ -42,9 +42,9 @@ public class PaymentInstructionMapStore extends TemplateMapStore<PaymentInstruct
paymentInstruction.setUpdated(getInstantFromTimestamp(resultSet, "updated_at"));
paymentInstruction.setSenderId(resultSet.getLong("sender_id"));
paymentInstruction.setAddresseeId(resultSet.getLong("addressee_id"));
paymentInstruction.setAdresseeBIC(resultSet.getString("adressee_b_i_c"));
paymentInstruction.setAdresseeBic(resultSet.getString("adressee_bic"));
paymentInstruction.setPayeeBankName(resultSet.getString("payee_bank_name"));
paymentInstruction.setPayeeBIC(resultSet.getString("payee_b_i_c"));
paymentInstruction.setPayeeBic(resultSet.getString("payee_bic"));
paymentInstruction.setAddresseeBankName(resultSet.getString("addressee_bank_name"));
paymentInstruction.setPaymentDate(getInstantFromTimestamp(resultSet, "payment_date"));
paymentInstruction.setPaymentPurpose(resultSet.getString("payment_purpose"));
@ -75,9 +75,9 @@ public class PaymentInstructionMapStore extends TemplateMapStore<PaymentInstruct
TimeUtil.toDateFromInstant(paymentInstruction.getUpdated()),
paymentInstruction.getSenderId(),
paymentInstruction.getAddresseeId(),
paymentInstruction.getAdresseeBIC(),
paymentInstruction.getAdresseeBic(),
paymentInstruction.getPayeeBankName(),
paymentInstruction.getPayeeBIC(),
paymentInstruction.getPayeeBic(),
paymentInstruction.getAddresseeBankName(),
TimeUtil.toDateFromInstant(paymentInstruction.getPaymentDate()),
paymentInstruction.getPaymentPurpose(),

4
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/PlannerAllTodayMapStore.java
View file

@ -30,7 +30,7 @@ public class PlannerAllTodayMapStore extends TemplateMapStore<PlannerAllToday> {
@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<PlannerAllToday> {
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<PlannerAllToday> {
TimeUtil.toDateFromLocalDate(object.getClearingDate()),
object.getMarket(),
object.getTaskStatus(),
object.getCompanyId(),
object.getSecurityId(),
object.getParent(),
object.getParentId()

7
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf08MapStore.java
View file

@ -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<SDf08> {
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<SDf08> {
Object[] args = new Object[]{
object.getId(),
object.getNumber(),
TimeUtil.toDateFromInstant(object.getDatetime()),
object.getDatetime(),
TimeUtil.toDateFromInstant(object.getGenerationTime()),
object.getGenerationId()
};

4
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf09MapStore.java
View file

@ -31,7 +31,7 @@ public class SDf09MapStore extends TemplateMapStore<SDf09> {
@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<SDf09> {
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));

6
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf10MapStore.java
View file

@ -31,7 +31,7 @@ public class SDf10MapStore extends TemplateMapStore<SDf10> {
@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<SDf10> {
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<SDf10> {
object.getMarket(),
object.getType(),
object.getNumber(),
object.getINN(),
object.getInn(),
object.getResult(),
TimeUtil.toDateFromInstant(object.getGenerationTime()),
object.getGenerationId(),

8
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf16MapStore.java
View file

@ -31,7 +31,7 @@ public class SDf16MapStore extends TemplateMapStore<SDf16> {
@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<SDf16> {
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"));

14
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf17MapStore.java
View file

@ -31,7 +31,7 @@ public class SDf17MapStore extends TemplateMapStore<SDf17> {
@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<SDf17> {
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<SDf17> {
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()),

1
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/util/Util.java
View file

@ -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());