diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/account/AccountBackendGetAll.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/account/AccountBackendGetAll.java index f05c0ccfd..09214826e 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/account/AccountBackendGetAll.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/account/AccountBackendGetAll.java @@ -45,7 +45,7 @@ public class AccountBackendGetAll extends BasicSpcexResponse { singleItem.setAccount(account.getAccount()); singleItem.setAccountType(account.getAccountType()); singleItem.setRelationId(account.getRelationId()); - singleItem.setStatus(account.getStatus()); + singleItem.setStatus(account.getAccountStatus()); singleItem.setProcessingSign(account.getProcessingSign()); singleItem.setCreated(account.getCreated()); singleItem.setUpdated(account.getUpdated()); diff --git a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/AccountBalanceValidationRule.java b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/AccountBalanceValidationRule.java index 5861ebd63..7ac689a73 100644 --- a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/AccountBalanceValidationRule.java +++ b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/AccountBalanceValidationRule.java @@ -39,7 +39,7 @@ public enum AccountBalanceValidationRule implements IValidationRule { object.setAccount(resultSet.getObject("ACCOUNT", String.class)); object.setAccountType(resultSet.getObject("ACCOUNT_TYPE", String.class)); object.setRelationId(resultSet.getObject("RELATION_ID", Long.class)); - object.setStatus(resultSet.getObject("STATUS", String.class)); + object.setAccountStatus(resultSet.getObject("STATUS", String.class)); object.setProcessingSign(resultSet.getObject("PROCESSING_SIGN", String.class)); return object; } @@ -57,7 +57,7 @@ public class AccountMapStore extends TemplateMapStore { object.getAccount(), object.getAccountType(), object.getRelationId(), - object.getStatus(), + object.getAccountStatus(), object.getProcessingSign() }; return args; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/StatementMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/StatementMapStore.java index 3cc48d44b..7d75fc48f 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/StatementMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/StatementMapStore.java @@ -52,7 +52,7 @@ public class StatementMapStore extends TemplateMapStore { object.setSettlementDate(getInstantFromTimestamp(resultSet, "SETTLEMENT_DATE")); object.setAmount(resultSet.getObject("AMOUNT", BigDecimal.class)); object.setCashMovementCurrencyCode(resultSet.getObject("CASH_MOVEMENT_CURRENCY_CODE", String.class)); - object.setStatus(resultSet.getObject("STATUS", String.class)); + object.setOperationStatus(resultSet.getObject("STATUS", String.class)); object.setErrorCode(resultSet.getObject("ERROR_CODE", String.class)); object.setErrorText(resultSet.getObject("ERROR_TEXT", String.class)); object.setInSDfId(resultSet.getObject("IN_S_DF_ID", Long.class)); @@ -78,7 +78,7 @@ public class StatementMapStore extends TemplateMapStore { TimeUtil.toDateFromInstant(object.getSettlementDate()), object.getAmount(), object.getCashMovementCurrencyCode(), - object.getStatus(), + object.getOperationStatus(), object.getErrorCode(), object.getErrorText(), object.getInSDfId(), diff --git a/clearing-parent/securities-service/src/main/resources/application.properties b/clearing-parent/securities-service/src/main/resources/application.properties index 80153f863..758c724a4 100644 --- a/clearing-parent/securities-service/src/main/resources/application.properties +++ b/clearing-parent/securities-service/src/main/resources/application.properties @@ -5,9 +5,9 @@ securities-service.hazelcast.login=dev securities-service.hazelcast.password=dev-pass securities-service.kafka.bootstrap-servers=localhost:9092 -securities-service.kafka.group-id=dev-group +securities-service.kafka.group-id=dev-group-moneyMarketSecurity securities-service.kafka.enable-auto-commit=false -securities-service.kafka.session-timeout-ms=30000 +securities-service.kafka.session-timeout-ms=300000 securities-service.kafka.auto-offset-reset=latest securities-service.kafka.linger-ms=1 securities-service.kafka.buffer-memory=33554432