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 771ccbc72..1f3d50910 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 @@ -226,7 +226,7 @@ public class Sdf06Executor { for (SingleAssetResponse gatewayMsg : req.getRequestPayload().getApprovals()) { //получаем запрос для текущей группы sdf06 //находим группу - Long statementId = gatewayMsg.getStatementId(); + Long statementId = gatewayMsg.getEntityId(); ImdgPredicateBuilder pb = statementImdg.predicateBuilder(); Statement stmt = statementImdg.getFirstObjectByPredicate( pb.and( 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 3b4009950..a51324528 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 @@ -245,7 +245,7 @@ public class Sdf10Executor { for (SingleAssetResponse gatewayMsg : req.getRequestPayload().getApprovals()) { //получаем запрос для текущей группы sdf10 //находим группу - Long statementId = gatewayMsg.getStatementId(); + Long statementId = gatewayMsg.getEntityId(); ImdgPredicateBuilder pb = statementImdg.predicateBuilder(); Statement stmt = statementImdg.getFirstObjectByPredicate( pb.and( diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/operations/SentAsset.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/operations/SentAsset.java index 43750f486..0026845fb 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/operations/SentAsset.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/controller/inbound/request/operations/SentAsset.java @@ -5,7 +5,7 @@ import java.util.UUID; public class SentAsset { private boolean isReceivedResponse = false; private UUID id; - private Long statementId; + private Long entityId; private OperationsRequest operationsRequest; public boolean isReceivedResponse() { @@ -32,11 +32,11 @@ public class SentAsset { this.operationsRequest = operationsRequest; } - 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; } } 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 a07502e6e..41436e4e5 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.getEntityId()); + sentAsset.setEntityId(assetOperation.getEntityId()); assets.add(sentAsset); } } diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/OperationService.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/OperationService.java index ac9af505d..731974af5 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/OperationService.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/OperationService.java @@ -48,7 +48,7 @@ public class OperationService { for (SentAsset sentAsset : assets) { SingleAssetResponse singleAssetResponse = new SingleAssetResponse(); singleAssetResponse.setApproved(sentAsset.getOperationsRequest().getResult()); - singleAssetResponse.setStatementId(sentAsset.getStatementId()); + singleAssetResponse.setEntityId(sentAsset.getEntityId()); responsesToClearing.add(singleAssetResponse); } AssetOperationApprovalRequest assetOperationApprovalRequest = new AssetOperationApprovalRequest(); diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/gateway/SingleAssetResponse.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/gateway/SingleAssetResponse.java index 06fe0a7fe..36db05773 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/gateway/SingleAssetResponse.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/gateway/SingleAssetResponse.java @@ -4,16 +4,16 @@ import com.fasterxml.jackson.annotation.JsonProperty; public class SingleAssetResponse { @JsonProperty - private Long statementId; + private Long entityId; @JsonProperty private boolean approved; - public Long getStatementId() { - return statementId; + public Long getEntityId() { + return entityId; } - public void setStatementId(Long statementId) { - this.statementId = statementId; + public void setEntityId(Long statementId) { + this.entityId = statementId; } public boolean isApproved() {