http://jira.mfd.msk:8088/browse/CLS-293 meta 4: и тут обновили мету 4 немного. Теперь уж точно доделал.

This commit is contained in:
AKurakin 2023-05-11 17:06:30 +03:00
parent f2756ac0e5
commit d6e31a84e5
17 changed files with 2953 additions and 2836 deletions

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -10,6 +10,7 @@ public class Market extends BusinessObject {
private String code;
private String settlementCurrency;
private String section;
private String marketType;
public String getDescription() {
return description;
@ -58,4 +59,12 @@ public class Market extends BusinessObject {
public void setSection(String section) {
this.section = section;
}
public String getMarketType() {
return marketType;
}
public void setMarketType(String marketType) {
this.marketType = marketType;
}
}

View file

@ -1,6 +1,7 @@
package ru.clearing.classes.statics.data.misc;
import ru.clearing.classes.ConstSerializable;
import ru.clearing.classes.objects.BusinessObject;
import ru.spcex.platform.classes.base.SpcexObjectBase;
import java.math.BigDecimal;
@ -12,7 +13,7 @@ import java.time.LocalDate;
* <p>
* DB table: S_TRADE
**/
public class STrades extends SpcexObjectBase {
public class STrades extends BusinessObject {
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private Long tradeNum;

View file

@ -1,6 +1,7 @@
package ru.clearing.classes.statics.data.registry;
import ru.clearing.classes.ConstSerializable;
import ru.clearing.classes.objects.BusinessObject;
import ru.spcex.platform.classes.base.SpcexObjectBase;
import java.math.BigDecimal;
@ -12,7 +13,7 @@ import java.time.LocalDate;
* <p>
* DB table: REGISTRY
**/
public class Registry extends SpcexObjectBase {
public class Registry extends BusinessObject {
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private Long companyId;
@ -32,6 +33,7 @@ public class Registry extends SpcexObjectBase {
private String tradingClearingRegistry;
private String registryStatus;
private Long securityId;
private String securitySymbol;
private BigDecimal balance;
private BigDecimal openBalance;
private BigDecimal closeBalance;
@ -56,370 +58,358 @@ public class Registry extends SpcexObjectBase {
private Long parentId;
private Long groupId;
private Long sessionId;
private String sessionType;
private Long paymentId;
private Long refundPaymentId;
// (in parent) private Long id;
private Instant createdAt;
private Instant updatedAt;
public Long getCompanyId() {
return companyId;
}
public void setCompanyId(Long value) {
this.companyId = value;
public void setCompanyId(Long companyId) {
this.companyId = companyId;
}
public String getTradingCode() {
return tradingCode;
}
public void setTradingCode(String value) {
this.tradingCode = value;
public void setTradingCode(String tradingCode) {
this.tradingCode = tradingCode;
}
public String getClearingCode() {
return clearingCode;
}
public void setClearingCode(String value) {
this.clearingCode = value;
public void setClearingCode(String clearingCode) {
this.clearingCode = clearingCode;
}
public String getShortName() {
return shortName;
}
public void setShortName(String value) {
this.shortName = value;
public void setShortName(String shortName) {
this.shortName = shortName;
}
public String getFullName() {
return fullName;
}
public void setFullName(String value) {
this.fullName = value;
public void setFullName(String fullName) {
this.fullName = fullName;
}
public Long getAccountId() {
return accountId;
}
public void setAccountId(Long value) {
this.accountId = value;
public void setAccountId(Long accountId) {
this.accountId = accountId;
}
public String getAccountType() {
return accountType;
}
public void setAccountType(String value) {
this.accountType = value;
public void setAccountType(String accountType) {
this.accountType = accountType;
}
public String getAccount() {
return account;
}
public void setAccount(String value) {
this.account = value;
public void setAccount(String account) {
this.account = account;
}
public String getRegistryDesignation() {
return registryDesignation;
}
public void setRegistryDesignation(String value) {
this.registryDesignation = value;
public void setRegistryDesignation(String registryDesignation) {
this.registryDesignation = registryDesignation;
}
public String getRegistryInstrumentType() {
return registryInstrumentType;
}
public void setRegistryInstrumentType(String value) {
this.registryInstrumentType = value;
public void setRegistryInstrumentType(String registryInstrumentType) {
this.registryInstrumentType = registryInstrumentType;
}
public String getRegistryCapacity() {
return registryCapacity;
}
public void setRegistryCapacity(String value) {
this.registryCapacity = value;
public void setRegistryCapacity(String registryCapacity) {
this.registryCapacity = registryCapacity;
}
public String getRegistryUnit() {
return registryUnit;
}
public void setRegistryUnit(String value) {
this.registryUnit = value;
public void setRegistryUnit(String registryUnit) {
this.registryUnit = registryUnit;
}
public String getRegistryCode() {
return registryCode;
}
public void setRegistryCode(String value) {
this.registryCode = value;
public void setRegistryCode(String registryCode) {
this.registryCode = registryCode;
}
public Long getTradingClearingRegistryId() {
return tradingClearingRegistryId;
}
public void setTradingClearingRegistryId(Long value) {
this.tradingClearingRegistryId = value;
public void setTradingClearingRegistryId(Long tradingClearingRegistryId) {
this.tradingClearingRegistryId = tradingClearingRegistryId;
}
public String getTradingClearingRegistry() {
return tradingClearingRegistry;
}
public void setTradingClearingRegistry(String value) {
this.tradingClearingRegistry = value;
public void setTradingClearingRegistry(String tradingClearingRegistry) {
this.tradingClearingRegistry = tradingClearingRegistry;
}
public String getRegistryStatus() {
return registryStatus;
}
public void setRegistryStatus(String value) {
this.registryStatus = value;
public void setRegistryStatus(String registryStatus) {
this.registryStatus = registryStatus;
}
public Long getSecurityId() {
return securityId;
}
public void setSecurityId(Long value) {
this.securityId = value;
public void setSecurityId(Long securityId) {
this.securityId = securityId;
}
public String getSecuritySymbol() {
return securitySymbol;
}
public void setSecuritySymbol(String securitySymbol) {
this.securitySymbol = securitySymbol;
}
public BigDecimal getBalance() {
return balance;
}
public void setBalance(BigDecimal value) {
this.balance = value;
public void setBalance(BigDecimal balance) {
this.balance = balance;
}
public BigDecimal getOpenBalance() {
return openBalance;
}
public void setOpenBalance(BigDecimal value) {
this.openBalance = value;
public void setOpenBalance(BigDecimal openBalance) {
this.openBalance = openBalance;
}
public BigDecimal getCloseBalance() {
return closeBalance;
}
public void setCloseBalance(BigDecimal value) {
this.closeBalance = value;
public void setCloseBalance(BigDecimal closeBalance) {
this.closeBalance = closeBalance;
}
public BigDecimal getCredit() {
return credit;
}
public void setCredit(BigDecimal value) {
this.credit = value;
public void setCredit(BigDecimal credit) {
this.credit = credit;
}
public BigDecimal getDebit() {
return debit;
}
public void setDebit(BigDecimal value) {
this.debit = value;
public void setDebit(BigDecimal debit) {
this.debit = debit;
}
public BigDecimal getSettledCredit() {
return settledCredit;
}
public void setSettledCredit(BigDecimal value) {
this.settledCredit = value;
public void setSettledCredit(BigDecimal settledCredit) {
this.settledCredit = settledCredit;
}
public BigDecimal getSettledDebit() {
return settledDebit;
}
public void setSettledDebit(BigDecimal value) {
this.settledDebit = value;
public void setSettledDebit(BigDecimal settledDebit) {
this.settledDebit = settledDebit;
}
public BigDecimal getCheckBalance() {
return checkBalance;
}
public void setCheckBalance(BigDecimal value) {
this.checkBalance = value;
public void setCheckBalance(BigDecimal checkBalance) {
this.checkBalance = checkBalance;
}
public BigDecimal getDiffBalance() {
return diffBalance;
}
public void setDiffBalance(BigDecimal value) {
this.diffBalance = value;
public void setDiffBalance(BigDecimal diffBalance) {
this.diffBalance = diffBalance;
}
public BigDecimal getPlanBalance() {
return planBalance;
}
public void setPlanBalance(BigDecimal value) {
this.planBalance = value;
public void setPlanBalance(BigDecimal planBalance) {
this.planBalance = planBalance;
}
public String getBalanceDimension() {
return balanceDimension;
}
public void setBalanceDimension(String value) {
this.balanceDimension = value;
public void setBalanceDimension(String balanceDimension) {
this.balanceDimension = balanceDimension;
}
public LocalDate getSettlementDate() {
return settlementDate;
}
public void setSettlementDate(LocalDate value) {
this.settlementDate = value;
public void setSettlementDate(LocalDate settlementDate) {
this.settlementDate = settlementDate;
}
public String getSettlementCode() {
return settlementCode;
}
public void setSettlementCode(String value) {
this.settlementCode = value;
public void setSettlementCode(String settlementCode) {
this.settlementCode = settlementCode;
}
public LocalDate getTradingDate() {
return tradingDate;
}
public void setTradingDate(LocalDate value) {
this.tradingDate = value;
public void setTradingDate(LocalDate tradingDate) {
this.tradingDate = tradingDate;
}
public LocalDate getClearingDate() {
return clearingDate;
}
public void setClearingDate(LocalDate value) {
this.clearingDate = value;
public void setClearingDate(LocalDate clearingDate) {
this.clearingDate = clearingDate;
}
public LocalDate getRefundDate() {
return refundDate;
}
public void setRefundDate(LocalDate value) {
this.refundDate = value;
public void setRefundDate(LocalDate refundDate) {
this.refundDate = refundDate;
}
public LocalDate getValueDate() {
return valueDate;
}
public void setValueDate(LocalDate value) {
this.valueDate = value;
public void setValueDate(LocalDate valueDate) {
this.valueDate = valueDate;
}
public BigDecimal getPrice() {
return price;
}
public void setPrice(BigDecimal value) {
this.price = value;
public void setPrice(BigDecimal price) {
this.price = price;
}
public String getContract() {
return contract;
}
public void setContract(String value) {
this.contract = value;
public void setContract(String contract) {
this.contract = contract;
}
public Long getCounterPartyId() {
return counterPartyId;
}
public void setCounterPartyId(Long value) {
this.counterPartyId = value;
public void setCounterPartyId(Long counterPartyId) {
this.counterPartyId = counterPartyId;
}
public String getComment() {
return comment;
}
public void setComment(String value) {
this.comment = value;
public void setComment(String comment) {
this.comment = comment;
}
public Long getParentId() {
return parentId;
}
public void setParentId(Long value) {
this.parentId = value;
public void setParentId(Long parentId) {
this.parentId = parentId;
}
public Long getGroupId() {
return groupId;
}
public void setGroupId(Long value) {
this.groupId = value;
public void setGroupId(Long groupId) {
this.groupId = groupId;
}
public Long getSessionId() {
return sessionId;
}
public void setSessionId(Long value) {
this.sessionId = value;
public void setSessionId(Long sessionId) {
this.sessionId = sessionId;
}
public String getSessionType() {
return sessionType;
}
public void setSessionType(String sessionType) {
this.sessionType = sessionType;
}
public Long getPaymentId() {
return paymentId;
}
public void setPaymentId(Long value) {
this.paymentId = value;
public void setPaymentId(Long paymentId) {
this.paymentId = paymentId;
}
public Long getRefundPaymentId() {
return refundPaymentId;
}
public void setRefundPaymentId(Long value) {
this.refundPaymentId = value;
}
public Instant getCreatedAt() {
return createdAt;
}
public void setCreatedAt(Instant value) {
this.createdAt = value;
}
public Instant getUpdatedAt() {
return updatedAt;
}
public void setUpdatedAt(Instant value) {
this.updatedAt = value;
}
}

View file

@ -18,6 +18,8 @@ public class Planner extends BusinessObject {
private LocalTime taskTime;
private LocalDate clearingDate;
private String market;
private String section;
private String sessionType;
private String taskStatus;
private Long companyId;
private Long securityId;
@ -27,48 +29,56 @@ public class Planner extends BusinessObject {
return task;
}
public void setTask(String value) {
this.task = value;
public void setTask(String task) {
this.task = task;
}
public LocalTime getTaskTime() {
return taskTime;
}
public void setTaskTime(LocalTime value) {
this.taskTime = value;
public void setTaskTime(LocalTime taskTime) {
this.taskTime = taskTime;
}
public LocalDate getClearingDate() {
return clearingDate;
}
public void setClearingDate(LocalDate value) {
this.clearingDate = value;
public void setClearingDate(LocalDate clearingDate) {
this.clearingDate = clearingDate;
}
public String getMarket() {
return market;
}
public void setMarket(String value) {
this.market = value;
public void setMarket(String market) {
this.market = market;
}
public String getSection() {
return section;
}
public void setSection(String section) {
this.section = section;
}
public String getSessionType() {
return sessionType;
}
public void setSessionType(String sessionType) {
this.sessionType = sessionType;
}
public String getTaskStatus() {
return taskStatus;
}
public void setTaskStatus(String value) {
this.taskStatus = value;
}
public Long getSecurityId() {
return securityId;
}
public void setSecurityId(Long value) {
this.securityId = value;
public void setTaskStatus(String taskStatus) {
this.taskStatus = taskStatus;
}
public Long getCompanyId() {
@ -78,4 +88,12 @@ public class Planner extends BusinessObject {
public void setCompanyId(Long companyId) {
this.companyId = companyId;
}
public Long getSecurityId() {
return securityId;
}
public void setSecurityId(Long securityId) {
this.securityId = securityId;
}
}

View file

@ -18,6 +18,8 @@ public class PlannerAllToday extends SpcexObjectBase {
private LocalTime taskTime;
private LocalDate clearingDate;
private String market;
private String section;
private String sessionType;
private String taskStatus;
private Long companyId;
private Long securityId;
@ -28,64 +30,56 @@ public class PlannerAllToday extends SpcexObjectBase {
return task;
}
public void setTask(String value) {
this.task = value;
public void setTask(String task) {
this.task = task;
}
public LocalTime getTaskTime() {
return taskTime;
}
public void setTaskTime(LocalTime value) {
this.taskTime = value;
public void setTaskTime(LocalTime taskTime) {
this.taskTime = taskTime;
}
public LocalDate getClearingDate() {
return clearingDate;
}
public void setClearingDate(LocalDate value) {
this.clearingDate = value;
public void setClearingDate(LocalDate clearingDate) {
this.clearingDate = clearingDate;
}
public String getMarket() {
return market;
}
public void setMarket(String value) {
this.market = value;
public void setMarket(String market) {
this.market = market;
}
public String getSection() {
return section;
}
public void setSection(String section) {
this.section = section;
}
public String getSessionType() {
return sessionType;
}
public void setSessionType(String sessionType) {
this.sessionType = sessionType;
}
public String getTaskStatus() {
return taskStatus;
}
public void setTaskStatus(String value) {
this.taskStatus = value;
}
public Long getSecurityId() {
return securityId;
}
public void setSecurityId(Long value) {
this.securityId = value;
}
public String getParent() {
return parent;
}
public void setParent(String value) {
this.parent = value;
}
public Long getParentId() {
return parentId;
}
public void setParentId(Long value) {
this.parentId = value;
public void setTaskStatus(String taskStatus) {
this.taskStatus = taskStatus;
}
public Long getCompanyId() {
@ -95,4 +89,28 @@ public class PlannerAllToday extends SpcexObjectBase {
public void setCompanyId(Long companyId) {
this.companyId = companyId;
}
public Long getSecurityId() {
return securityId;
}
public void setSecurityId(Long securityId) {
this.securityId = securityId;
}
public String getParent() {
return parent;
}
public void setParent(String parent) {
this.parent = parent;
}
public Long getParentId() {
return parentId;
}
public void setParentId(Long parentId) {
this.parentId = parentId;
}
}

View file

@ -15,6 +15,9 @@ public class PlannerTemplate extends BusinessObject {
private String task;
private LocalTime taskTime;
private String market;
private String section;
private String sessionType;
private String taskStatus;
private Long companyId;
private Long securityId;
@ -23,24 +26,48 @@ public class PlannerTemplate extends BusinessObject {
return task;
}
public void setTask(String value) {
this.task = value;
public void setTask(String task) {
this.task = task;
}
public LocalTime getTaskTime() {
return taskTime;
}
public void setTaskTime(LocalTime value) {
this.taskTime = value;
public void setTaskTime(LocalTime taskTime) {
this.taskTime = taskTime;
}
public String getMarket() {
return market;
}
public void setMarket(String market) {
this.market = market;
}
public String getSection() {
return section;
}
public void setSection(String section) {
this.section = section;
}
public String getSessionType() {
return sessionType;
}
public void setSessionType(String sessionType) {
this.sessionType = sessionType;
}
public String getTaskStatus() {
return taskStatus;
}
public void setTaskStatus(String value) {
this.taskStatus = value;
public void setTaskStatus(String taskStatus) {
this.taskStatus = taskStatus;
}
public Long getCompanyId() {

View file

@ -1416,10 +1416,10 @@ COMMENT ON COLUMN LISTING_HISTORY.CREATED_AT IS 'Дата-время созда
COMMENT ON COLUMN LISTING_HISTORY.UPDATED_AT IS 'Дата-время изменения записи';
-- market - Торговые секции
-- market - Рынки
DROP TABLE IF EXISTS MARKET;
CREATE TABLE MARKET(DESCRIPTION varchar(255), EXCHANGE_ID bigint, NAME varchar(255), CODE varchar(4), SETTLEMENT_CURRENCY varchar(4), SECTION varchar(4), MARKET_TYPE varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
COMMENT ON TABLE MARKET IS 'Торговые секции';
COMMENT ON TABLE MARKET IS 'Рынки';
COMMENT ON COLUMN MARKET.DESCRIPTION IS 'Описание';
@ -1442,7 +1442,7 @@ COMMENT ON COLUMN MARKET.CREATED_AT IS 'Дата-время создания з
COMMENT ON COLUMN MARKET.UPDATED_AT IS 'Дата-время изменения записи';
-- History log of market - Торговые секции
-- History log of market - Рынки
DROP TABLE IF EXISTS MARKET_HISTORY;
CREATE TABLE MARKET_HISTORY(MARKET_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), DESCRIPTION varchar(255), EXCHANGE_ID bigint, NAME varchar(255), CODE varchar(4), SETTLEMENT_CURRENCY varchar(4), SECTION varchar(4), MARKET_TYPE varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
COMMENT ON TABLE MARKET_HISTORY IS 'История изменений таблицы market';
@ -1602,7 +1602,7 @@ COMMENT ON COLUMN TRADING_CLEARING_REGISTRY_HISTORY.UPDATED_AT IS 'Дата-вр
-- registry - Регистр активов, обязательств и требований УК
DROP TABLE IF EXISTS REGISTRY;
CREATE TABLE REGISTRY(COMPANY_ID bigint, TRADING_CODE varchar(255), CLEARING_CODE varchar(255), SHORT_NAME varchar(255), FULL_NAME varchar(255), ACCOUNT_ID bigint, ACCOUNT_TYPE varchar(4), ACCOUNT varchar(50), REGISTRY_DESIGNATION varchar(4), REGISTRY_INSTRUMENT_TYPE varchar(4), REGISTRY_CAPACITY varchar(4), REGISTRY_UNIT varchar(4), REGISTRY_CODE varchar(4), TRADING_CLEARING_REGISTRY_ID bigint, TRADING_CLEARING_REGISTRY varchar(50), REGISTRY_STATUS varchar(4), SECURITY_ID bigint, BALANCE numeric(72,18), OPEN_BALANCE numeric(72,18), CLOSE_BALANCE numeric(72,18), CREDIT numeric(72,18), DEBIT numeric(72,18), SETTLED_CREDIT numeric(72,18), SETTLED_DEBIT numeric(72,18), CHECK_BALANCE numeric(72,18), DIFF_BALANCE numeric(72,18), PLAN_BALANCE numeric(72,18), BALANCE_DIMENSION varchar(4), SETTLEMENT_DATE date, SETTLEMENT_CODE varchar(12), TRADING_DATE date, CLEARING_DATE date, REFUND_DATE date, VALUE_DATE date, PRICE numeric(72,18), CONTRACT varchar(255), COUNTER_PARTY_ID bigint, COMMENT varchar(255), PARENT_ID bigint, GROUP_ID bigint, SESSION_ID bigint, SESSION_TYPE varchar(4), PAYMENT_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
CREATE TABLE REGISTRY(COMPANY_ID bigint, TRADING_CODE varchar(255), CLEARING_CODE varchar(255), SHORT_NAME varchar(255), FULL_NAME varchar(255), ACCOUNT_ID bigint, ACCOUNT_TYPE varchar(4), ACCOUNT varchar(50), REGISTRY_DESIGNATION varchar(4), REGISTRY_INSTRUMENT_TYPE varchar(4), REGISTRY_CAPACITY varchar(4), REGISTRY_UNIT varchar(4), REGISTRY_CODE varchar(4), TRADING_CLEARING_REGISTRY_ID bigint, TRADING_CLEARING_REGISTRY varchar(50), REGISTRY_STATUS varchar(4), SECURITY_ID bigint, SECURITY_SYMBOL varchar(255), BALANCE numeric(72,18), OPEN_BALANCE numeric(72,18), CLOSE_BALANCE numeric(72,18), CREDIT numeric(72,18), DEBIT numeric(72,18), SETTLED_CREDIT numeric(72,18), SETTLED_DEBIT numeric(72,18), CHECK_BALANCE numeric(72,18), DIFF_BALANCE numeric(72,18), PLAN_BALANCE numeric(72,18), BALANCE_DIMENSION varchar(4), SETTLEMENT_DATE date, SETTLEMENT_CODE varchar(12), TRADING_DATE date, CLEARING_DATE date, REFUND_DATE date, VALUE_DATE date, PRICE numeric(72,18), CONTRACT varchar(255), COUNTER_PARTY_ID bigint, COMMENT varchar(255), PARENT_ID bigint, GROUP_ID bigint, SESSION_ID bigint, SESSION_TYPE varchar(4), PAYMENT_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
COMMENT ON TABLE REGISTRY IS 'Регистр активов, обязательств и требований УК';
COMMENT ON COLUMN REGISTRY.COMPANY_ID IS 'Идентификатор участника (linked to company)';
@ -1639,6 +1639,8 @@ COMMENT ON COLUMN REGISTRY.REGISTRY_STATUS IS 'Код статуса (linked to
COMMENT ON COLUMN REGISTRY.SECURITY_ID IS 'Идентификатор инструмента (linked to security)';
COMMENT ON COLUMN REGISTRY.SECURITY_SYMBOL IS 'Код инструмента';
COMMENT ON COLUMN REGISTRY.BALANCE IS 'Текущий баланс';
COMMENT ON COLUMN REGISTRY.OPEN_BALANCE IS 'Начальная сумма после расчетной организации';
@ -1700,7 +1702,7 @@ COMMENT ON COLUMN REGISTRY.UPDATED_AT IS 'Дата и время изменен
-- History log of registry - Регистр активов, обязательств и требований УК
DROP TABLE IF EXISTS REGISTRY_HISTORY;
CREATE TABLE REGISTRY_HISTORY(REGISTRY_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), COMPANY_ID bigint, TRADING_CODE varchar(255), CLEARING_CODE varchar(255), SHORT_NAME varchar(255), FULL_NAME varchar(255), ACCOUNT_ID bigint, ACCOUNT_TYPE varchar(4), ACCOUNT varchar(50), REGISTRY_DESIGNATION varchar(4), REGISTRY_INSTRUMENT_TYPE varchar(4), REGISTRY_CAPACITY varchar(4), REGISTRY_UNIT varchar(4), REGISTRY_CODE varchar(4), TRADING_CLEARING_REGISTRY_ID bigint, TRADING_CLEARING_REGISTRY varchar(50), REGISTRY_STATUS varchar(4), SECURITY_ID bigint, BALANCE numeric(72,18), OPEN_BALANCE numeric(72,18), CLOSE_BALANCE numeric(72,18), CREDIT numeric(72,18), DEBIT numeric(72,18), SETTLED_CREDIT numeric(72,18), SETTLED_DEBIT numeric(72,18), CHECK_BALANCE numeric(72,18), DIFF_BALANCE numeric(72,18), PLAN_BALANCE numeric(72,18), BALANCE_DIMENSION varchar(4), SETTLEMENT_DATE date, SETTLEMENT_CODE varchar(12), TRADING_DATE date, CLEARING_DATE date, REFUND_DATE date, VALUE_DATE date, PRICE numeric(72,18), CONTRACT varchar(255), COUNTER_PARTY_ID bigint, COMMENT varchar(255), PARENT_ID bigint, GROUP_ID bigint, SESSION_ID bigint, SESSION_TYPE varchar(4), PAYMENT_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
CREATE TABLE REGISTRY_HISTORY(REGISTRY_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), COMPANY_ID bigint, TRADING_CODE varchar(255), CLEARING_CODE varchar(255), SHORT_NAME varchar(255), FULL_NAME varchar(255), ACCOUNT_ID bigint, ACCOUNT_TYPE varchar(4), ACCOUNT varchar(50), REGISTRY_DESIGNATION varchar(4), REGISTRY_INSTRUMENT_TYPE varchar(4), REGISTRY_CAPACITY varchar(4), REGISTRY_UNIT varchar(4), REGISTRY_CODE varchar(4), TRADING_CLEARING_REGISTRY_ID bigint, TRADING_CLEARING_REGISTRY varchar(50), REGISTRY_STATUS varchar(4), SECURITY_ID bigint, SECURITY_SYMBOL varchar(255), BALANCE numeric(72,18), OPEN_BALANCE numeric(72,18), CLOSE_BALANCE numeric(72,18), CREDIT numeric(72,18), DEBIT numeric(72,18), SETTLED_CREDIT numeric(72,18), SETTLED_DEBIT numeric(72,18), CHECK_BALANCE numeric(72,18), DIFF_BALANCE numeric(72,18), PLAN_BALANCE numeric(72,18), BALANCE_DIMENSION varchar(4), SETTLEMENT_DATE date, SETTLEMENT_CODE varchar(12), TRADING_DATE date, CLEARING_DATE date, REFUND_DATE date, VALUE_DATE date, PRICE numeric(72,18), CONTRACT varchar(255), COUNTER_PARTY_ID bigint, COMMENT varchar(255), PARENT_ID bigint, GROUP_ID bigint, SESSION_ID bigint, SESSION_TYPE varchar(4), PAYMENT_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
COMMENT ON TABLE REGISTRY_HISTORY IS 'История изменений таблицы registry';
COMMENT ON COLUMN REGISTRY_HISTORY.REGISTRY_ID IS 'Идентификатор записи в таблице REGISTRY';
COMMENT ON COLUMN REGISTRY_HISTORY.EVENT_TIME IS 'Дата и время изменения';
@ -1741,6 +1743,8 @@ COMMENT ON COLUMN REGISTRY_HISTORY.REGISTRY_STATUS IS 'Код статуса (li
COMMENT ON COLUMN REGISTRY_HISTORY.SECURITY_ID IS 'Идентификатор инструмента (linked to security)';
COMMENT ON COLUMN REGISTRY_HISTORY.SECURITY_SYMBOL IS 'Код инструмента';
COMMENT ON COLUMN REGISTRY_HISTORY.BALANCE IS 'Текущий баланс';
COMMENT ON COLUMN REGISTRY_HISTORY.OPEN_BALANCE IS 'Начальная сумма после расчетной организации';
@ -2071,13 +2075,19 @@ COMMENT ON COLUMN CLEARING_ACCOUNT_HISTORY.ID IS 'Идентификатор з
-- plannerTemplate - Шаблон расписания операционного дня
DROP TABLE IF EXISTS PLANNER_TEMPLATE;
CREATE TABLE PLANNER_TEMPLATE(TASK varchar(4), TASK_TIME time, TASK_STATUS varchar(4), COMPANY_ID bigint, SECURITY_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
CREATE TABLE PLANNER_TEMPLATE(TASK varchar(4), TASK_TIME time, MARKET varchar(4), SECTION varchar(4), SESSION_TYPE varchar(4), TASK_STATUS varchar(4), COMPANY_ID bigint, SECURITY_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
COMMENT ON TABLE PLANNER_TEMPLATE IS 'Шаблон расписания операционного дня';
COMMENT ON COLUMN PLANNER_TEMPLATE.TASK IS 'Код задачи (linked to task)';
COMMENT ON COLUMN PLANNER_TEMPLATE.TASK_TIME IS 'Время задачи';
COMMENT ON COLUMN PLANNER_TEMPLATE.MARKET IS 'Код рынка (linked to market)';
COMMENT ON COLUMN PLANNER_TEMPLATE.SECTION IS 'Код наименования секции (linked to section)';
COMMENT ON COLUMN PLANNER_TEMPLATE.SESSION_TYPE IS 'Код типа клиринговой сессии (linked to sessionType)';
COMMENT ON COLUMN PLANNER_TEMPLATE.TASK_STATUS IS 'Код статуса (linked to taskStatus)';
COMMENT ON COLUMN PLANNER_TEMPLATE.COMPANY_ID IS 'Идентификатор компании (linked to company)';
@ -2109,7 +2119,7 @@ COMMENT ON COLUMN CLEARING_CALENDAR.UPDATED_AT IS 'Дата-время изме
-- planner - Расписание
DROP TABLE IF EXISTS PLANNER;
CREATE TABLE PLANNER(TASK varchar(4), TASK_TIME time, CLEARING_DATE date, MARKET varchar(4), TASK_STATUS varchar(4), COMPANY_ID bigint, SECURITY_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
CREATE TABLE PLANNER(TASK varchar(4), TASK_TIME time, CLEARING_DATE date, MARKET varchar(4), SECTION varchar(4), SESSION_TYPE varchar(4), TASK_STATUS varchar(4), COMPANY_ID bigint, SECURITY_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
COMMENT ON TABLE PLANNER IS 'Расписание';
COMMENT ON COLUMN PLANNER.TASK IS 'Код задачи (linked to task)';
@ -2118,7 +2128,11 @@ COMMENT ON COLUMN PLANNER.TASK_TIME IS 'Время задачи';
COMMENT ON COLUMN PLANNER.CLEARING_DATE IS 'Дата задачи';
COMMENT ON COLUMN PLANNER.MARKET IS 'Код секции (linked to market)';
COMMENT ON COLUMN PLANNER.MARKET IS 'Код рынка (linked to market)';
COMMENT ON COLUMN PLANNER.SECTION IS 'Код наименования секции (linked to section)';
COMMENT ON COLUMN PLANNER.SESSION_TYPE IS 'Код типа клиринговой сессии (linked to sessionType)';
COMMENT ON COLUMN PLANNER.TASK_STATUS IS 'Код статуса (linked to taskStatus)';
@ -2134,7 +2148,7 @@ COMMENT ON COLUMN PLANNER.UPDATED_AT IS 'Дата-время изменения
-- plannerAllToday - Расписание на текущий день
DROP TABLE IF EXISTS PLANNER_ALL_TODAY;
CREATE TABLE PLANNER_ALL_TODAY(TASK varchar(4), TASK_TIME time, CLEARING_DATE date, MARKET varchar(4), TASK_STATUS varchar(4), COMPANY_ID bigint, SECURITY_ID bigint, PARENT varchar(4), PARENT_ID bigint, ID bigint PRIMARY KEY);
CREATE TABLE PLANNER_ALL_TODAY(TASK varchar(4), TASK_TIME time, CLEARING_DATE date, MARKET varchar(4), SECTION varchar(4), SESSION_TYPE varchar(4), TASK_STATUS varchar(4), COMPANY_ID bigint, SECURITY_ID bigint, PARENT varchar(4), PARENT_ID bigint, ID bigint PRIMARY KEY);
COMMENT ON TABLE PLANNER_ALL_TODAY IS 'Расписание на текущий день';
COMMENT ON COLUMN PLANNER_ALL_TODAY.TASK IS 'Код задачи (linked to task)';
@ -2143,7 +2157,11 @@ COMMENT ON COLUMN PLANNER_ALL_TODAY.TASK_TIME IS 'Время';
COMMENT ON COLUMN PLANNER_ALL_TODAY.CLEARING_DATE IS 'Дата';
COMMENT ON COLUMN PLANNER_ALL_TODAY.MARKET IS 'Код секции (linked to market)';
COMMENT ON COLUMN PLANNER_ALL_TODAY.MARKET IS 'Код рынка (linked to market)';
COMMENT ON COLUMN PLANNER_ALL_TODAY.SECTION IS 'Код наименования секции (linked to section)';
COMMENT ON COLUMN PLANNER_ALL_TODAY.SESSION_TYPE IS 'Код типа клиринговой сессии (linked to sessionType)';
COMMENT ON COLUMN PLANNER_ALL_TODAY.TASK_STATUS IS 'Код статуса (linked to taskStatus)';
@ -2229,11 +2247,15 @@ COMMENT ON COLUMN SESSION_HISTORY.SESSION_TYPE IS 'Код типа клирин
-- sTrades - Сделки из Торговой системы
DROP TABLE IF EXISTS S_TRADES;
CREATE TABLE S_TRADES(ID bigint PRIMARY KEY, TRADE_NUM bigint, OPERATION varchar(40), CLASS_CODE varchar(255), TRADE_DATE date, SEC_CODE varchar(255), ACCRUEDINT numeric(72,18), ACCRUEDINT2 numeric(72,18), LOWER_DISCOUNT numeric(72,18), ORDER_NUM bigint, PRICE numeric(72,18), PRICE2 numeric(72,18), REPO_RATE numeric(72,18), REPO_VALUE numeric(72,18), REPO2_VALUE numeric(72,18), START_DISCOUNT numeric(72,18), TS_COMMISSION numeric(72,18), UPPER_DISCOUNT numeric(72,18), VALUE numeric(72,18), YIELD numeric(72,18), QTY numeric(72,18), QTY_PCS numeric(72,18), TRADE_DATE_TIME timestamp, REPO_TERM bigint, CLEARING_COMMISSION numeric(72,18), EXCHANGE_COMMISSION numeric(72,18), TECH_CENTER_COMMISSION numeric(72,18), ACCOUNT varchar(50), BROKER_REF varchar(34), CLIENT_CODE varchar(255), SETTLE_CODE varchar(50), USER_ID varchar(32), EXCHANGE_CODE varchar(64), FIRM_ID varchar(255), FIRM_NAME varchar(255), CP_FIRM_ID varchar(255), CP_FIRM_NAME varchar(255), CLASS_NAME varchar(255), SEC_NAME varchar(255), SETTLE_DATE date, SETTLE_CURRENCY varchar(4), TRADE_CURRENCY varchar(4), TRADE_TIME_MS bigint, BANK_ACC_ID varchar(12), SECTION varchar(4));
CREATE TABLE S_TRADES(ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, TRADE_NUM bigint, OPERATION varchar(40), CLASS_CODE varchar(255), TRADE_DATE date, SEC_CODE varchar(255), ACCRUEDINT numeric(72,18), ACCRUEDINT2 numeric(72,18), LOWER_DISCOUNT numeric(72,18), ORDER_NUM bigint, PRICE numeric(72,18), PRICE2 numeric(72,18), REPO_RATE numeric(72,18), REPO_VALUE numeric(72,18), REPO2_VALUE numeric(72,18), START_DISCOUNT numeric(72,18), TS_COMMISSION numeric(72,18), UPPER_DISCOUNT numeric(72,18), VALUE numeric(72,18), YIELD numeric(72,18), QTY numeric(72,18), QTY_PCS numeric(72,18), TRADE_DATE_TIME timestamp, REPO_TERM bigint, CLEARING_COMMISSION numeric(72,18), EXCHANGE_COMMISSION numeric(72,18), TECH_CENTER_COMMISSION numeric(72,18), ACCOUNT varchar(50), BROKER_REF varchar(34), CLIENT_CODE varchar(255), SETTLE_CODE varchar(50), USER_ID varchar(32), EXCHANGE_CODE varchar(64), FIRM_ID varchar(255), FIRM_NAME varchar(255), CP_FIRM_ID varchar(255), CP_FIRM_NAME varchar(255), CLASS_NAME varchar(255), SEC_NAME varchar(255), SETTLE_DATE date, SETTLE_CURRENCY varchar(4), TRADE_CURRENCY varchar(4), TRADE_TIME_MS bigint, BANK_ACC_ID varchar(12), SECTION varchar(4));
COMMENT ON TABLE S_TRADES IS 'Сделки из Торговой системы';
COMMENT ON COLUMN S_TRADES.ID IS 'Идентификатор записи';
COMMENT ON COLUMN S_TRADES.CREATED_AT IS 'Дата-время создания записи';
COMMENT ON COLUMN S_TRADES.UPDATED_AT IS 'Дата-время изменения записи';
COMMENT ON COLUMN S_TRADES.TRADE_NUM IS 'Номер сделки';
COMMENT ON COLUMN S_TRADES.OPERATION IS 'Направленность сделки (BUY или SELL)';

View file

@ -28,7 +28,7 @@ public class MarketHistoryMapStore extends TemplateEventMapStore<MarketHistory>
@Override
public String[] getFields() {
return new String[]{"ID", "EVENT_TIME", "EVENT_USER_ID", "EVENT_TYPE",
"MARKET_ID", "CREATED_AT", "UPDATED_AT", "DESCRIPTION", "EXCHANGE_ID", "NAME", "CODE", "SETTLEMENT_CURRENCY", "SECTION",
"MARKET_ID", "CREATED_AT", "UPDATED_AT", "DESCRIPTION", "EXCHANGE_ID", "NAME", "CODE", "SETTLEMENT_CURRENCY", "SECTION", "MARKET_TYPE"
};
}
@ -50,6 +50,7 @@ public class MarketHistoryMapStore extends TemplateEventMapStore<MarketHistory>
object.getCode(),
object.getSettlementCurrency(),
object.getSection(),
object.getMarketType()
};
return args;
}

View file

@ -28,7 +28,7 @@ public class RegistryHistoryMapStore extends TemplateEventMapStore<RegistryHisto
@Override
public String[] getFields() {
return new String[]{"ID", "EVENT_TIME", "EVENT_USER_ID", "EVENT_TYPE",
"REGISTRY_COMPANY_ID", "TRADING_CODE", "CLEARING_CODE", "SHORT_NAME", "FULL_NAME", "ACCOUNT_ID", "ACCOUNT_TYPE", "ACCOUNT", "REGISTRY_DESIGNATION", "REGISTRY_INSTRUMENT_TYPE", "REGISTRY_CAPACITY", "REGISTRY_UNIT", "REGISTRY_CODE", "TRADING_CLEARING_REGISTRY_ID", "TRADING_CLEARING_REGISTRY", "REGISTRY_STATUS", "SECURITY_ID", "BALANCE", "OPEN_BALANCE", "CLOSE_BALANCE", "CREDIT", "DEBIT", "SETTLED_CREDIT", "SETTLED_DEBIT", "CHECK_BALANCE", "DIFF_BALANCE", "PLAN_BALANCE", "BALANCE_DIMENSION", "SETTLEMENT_DATE", "SETTLEMENT_CODE", "TRADING_DATE", "CLEARING_DATE", "REFUND_DATE", "VALUE_DATE", "PRICE", "CONTRACT", "COUNTER_PARTY_ID", "COMMENT", "PARENT_ID", "GROUP_ID", "SESSION_ID", "PAYMENT_ID", "REFUND_PAYMENT_ID", "ID", "CREATED_AT", "UPDATED_AT"
"REGISTRY_ID", "CREATED_AT", "UPDATED_AT", "COMPANY_ID", "TRADING_CODE", "CLEARING_CODE", "SHORT_NAME", "FULL_NAME", "ACCOUNT_ID", "ACCOUNT_TYPE", "ACCOUNT", "REGISTRY_DESIGNATION", "REGISTRY_INSTRUMENT_TYPE", "REGISTRY_CAPACITY", "REGISTRY_UNIT", "REGISTRY_CODE", "TRADING_CLEARING_REGISTRY_ID", "TRADING_CLEARING_REGISTRY", "REGISTRY_STATUS", "SECURITY_ID", "SECURITY_SYMBOL", "BALANCE", "OPEN_BALANCE", "CLOSE_BALANCE", "CREDIT", "DEBIT", "SETTLED_CREDIT", "SETTLED_DEBIT", "CHECK_BALANCE", "DIFF_BALANCE", "PLAN_BALANCE", "BALANCE_DIMENSION", "SETTLEMENT_DATE", "SETTLEMENT_CODE", "TRADING_DATE", "CLEARING_DATE", "REFUND_DATE", "VALUE_DATE", "PRICE", "CONTRACT", "COUNTER_PARTY_ID", "COMMENT", "PARENT_ID", "GROUP_ID", "SESSION_ID", "SESSION_TYPE", "PAYMENT_ID"
};
}
@ -41,6 +41,9 @@ public class RegistryHistoryMapStore extends TemplateEventMapStore<RegistryHisto
historyLog.getUserId(),
historyLog.getEventType(),
object.getId(),
TimeUtil.toDateFromInstant(object.getCreated()),
TimeUtil.toDateFromInstant(object.getUpdated()),
object.getCompanyId(),
object.getTradingCode(),
object.getClearingCode(),
@ -58,6 +61,7 @@ public class RegistryHistoryMapStore extends TemplateEventMapStore<RegistryHisto
object.getTradingClearingRegistry(),
object.getRegistryStatus(),
object.getSecurityId(),
object.getSecuritySymbol(),
object.getBalance(),
object.getOpenBalance(),
object.getCloseBalance(),
@ -82,11 +86,8 @@ public class RegistryHistoryMapStore extends TemplateEventMapStore<RegistryHisto
object.getParentId(),
object.getGroupId(),
object.getSessionId(),
object.getPaymentId(),
object.getRefundPaymentId(),
object.getId(),
TimeUtil.toDateFromInstant(object.getCreatedAt()),
TimeUtil.toDateFromInstant(object.getUpdatedAt())
object.getSessionType(),
object.getPaymentId()
};
return args;
}

View file

@ -30,15 +30,8 @@ public class MarketMapStore extends TemplateMapStore<Market> {
@Override
public String[] getFields() {
return new String[]{
"id",
"created_at",
"updated_at",
"description",
"exchange_id",
"name",
"code",
"settlement_currency",
"section"
"ID", "CREATED_AT", "UPDATED_AT",
"DESCRIPTION", "EXCHANGE_ID", "NAME", "CODE", "SETTLEMENT_CURRENCY", "SECTION", "MARKET_TYPE",
};
}
@ -54,6 +47,7 @@ public class MarketMapStore extends TemplateMapStore<Market> {
object.setCode(resultSet.getObject("CODE", String.class));
object.setSettlementCurrency(resultSet.getObject("SETTLEMENT_CURRENCY", String.class));
object.setSection(resultSet.getObject("SECTION", String.class));
object.setMarketType(resultSet.getObject("MARKET_TYPE", String.class));
return object;
}
@ -68,7 +62,8 @@ public class MarketMapStore extends TemplateMapStore<Market> {
object.getName(),
object.getCode(),
object.getSettlementCurrency(),
object.getSection()
object.getSection(),
object.getMarketType(),
};
return args;
}

View file

@ -9,6 +9,7 @@ import ru.spcex.platform.utils.time.TimeUtil;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.time.LocalTime;
@Component
public class PlannerMapStore extends TemplateMapStore<Planner> {
@ -30,23 +31,25 @@ public class PlannerMapStore extends TemplateMapStore<Planner> {
@Override
public String[] getFields() {
return new String[]{
"ID", "CREATED_AT", "UPDATED_AT", "TASK", "TASK_TIME", "CLEARING_DATE", "MARKET", "TASK_STATUS", "COMPANY_ID", "SECURITY_ID"
"ID", "CREATED_AT", "UPDATED_AT", "TASK", "TASK_TIME", "CLEARING_DATE", "MARKET", "SECTION", "SESSION_TYPE", "TASK_STATUS", "COMPANY_ID", "SECURITY_ID"
};
}
@Override
public Planner objectReader(ResultSet resultSet) throws SQLException {
Planner object = new Planner();
object.setId(resultSet.getObject("ID", Long.class));
object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT"));
object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT"));
object.setTask(resultSet.getObject("TASK", String.class));
object.setTaskTime(getLocalTimeFromSqlTime(resultSet, "TASK_TIME"));
object.setTaskTime(resultSet.getObject("TASK_TIME", LocalTime.class));
object.setClearingDate(getLocalDateFromSqlDate(resultSet, "CLEARING_DATE"));
object.setMarket(resultSet.getObject("MARKET", String.class));
object.setSection(resultSet.getObject("SECTION", String.class));
object.setSessionType(resultSet.getObject("SESSION_TYPE", String.class));
object.setTaskStatus(resultSet.getObject("TASK_STATUS", String.class));
object.setCompanyId(resultSet.getObject("COMPANY_ID", Long.class));
object.setSecurityId(resultSet.getObject("SECURITY_ID", Long.class));
object.setId(resultSet.getObject("ID", Long.class));
object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT"));
object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT"));
return object;
}
@ -57,9 +60,11 @@ public class PlannerMapStore extends TemplateMapStore<Planner> {
TimeUtil.toDateFromInstant(object.getCreated()),
TimeUtil.toDateFromInstant(object.getUpdated()),
object.getTask(),
TimeUtil.toDateFromLocalTime(object.getTaskTime()),
object.getTaskTime(),
TimeUtil.toDateFromLocalDate(object.getClearingDate()),
object.getMarket(),
object.getSection(),
object.getSessionType(),
object.getTaskStatus(),
object.getCompanyId(),
object.getSecurityId()

View file

@ -9,6 +9,7 @@ import ru.spcex.platform.utils.time.TimeUtil;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.time.LocalTime;
@Component
public class PlannerTemplateMapStore extends TemplateMapStore<PlannerTemplate> {
@ -30,35 +31,41 @@ public class PlannerTemplateMapStore extends TemplateMapStore<PlannerTemplate> {
@Override
public String[] getFields() {
return new String[]{
"ID", "CREATED_AT", "UPDATED_AT", "TASK", "TASK_TIME", "TASK_STATUS", "COMPANY_ID", "SECURITY_ID"
"TASK", "TASK_TIME", "MARKET", "SECTION", "SESSION_TYPE", "TASK_STATUS", "COMPANY_ID", "SECURITY_ID", "ID", "CREATED_AT", "UPDATED_AT"
};
}
@Override
public PlannerTemplate objectReader(ResultSet resultSet) throws SQLException {
PlannerTemplate object = new PlannerTemplate();
object.setId(resultSet.getObject("ID", Long.class));
object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT"));
object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT"));
object.setTask(resultSet.getObject("TASK", String.class));
object.setTaskTime(getLocalTimeFromSqlTime(resultSet, "TASK_TIME"));
object.setTaskTime(resultSet.getObject("TASK_TIME", LocalTime.class));
object.setMarket(resultSet.getObject("MARKET", String.class));
object.setSection(resultSet.getObject("SECTION", String.class));
object.setSessionType(resultSet.getObject("SESSION_TYPE", String.class));
object.setTaskStatus(resultSet.getObject("TASK_STATUS", String.class));
object.setCompanyId(resultSet.getObject("COMPANY_ID", Long.class));
object.setSecurityId(resultSet.getObject("SECURITY_ID", Long.class));
object.setId(resultSet.getObject("ID", Long.class));
object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT"));
object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT"));
return object;
}
@Override
public Object[] objectToField(PlannerTemplate object) {
Object[] args = new Object[]{
object.getId(),
TimeUtil.toDateFromInstant(object.getCreated()),
TimeUtil.toDateFromInstant(object.getUpdated()),
object.getTask(),
TimeUtil.toDateFromLocalTime(object.getTaskTime()),
object.getTaskTime(),
object.getMarket(),
object.getSection(),
object.getSessionType(),
object.getTaskStatus(),
object.getCompanyId(),
object.getSecurityId()
object.getSecurityId(),
object.getId(),
TimeUtil.toDateFromInstant(object.getCreated()),
TimeUtil.toDateFromInstant(object.getUpdated())
};
return args;
}

View file

@ -32,7 +32,7 @@ public class RegistryMapStore extends TemplateMapStore<Registry> {
@Override
public String[] getFields() {
return new String[]{
"COMPANY_ID", "TRADING_CODE", "CLEARING_CODE", "SHORT_NAME", "FULL_NAME", "ACCOUNT_ID", "ACCOUNT_TYPE", "ACCOUNT", "REGISTRY_DESIGNATION", "REGISTRY_INSTRUMENT_TYPE", "REGISTRY_CAPACITY", "REGISTRY_UNIT", "REGISTRY_CODE", "TRADING_CLEARING_REGISTRY_ID", "TRADING_CLEARING_REGISTRY", "REGISTRY_STATUS", "SECURITY_ID", "BALANCE", "OPEN_BALANCE", "CLOSE_BALANCE", "CREDIT", "DEBIT", "SETTLED_CREDIT", "SETTLED_DEBIT", "CHECK_BALANCE", "DIFF_BALANCE", "PLAN_BALANCE", "BALANCE_DIMENSION", "SETTLEMENT_DATE", "SETTLEMENT_CODE", "TRADING_DATE", "CLEARING_DATE", "REFUND_DATE", "VALUE_DATE", "PRICE", "CONTRACT", "COUNTER_PARTY_ID", "COMMENT", "PARENT_ID", "GROUP_ID", "SESSION_ID", "PAYMENT_ID", "REFUND_PAYMENT_ID", "ID", "CREATED_AT", "UPDATED_AT"
"COMPANY_ID", "TRADING_CODE", "CLEARING_CODE", "SHORT_NAME", "FULL_NAME", "ACCOUNT_ID", "ACCOUNT_TYPE", "ACCOUNT", "REGISTRY_DESIGNATION", "REGISTRY_INSTRUMENT_TYPE", "REGISTRY_CAPACITY", "REGISTRY_UNIT", "REGISTRY_CODE", "TRADING_CLEARING_REGISTRY_ID", "TRADING_CLEARING_REGISTRY", "REGISTRY_STATUS", "SECURITY_ID", "SECURITY_SYMBOL", "BALANCE", "OPEN_BALANCE", "CLOSE_BALANCE", "CREDIT", "DEBIT", "SETTLED_CREDIT", "SETTLED_DEBIT", "CHECK_BALANCE", "DIFF_BALANCE", "PLAN_BALANCE", "BALANCE_DIMENSION", "SETTLEMENT_DATE", "SETTLEMENT_CODE", "TRADING_DATE", "CLEARING_DATE", "REFUND_DATE", "VALUE_DATE", "PRICE", "CONTRACT", "COUNTER_PARTY_ID", "COMMENT", "PARENT_ID", "GROUP_ID", "SESSION_ID", "SESSION_TYPE", "PAYMENT_ID", "ID", "CREATED_AT", "UPDATED_AT"
};
}
@ -56,6 +56,7 @@ public class RegistryMapStore extends TemplateMapStore<Registry> {
object.setTradingClearingRegistry(resultSet.getObject("TRADING_CLEARING_REGISTRY", String.class));
object.setRegistryStatus(resultSet.getObject("REGISTRY_STATUS", String.class));
object.setSecurityId(resultSet.getObject("SECURITY_ID", Long.class));
object.setSecuritySymbol(resultSet.getObject("SECURITY_SYMBOL", String.class));
object.setBalance(resultSet.getObject("BALANCE", BigDecimal.class));
object.setOpenBalance(resultSet.getObject("OPEN_BALANCE", BigDecimal.class));
object.setCloseBalance(resultSet.getObject("CLOSE_BALANCE", BigDecimal.class));
@ -80,11 +81,11 @@ public class RegistryMapStore extends TemplateMapStore<Registry> {
object.setParentId(resultSet.getObject("PARENT_ID", Long.class));
object.setGroupId(resultSet.getObject("GROUP_ID", Long.class));
object.setSessionId(resultSet.getObject("SESSION_ID", Long.class));
object.setSessionType(resultSet.getObject("SESSION_TYPE", String.class));
object.setPaymentId(resultSet.getObject("PAYMENT_ID", Long.class));
object.setRefundPaymentId(resultSet.getObject("REFUND_PAYMENT_ID", Long.class));
object.setId(resultSet.getObject("ID", Long.class));
object.setCreatedAt(getInstantFromTimestamp(resultSet, "CREATED_AT"));
object.setUpdatedAt(getInstantFromTimestamp(resultSet, "UPDATED_AT"));
object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT"));
object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT"));
return object;
}
@ -108,6 +109,7 @@ public class RegistryMapStore extends TemplateMapStore<Registry> {
object.getTradingClearingRegistry(),
object.getRegistryStatus(),
object.getSecurityId(),
object.getSecuritySymbol(),
object.getBalance(),
object.getOpenBalance(),
object.getCloseBalance(),
@ -132,11 +134,11 @@ public class RegistryMapStore extends TemplateMapStore<Registry> {
object.getParentId(),
object.getGroupId(),
object.getSessionId(),
object.getSessionType(),
object.getPaymentId(),
object.getRefundPaymentId(),
object.getId(),
TimeUtil.toDateFromInstant(object.getCreatedAt()),
TimeUtil.toDateFromInstant(object.getUpdatedAt())
TimeUtil.toDateFromInstant(object.getCreated()),
TimeUtil.toDateFromInstant(object.getUpdated())
};
return args;
}

View file

@ -9,6 +9,7 @@ import ru.spcex.platform.utils.time.TimeUtil;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.time.LocalTime;
@Component
public class PlannerAllTodayMapStore extends TemplateMapStore<PlannerAllToday> {
@ -30,23 +31,25 @@ public class PlannerAllTodayMapStore extends TemplateMapStore<PlannerAllToday> {
@Override
public String[] getFields() {
return new String[]{
"ID", "TASK", "TASK_TIME", "CLEARING_DATE", "MARKET", "TASK_STATUS", "COMPANY_ID", "SECURITY_ID", "PARENT", "PARENT_ID"
"ID", "TASK", "TASK_TIME", "CLEARING_DATE", "MARKET", "SECTION", "SESSION_TYPE", "TASK_STATUS", "COMPANY_ID", "SECURITY_ID", "PARENT", "PARENT_ID"
};
}
@Override
public PlannerAllToday objectReader(ResultSet resultSet) throws SQLException {
PlannerAllToday object = new PlannerAllToday();
object.setId(resultSet.getObject("ID", Long.class));
object.setTask(resultSet.getObject("TASK", String.class));
object.setTaskTime(getLocalTimeFromSqlTime(resultSet, "TASK_TIME"));
object.setTaskTime(getLocalTimeFromSqlTime(resultSet,"TASK_TIME"));
object.setClearingDate(getLocalDateFromSqlDate(resultSet, "CLEARING_DATE"));
object.setMarket(resultSet.getObject("MARKET", String.class));
object.setSection(resultSet.getObject("SECTION", String.class));
object.setSessionType(resultSet.getObject("SESSION_TYPE", String.class));
object.setTaskStatus(resultSet.getObject("TASK_STATUS", String.class));
object.setCompanyId(resultSet.getObject("COMPANY_ID", Long.class));
object.setSecurityId(resultSet.getObject("SECURITY_ID", Long.class));
object.setParent(resultSet.getObject("PARENT", String.class));
object.setParentId(resultSet.getObject("PARENT_ID", Long.class));
object.setId(resultSet.getObject("ID", Long.class));
return object;
}
@ -58,6 +61,8 @@ public class PlannerAllTodayMapStore extends TemplateMapStore<PlannerAllToday> {
TimeUtil.toDateFromLocalTime(object.getTaskTime()),
TimeUtil.toDateFromLocalDate(object.getClearingDate()),
object.getMarket(),
object.getSection(),
object.getSessionType(),
object.getTaskStatus(),
object.getCompanyId(),
object.getSecurityId(),
@ -67,4 +72,5 @@ public class PlannerAllTodayMapStore extends TemplateMapStore<PlannerAllToday> {
return args;
}
}

View file

@ -23,11 +23,6 @@ public class STradesMapStore extends TemplateMapStore<STrades> {
return IMDGDistributedNames.Map_STrades;
}
@Override
public String[] getIndexingField() {
return new String[]{"tradeNum"};// список индексируемых полей
}
@Override
public String getTableName() {
return "S_TRADES";
@ -36,12 +31,12 @@ public class STradesMapStore extends TemplateMapStore<STrades> {
@Override
public String[] getFields() {
return new String[]{
"ID", "TRADE_NUM", "OPERATION", "CLASS_CODE", "TRADE_DATE", "SEC_CODE", "ACCRUEDINT", "ACCRUEDINT2",
"LOWER_DISCOUNT", "ORDER_NUM", "PRICE", "PRICE2", "REPO_RATE", "REPO_VALUE", "REPO2_VALUE",
"START_DISCOUNT", "TS_COMMISSION", "UPPER_DISCOUNT", "VALUE", "YIELD", "QTY", "QTY_PCS",
"TRADE_DATE_TIME", "REPO_TERM", "CLEARING_COMMISSION", "EXCHANGE_COMMISSION", "TECH_CENTER_COMMISSION",
"ACCOUNT", "BROKER_REF", "CLIENT_CODE", "SETTLE_CODE", "USER_ID", "EXCHANGE_CODE",
"FIRM_ID", "FIRM_NAME", "CP_FIRM_ID", "CP_FIRM_NAME", "CLASS_NAME", "SEC_NAME",
"ID", "CREATED_AT", "UPDATED_AT", "TRADE_NUM", "OPERATION", "CLASS_CODE", "TRADE_DATE", "SEC_CODE",
"ACCRUEDINT", "ACCRUEDINT2", "LOWER_DISCOUNT", "ORDER_NUM", "PRICE", "PRICE2", "REPO_RATE",
"REPO_VALUE", "REPO2_VALUE", "START_DISCOUNT", "TS_COMMISSION", "UPPER_DISCOUNT", "VALUE", "YIELD",
"QTY", "QTY_PCS", "TRADE_DATE_TIME", "REPO_TERM", "CLEARING_COMMISSION", "EXCHANGE_COMMISSION",
"TECH_CENTER_COMMISSION", "ACCOUNT", "BROKER_REF", "CLIENT_CODE", "SETTLE_CODE", "USER_ID",
"EXCHANGE_CODE", "FIRM_ID", "FIRM_NAME", "CP_FIRM_ID", "CP_FIRM_NAME", "CLASS_NAME", "SEC_NAME",
"SETTLE_DATE", "SETTLE_CURRENCY", "TRADE_CURRENCY", "TRADE_TIME_MS", "BANK_ACC_ID", "SECTION"
};
}
@ -50,6 +45,8 @@ public class STradesMapStore extends TemplateMapStore<STrades> {
public STrades objectReader(ResultSet resultSet) throws SQLException {
STrades object = new STrades();
object.setId(resultSet.getObject("ID", Long.class));
object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT"));
object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT"));
object.setTradeNum(resultSet.getObject("TRADE_NUM", Long.class));
object.setOperation(resultSet.getObject("OPERATION", String.class));
object.setClassCode(resultSet.getObject("CLASS_CODE", String.class));
@ -101,6 +98,8 @@ public class STradesMapStore extends TemplateMapStore<STrades> {
public Object[] objectToField(STrades object) {
Object[] args = new Object[]{
object.getId(),
TimeUtil.toDateFromInstant(object.getCreated()),
TimeUtil.toDateFromInstant(object.getUpdated()),
object.getTradeNum(),
object.getOperation(),
object.getClassCode(),