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

meta 3.5.0.30 http://jira.mfd.msk:8088/browse/CLS-344 обновление классов

Browse source
This commit is contained in:
AKurakin 2023-05-29 19:59:23 +03:00
parent d8f79b85ee
commit 4b58259239
20 changed files with 81 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -268,6 +268,9 @@ public class AccountService extends QueueConsumer implements InitializingBean {
log.warn("Relation for consumerId {} contains multiply elements, use first", companyId);
Relation relation = relations.iterator().next();
account.setRelationId(relation.getId());
if (account.getCompanyId() == null) {
account.setCompanyId(relation.getConsumerId());
}
return null;
}

9
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/execution/ExecutionDeposit.java
View file

@ -16,6 +16,7 @@ public class ExecutionDeposit extends ExecutionCommon {
private String firstLegSettlementCode;
private String secondLegSettlementCode;
private String contract;
private String securityCode;
@Override
public ExecutionType type() {
@ -77,4 +78,12 @@ public class ExecutionDeposit extends ExecutionCommon {
public void setContract(String contract) {
this.contract = contract;
}
public String getSecurityCode() {
return securityCode;
}
public void setSecurityCode(String securityCode) {
this.securityCode = securityCode;
}
}

6
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf05.java
View file

@ -18,7 +18,7 @@ public class SDf05 extends SpcexObjectBase {
private BigDecimal tp;
private LocalDate dt;
private LocalTime tm;
private String tm;
private String pr;
private Instant generationTime;
private Long generationId;
@ -39,11 +39,11 @@ public class SDf05 extends SpcexObjectBase {
this.dt = dt;
}
public LocalTime getTm() {
public String getTm() {
return tm;
}
public void setTm(LocalTime tm) {
public void setTm(String tm) {
this.tm = tm;
}

6
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf09.java
View file

@ -20,7 +20,7 @@ public class SDf09 extends SpcexObjectBase {
private String quantity;
private String securityCode;
private String clientName;
private BigDecimal result;
private String result;
private Instant generationTime;
private Long generationId;
@ -72,11 +72,11 @@ public class SDf09 extends SpcexObjectBase {
this.clientName = clientName;
}
public BigDecimal getResult() {
public String getResult() {
return result;
}
public void setResult(BigDecimal result) {
public void setResult(String result) {
this.result = result;
}

6
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf11.java
View file

@ -20,7 +20,7 @@ public class SDf11 extends SpcexObjectBase {
private String quantity;
private String securityCode;
private String clientName;
private BigDecimal result;
private String result;
private Instant generationTime;
private Long generationId;
@ -72,11 +72,11 @@ public class SDf11 extends SpcexObjectBase {
this.clientName = clientName;
}
public BigDecimal getResult() {
public String getResult() {
return result;
}
public void setResult(BigDecimal result) {
public void setResult(String result) {
this.result = result;
}

33
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf12.java
View file

@ -15,11 +15,14 @@ public class SDf12 extends SpcexObjectBase {
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private String outDocument;
private String direction;
private String quantity;
private String securityCode;
private String depoCodeSender;
private String depoCodeAdressee;
private BigDecimal result;
private String transactionNumber;
private String transactionQuantity;
private String result;
private Instant generationTime;
private Long generationId;
@ -31,6 +34,14 @@ public class SDf12 extends SpcexObjectBase {
this.outDocument = outDocument;
}
public String getDirection() {
return direction;
}
public void setDirection(String direction) {
this.direction = direction;
}
public String getQuantity() {
return quantity;
}
@ -63,11 +74,27 @@ public class SDf12 extends SpcexObjectBase {
this.depoCodeAdressee = depoCodeAdressee;
}
public BigDecimal getResult() {
public String getTransactionNumber() {
return transactionNumber;
}
public void setTransactionNumber(String transactionNumber) {
this.transactionNumber = transactionNumber;
}
public String getTransactionQuantity() {
return transactionQuantity;
}
public void setTransactionQuantity(String transactionQuantity) {
this.transactionQuantity = transactionQuantity;
}
public String getResult() {
return result;
}
public void setResult(BigDecimal result) {
public void setResult(String result) {
this.result = result;
}

6
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf13.java
View file

@ -16,7 +16,7 @@ public class SDf13 extends SpcexObjectBase {
private String outDocument;
private String inDocument;
private BigDecimal result;
private String result;
private String textError;
private String fileName;
private Instant generationTime;
@ -38,11 +38,11 @@ public class SDf13 extends SpcexObjectBase {
this.inDocument = inDocument;
}
public BigDecimal getResult() {
public String getResult() {
return result;
}
public void setResult(BigDecimal result) {
public void setResult(String result) {
this.result = result;
}

6
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf14.java
View file

@ -15,7 +15,7 @@ public class SDf14 extends SpcexObjectBase {
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private String outDocument;
private BigDecimal result;
private String result;
private Instant generationTime;
private Long generationId;
@ -27,11 +27,11 @@ public class SDf14 extends SpcexObjectBase {
this.outDocument = value;
}
public BigDecimal getResult() {
public String getResult() {
return result;
}
public void setResult(BigDecimal value) {
public void setResult(String value) {
this.result = value;
}

6
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf53.java
View file

@ -17,7 +17,7 @@ public class SDf53 extends SpcexObjectBase {
private String account;
private String deal;
private Long status;
private BigDecimal result;
private String result;
private Instant generationTime;
private Long generationId;
private Long inSDfId;
@ -46,11 +46,11 @@ public class SDf53 extends SpcexObjectBase {
this.status = value;
}
public BigDecimal getResult() {
public String getResult() {
return result;
}
public void setResult(BigDecimal value) {
public void setResult(String value) {
this.result = value;
}

2
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FinishingSession.java
View file

@ -141,7 +141,7 @@ public class FinishingSession implements ISessionStage {
sdf05.setId(imdgProvider.getImdgIdGenerator().nextId());
sdf05.setTp(BigDecimal.valueOf(753));
sdf05.setDt(LocalDate.now());
sdf05.setTm(LocalTime.now());
sdf05.setTm(LocalTime.now().toString()); // todo уточнить формат для sdf05
sdf05.setPr("3");
sdf05.setGenerationTime(Instant.now());
sdf05.setGenerationId(imdgProvider.getImdgIdGenerator().nextId());

2
clearing-parent/dbf-exporter/src/test/java/ru/spcex/clearing/dbf/exporter/services/S_DF05_Test.java
View file

@ -43,7 +43,7 @@ class S_DF05_Test extends AbstractServiceTest {
sDf05.setGenerationId(generationId);
sDf05.setTp(new BigDecimal(32));
sDf05.setDt(LocalDate.now());
sDf05.setTm(LocalTime.now());
sDf05.setTm(LocalTime.now().toString());
sDf05.setPr("deal");
map.insert(sDf05);
SdfClearingRequest sdfClearingRequest = new SdfClearingRequest();

2
clearing-parent/dbf-exporter/src/test/java/ru/spcex/clearing/dbf/exporter/services/S_DF53_Test.java
View file

@ -42,7 +42,7 @@ class S_DF53_Test extends AbstractServiceTest {
sDf53.setAccount("curr_code");
sDf53.setDeal("245367");
sDf53.setStatus(12345L);
sDf53.setResult(new BigDecimal(2345));
sDf53.setResult("OK");
map.insert(sDf53);
SdfClearingRequest sdfClearingRequest = new SdfClearingRequest();
sdfClearingRequest.setGroupId(generationId);

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

@ -39,7 +39,7 @@ public class ExecutionDepositMapStore extends TemplateMapStore<ExecutionDeposit>
"MARKET", "PRICE", "LOTS", "QUANTITY", "FIRST_LEG_AMOUNT", "SECOND_LEG_AMOUNT", "INTEREST_AMOUNT",
"SIDE", "SETTLEMENT_CURRENCY", "COMPANY_ID", "DURATION", "FIRST_LEG_SETTLEMENT_DATE", "SECOND_LEG_SETTLEMENT_DATE",
"FIRST_LEG_SETTLEMENT_CODE", "SECOND_LEG_SETTLEMENT_CODE", "SECURITY_FULL_NAME", "SECURITY_SYMBOL",
"SECURITY_ID", "CONTRACT", "COUNTER_PARTY_ID", "COVERAGE_STATUS", "SESSION_ID", "CLEARING_DATE"
"SECURITY_CODE", "SECURITY_ID", "CONTRACT", "COUNTER_PARTY_ID", "COVERAGE_STATUS", "SESSION_ID", "CLEARING_DATE"
};
}
@ -70,6 +70,7 @@ public class ExecutionDepositMapStore extends TemplateMapStore<ExecutionDeposit>
object.setSecondLegSettlementCode(resultSet.getObject("SECOND_LEG_SETTLEMENT_CODE", String.class));
object.setSecurityFullName(resultSet.getObject("SECURITY_FULL_NAME", String.class));
object.setSecuritySymbol(resultSet.getObject("SECURITY_SYMBOL", String.class));
object.setSecurityCode(resultSet.getObject("SECURITY_CODE", String.class));
object.setSecurityId(resultSet.getObject("SECURITY_ID", Long.class));
object.setContract(resultSet.getObject("CONTRACT", String.class));
object.setCounterPartyId(resultSet.getObject("COUNTER_PARTY_ID", Long.class));
@ -106,6 +107,7 @@ public class ExecutionDepositMapStore extends TemplateMapStore<ExecutionDeposit>
object.getSecondLegSettlementCode(),
object.getSecurityFullName(),
object.getSecuritySymbol(),
object.getSecurityCode(),
object.getSecurityId(),
object.getContract(),
object.getCounterPartyId(),

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

@ -41,7 +41,7 @@ public class SDf05MapStore extends TemplateMapStore<SDf05> {
object.setId(resultSet.getObject("ID", Long.class));
object.setTp(resultSet.getObject("TP", BigDecimal.class));
object.setDt(getLocalDateFromSqlDate(resultSet, "DT"));
object.setTm(getLocalTimeFromSqlTime(resultSet, "TM"));
object.setTm(resultSet.getObject("TM", String.class));
object.setPr(resultSet.getObject("PR", String.class));
object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME"));
object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class));
@ -54,7 +54,7 @@ public class SDf05MapStore extends TemplateMapStore<SDf05> {
object.getId(),
object.getTp(),
TimeUtil.toDateFromLocalDate(object.getDt()),
TimeUtil.toDateFromLocalTime(object.getTm()),
object.getTm(),
object.getPr(),
TimeUtil.toDateFromInstant(object.getGenerationTime()),
object.getGenerationId()

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

@ -45,7 +45,7 @@ public class SDf09MapStore extends TemplateMapStore<SDf09> {
object.setQuantity(resultSet.getObject("QUANTITY", String.class));
object.setSecurityCode(resultSet.getObject("SECURITY_CODE", String.class));
object.setClientName(resultSet.getObject("CLIENT_NAME", String.class));
object.setResult(resultSet.getObject("RESULT", BigDecimal.class));
object.setResult(resultSet.getObject("RESULT", String.class));
object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME"));
object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class));
return object;

2
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf11MapStore.java
View file

@ -45,7 +45,7 @@ public class SDf11MapStore extends TemplateMapStore<SDf11> {
object.setQuantity(resultSet.getObject("QUANTITY", String.class));
object.setSecurityCode(resultSet.getObject("SECURITY_CODE", String.class));
object.setClientName(resultSet.getObject("CLIENT_NAME", String.class));
object.setResult(resultSet.getObject("RESULT", BigDecimal.class));
object.setResult(resultSet.getObject("RESULT", String.class));
object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME"));
object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class));
return object;

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

@ -33,7 +33,7 @@ public class SDf12MapStore extends TemplateMapStore<SDf12> {
@Override
public String[] getFields() {
return new String[]{
"ID", "OUT_DOCUMENT", "QUANTITY", "SECURITY_CODE", "DEPO_CODE_SENDER", "DEPO_CODE_ADRESSEE", "RESULT", "GENERATION_TIME", "GENERATION_ID"
"ID", "OUT_DOCUMENT", "DIRECTION", "QUANTITY", "SECURITY_CODE", "DEPO_CODE_SENDER", "DEPO_CODE_ADRESSEE", "TRANSACTION_NUMBER", "TRANSACTION_QUANTITY", "RESULT", "GENERATION_TIME", "GENERATION_ID"
};
}
@ -42,11 +42,14 @@ public class SDf12MapStore extends TemplateMapStore<SDf12> {
SDf12 object = new SDf12();
object.setId(resultSet.getObject("ID", Long.class));
object.setOutDocument(resultSet.getObject("OUT_DOCUMENT", String.class));
object.setDirection(resultSet.getObject("DIRECTION", String.class));
object.setQuantity(resultSet.getObject("QUANTITY", String.class));
object.setSecurityCode(resultSet.getObject("SECURITY_CODE", String.class));
object.setDepoCodeSender(resultSet.getObject("DEPO_CODE_SENDER", String.class));
object.setDepoCodeAdressee(resultSet.getObject("DEPO_CODE_ADRESSEE", String.class));
object.setResult(resultSet.getObject("RESULT", BigDecimal.class));
object.setTransactionNumber(resultSet.getObject("TRANSACTION_NUMBER", String.class));
object.setTransactionQuantity(resultSet.getObject("TRANSACTION_QUANTITY", String.class));
object.setResult(resultSet.getObject("RESULT", String.class));
object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME"));
object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class));
return object;
@ -57,10 +60,13 @@ public class SDf12MapStore extends TemplateMapStore<SDf12> {
Object[] args = new Object[]{
object.getId(),
object.getOutDocument(),
object.getDirection(),
object.getQuantity(),
object.getSecurityCode(),
object.getDepoCodeSender(),
object.getDepoCodeAdressee(),
object.getTransactionNumber(),
object.getTransactionQuantity(),
object.getResult(),
TimeUtil.toDateFromInstant(object.getGenerationTime()),
object.getGenerationId()

2
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf13MapStore.java
View file

@ -41,7 +41,7 @@ public class SDf13MapStore extends TemplateMapStore<SDf13> {
object.setId(resultSet.getObject("ID", Long.class));
object.setOutDocument(resultSet.getObject("OUT_DOCUMENT", String.class));
object.setInDocument(resultSet.getObject("IN_DOCUMENT", String.class));
object.setResult(resultSet.getObject("RESULT", BigDecimal.class));
object.setResult(resultSet.getObject("RESULT", String.class));
object.setTextError(resultSet.getObject("TEXT_ERROR", String.class));
object.setFileName(resultSet.getObject("FILE_NAME", String.class));
object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME"));

2
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf14MapStore.java
View file

@ -40,7 +40,7 @@ public class SDf14MapStore extends TemplateMapStore<SDf14> {
SDf14 object = new SDf14();
object.setId(resultSet.getObject("ID", Long.class));
object.setOutDocument(resultSet.getObject("OUT_DOCUMENT", String.class));
object.setResult(resultSet.getObject("RESULT", BigDecimal.class));
object.setResult(resultSet.getObject("RESULT", String.class));
object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME"));
object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class));
return object;

2
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf53MapStore.java
View file

@ -43,7 +43,7 @@ public class SDf53MapStore extends TemplateMapStore<SDf53> {
object.setAccount(resultSet.getObject("ACCOUNT", String.class));
object.setDeal(resultSet.getObject("DEAL", String.class));
object.setStatus(resultSet.getObject("STATUS", Long.class));
object.setResult(resultSet.getObject("RESULT", BigDecimal.class));
object.setResult(resultSet.getObject("RESULT", String.class));
object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME"));
object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class));
object.setInSDfId(resultSet.getObject("IN_S_DF_ID", Long.class));