From 4226df3e5c15ce8eb47e0cffe0564ef59be18d7d Mon Sep 17 00:00:00 2001 From: ialbert Date: Mon, 11 Sep 2023 16:49:40 +0300 Subject: [PATCH] asset operation fields --- .../service/executors/Sdf06Executor.java | 2 +- .../service/executors/Sdf10Executor.java | 2 +- .../service/executors/Sdf20Executor.java | 2 +- .../integration/GatewayRequestCreator.java | 2 +- .../gatewayapi/service/GatewayService.java | 2 +- .../cud/clearing/AssetOperationRequest.java | 20 ++++++++++++++----- 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf06Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf06Executor.java index e7c2410b0..771ccbc72 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf06Executor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf06Executor.java @@ -352,7 +352,7 @@ public class Sdf06Executor { private AssetOperationRequest requestFromStatement(Statement stmt, String tradingCode, String tcrCode) { AssetOperationRequest req = new AssetOperationRequest(); - req.setStatementId(stmt.getId()); + req.setEntityId(stmt.getId()); req.setAmount(stmt.getAmount()); req.setSecuritySymbol(CurrencyCode.RUB.getKey()); //fixme retrieve security symbol from validator req.setTradingCode(tradingCode); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf10Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf10Executor.java index 1d88d5350..3b4009950 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf10Executor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf10Executor.java @@ -361,7 +361,7 @@ public class Sdf10Executor { private AssetOperationRequest requestFromStatement(Statement stmt, String tradingCode, String tcrCode, String securityCode) { AssetOperationRequest req = new AssetOperationRequest(); - req.setStatementId(stmt.getId()); + req.setEntityId(stmt.getId()); // req.setAmount(stmt.getAmount()); req.setQuantity(stmt.getAmount()); req.setSecuritySymbol(securityCode); //fixme retrieve security symbol from validator diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf20Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf20Executor.java index 8000d7a6f..3ff8ad990 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf20Executor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf20Executor.java @@ -178,7 +178,7 @@ public class Sdf20Executor { String tcrCode//из TCR ) { AssetOperationRequest req = new AssetOperationRequest(); - req.setStatementId(null); + req.setEntityId(null); req.setQuantity(quantity); //+ req.setSecuritySymbol(securitySymbol); //+ req.setTradingCode(tradingCode); //??? diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/integration/GatewayRequestCreator.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/integration/GatewayRequestCreator.java index 55a10754b..0cf52d5c4 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/integration/GatewayRequestCreator.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/integration/GatewayRequestCreator.java @@ -7,7 +7,7 @@ import ru.spcex.platform.enumeration.CurrencyCode; public class GatewayRequestCreator { public static AssetOperationRequest gatewayRequestPart(Statement stmt, String tradingCode, String tcrCode) { AssetOperationRequest req = new AssetOperationRequest(); - req.setStatementId(stmt.getId()); + req.setEntityId(stmt.getId()); req.setAmount(stmt.getAmount()); req.setSecuritySymbol(CurrencyCode.RUB.getKey()); //fixme retrieve security symbol from validator req.setTradingCode(tradingCode); diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java index 04ae7f8c3..a07502e6e 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java @@ -201,7 +201,7 @@ public class GatewayService extends QueueConsumer implements InitializingBean { } finally { SentAsset sentAsset = new SentAsset(); sentAsset.setId(outboundRequest.getId()); - sentAsset.setStatementId(assetOperation.getStatementId()); + sentAsset.setStatementId(assetOperation.getEntityId()); assets.add(sentAsset); } } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/clearing/AssetOperationRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/clearing/AssetOperationRequest.java index 51c64addf..69d7daf5e 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/clearing/AssetOperationRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/clearing/AssetOperationRequest.java @@ -6,7 +6,9 @@ import java.math.BigDecimal; public class AssetOperationRequest { @JsonProperty - private Long statementId; + private Long sessionId; + @JsonProperty + private Long entityId; @JsonProperty private BigDecimal amount; @JsonProperty @@ -20,12 +22,20 @@ public class AssetOperationRequest { @JsonProperty private String direction; - public Long getStatementId() { - return statementId; + public Long getEntityId() { + return entityId; } - public void setStatementId(Long statementId) { - this.statementId = statementId; + public void setEntityId(Long entityId) { + this.entityId = entityId; + } + + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; } public BigDecimal getAmount() {