diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/security/RiskParameter.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/security/RiskParameter.java index 7eb083de2..cbafa813f 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/security/RiskParameter.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/security/RiskParameter.java @@ -10,6 +10,7 @@ public class RiskParameter extends BusinessObject { private Long currencyPairId; private String workflowStatus; private BigDecimal quoteValue; + private BigDecimal penaltyValue; public BigDecimal getValue() { return value; @@ -58,4 +59,12 @@ public class RiskParameter extends BusinessObject { public void setQuoteValue(BigDecimal quoteValue) { this.quoteValue = quoteValue; } + + public BigDecimal getPenaltyValue() { + return penaltyValue; + } + + public void setPenaltyValue(BigDecimal penaltyValue) { + this.penaltyValue = penaltyValue; + } } diff --git a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql index 1f8a0abba..09ea748a4 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql @@ -5343,7 +5343,9 @@ CREATE TABLE RISK_PARAMETER CURRENCY_PAIR_ID BIGINT, CREATED_AT timestamp, UPDATED_AT timestamp, - WORKFLOW_STATUS VARCHAR(4) + WORKFLOW_STATUS VARCHAR(4), + PENALTY_VALUE numeric(72,18), + QUOTE_VALUE numeric(72,18) ); COMMENT ON TABLE RISK_PARAMETER IS 'Риск-параметры'; COMMENT ON COLUMN RISK_PARAMETER.ID IS 'Идентификатор записи'; @@ -5354,6 +5356,8 @@ COMMENT ON COLUMN RISK_PARAMETER.CURRENCY_PAIR_ID IS 'Идентификатор COMMENT ON COLUMN RISK_PARAMETER.CREATED_AT IS 'Время создания записи'; COMMENT ON COLUMN RISK_PARAMETER.UPDATED_AT IS 'Время изменения записи'; COMMENT ON COLUMN RISK_PARAMETER.WORKFLOW_STATUS IS 'Статус'; +COMMENT ON COLUMN RISK_PARAMETER.QUOTE_VALUE IS 'Ставка переноса сопряженной валюты'; +COMMENT ON COLUMN RISK_PARAMETER.PENALTY_VALUE IS 'Ставка переноса при нехватке базовой валюты'; GRANT ALL PRIVILEGES ON TABLE RISK_PARAMETER TO clearing; -- rates - Расчетные курсы @@ -5579,7 +5583,8 @@ CREATE TABLE ORDER_CURRENCY COMMENT VARCHAR(255), INITIAL_ORDER_ID BIGINT, CREATED_AT TIMESTAMP, - UPDATED_AT TIMESTAMP + UPDATED_AT TIMESTAMP, + REGISTRY_ID BIGINT ); COMMENT ON TABLE ORDER_CURRENCY IS 'Заявки для заключения сделок переноса на валютном рынке'; diff --git a/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.23.sql b/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.23.sql index 421745ac9..0ec389bcb 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.23.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.23.sql @@ -3,6 +3,8 @@ ALTER TABLE RISK_PARAMETER ADD COLUMN IF NOT EXISTS QUOTE_VALUE NUMERIC(72, 18); COMMENT ON COLUMN RISK_PARAMETER.QUOTE_VALUE IS 'Ставка переноса сопряженной валюты'; +ALTER TABLE RISK_PARAMETER ADD COLUMN IF NOT EXISTS PENALTY_VALUE NUMERIC(72, 18); +COMMENT ON COLUMN RISK_PARAMETER.PENALTY_VALUE IS 'Ставка переноса при нехватке базовой валюты'; ALTER TABLE ORDER_CURRENCY ADD COLUMN IF NOT EXISTS REGISTRY_ID BIGINT; COMMENT ON COLUMN ORDER_CURRENCY.REGISTRY_ID IS 'Идентификатор регистра'; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/RiskParameterMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/RiskParameterMapStore.java index 3f0ed06b1..3e453fc06 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/RiskParameterMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/RiskParameterMapStore.java @@ -31,7 +31,7 @@ public class RiskParameterMapStore extends TemplateMapStore { public String[] getFields() { return new String[]{ "ID", "VALUE", "SETTLEMENT_TYPE", "CURRENCY_PAIR", "CURRENCY_PAIR_ID", "CREATED_AT", "UPDATED_AT", "WORKFLOW_STATUS", - "QUOTE_VALUE" + "QUOTE_VALUE", "PENALTY_VALUE" }; } @@ -47,6 +47,7 @@ public class RiskParameterMapStore extends TemplateMapStore { object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT")); object.setWorkflowStatus(resultSet.getObject("WORKFLOW_STATUS", String.class)); object.setQuoteValue(resultSet.getObject("QUOTE_VALUE", BigDecimal.class)); + object.setPenaltyValue(resultSet.getObject("PENALTY_VALUE", BigDecimal.class)); return object; } @@ -61,7 +62,8 @@ public class RiskParameterMapStore extends TemplateMapStore { TimeUtil.toDateFromInstant(object.getCreated()), TimeUtil.toDateFromInstant(object.getUpdated()), object.getWorkflowStatus(), - object.getQuoteValue() + object.getQuoteValue(), + object.getPenaltyValue() }; return args; }