diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/security/CurrencyPairSecurity.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/security/CurrencyPairSecurity.java index 27c80f440..74cd59f45 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/security/CurrencyPairSecurity.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/security/CurrencyPairSecurity.java @@ -13,7 +13,7 @@ public class CurrencyPairSecurity extends Security { private static final long serialVersionUID = ConstSerializable.serialVersionUID; private BigDecimal baseUnitSize; -// private Long currencyPairId; + private Long currencyPairId; private String code; private String settlementType; private String clearingOrganization; @@ -34,6 +34,14 @@ public class CurrencyPairSecurity extends Security { this.baseUnitSize = value; } + public Long getCurrencyPairId() { + return currencyPairId; + } + + public void setCurrencyPairId(Long currencyPairId) { + this.currencyPairId = currencyPairId; + } + public String getCode() { return code; } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CurrencyPairSecurityHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CurrencyPairSecurityHistoryMapStore.java index d869ddbc7..0b880b0a0 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CurrencyPairSecurityHistoryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CurrencyPairSecurityHistoryMapStore.java @@ -28,7 +28,7 @@ public class CurrencyPairSecurityHistoryMapStore extends ASecurityHistoryMapStor @Override public String[] getFields() { return new String[]{"ID", "EVENT_TIME", "EVENT_USER_ID", "EVENT_TYPE", - "CURRENCY_PAIR_SECURITY_ID", "BASE_UNIT_SIZE", "CODE", "SETTLEMENT_TYPE", "CLEARING_ORGANIZATION", "SECURITY_ID", "CREATED_AT", "UPDATED_AT" + "CURRENCY_PAIR_SECURITY_ID", "BASE_UNIT_SIZE", "CURRENCY_PAIR_ID", "CODE", "SETTLEMENT_TYPE", "CLEARING_ORGANIZATION", "SECURITY_ID", "CREATED_AT", "UPDATED_AT" }; } @@ -43,6 +43,7 @@ public class CurrencyPairSecurityHistoryMapStore extends ASecurityHistoryMapStor object.getId(), object.getBaseUnitSize(), + object.getCurrencyPairId(), object.getCode(), object.getSettlementType(), object.getClearingOrganization(), diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CurrencyPairSecurityMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CurrencyPairSecurityMapStore.java index 6ccd64137..11b1bd375 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CurrencyPairSecurityMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CurrencyPairSecurityMapStore.java @@ -32,7 +32,7 @@ public class CurrencyPairSecurityMapStore extends ASecurityMapStore