treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

26
clearing-parent/backend-api/src/main/resources/meta/meta.xml
View file

@ -756,7 +756,7 @@
<createdAt field="created" type="4" webtype="5" dbname="Дата-время создания записи" name="Время создания записи" shortname="Создано" searchable="true" sortable="true" ignore="true"/> <createdAt field="created" type="4" webtype="5" dbname="Дата-время создания записи" name="Время создания записи" shortname="Создано" searchable="true" sortable="true" ignore="true"/>
<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true" ignore="true"/> <updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true" ignore="true"/>
</listing> </listing>
<market name="Торговые секции" destination="markets" class="ru.clearing.classes.statics.data.misc.Market" logUpdates="true" table="market"> <market name="Рынки" destination="markets" class="ru.clearing.classes.statics.data.misc.Market" logUpdates="true" table="market">
<description type="2" length="255" name="Описание" shortname="Описание" searchable="true" sortable="true"/> <description type="2" length="255" name="Описание" shortname="Описание" searchable="true" sortable="true"/>
<exchangeId type="1" dbname="Идентификатор площадки" name="Наименование площадки" shortname="Площадка" searchable="true" sortable="true" link="company"/> <exchangeId type="1" dbname="Идентификатор площадки" name="Наименование площадки" shortname="Площадка" searchable="true" sortable="true" link="company"/>
<name type="2" length="255" name="Наименование рынка" shortname="Рынок" searchable="true" sortable="true"/> <name type="2" length="255" name="Наименование рынка" shortname="Рынок" searchable="true" sortable="true"/>
@ -857,6 +857,7 @@
<tradingClearingRegistry type="2" length="50" name="Торгово-клиринговый регистр" shortname="Торгово-клиринговый регистр" searchable="true" sortable="true"/> <tradingClearingRegistry type="2" length="50" name="Торгово-клиринговый регистр" shortname="Торгово-клиринговый регистр" searchable="true" sortable="true"/>
<registryStatus type="12" dbname="Код статуса" name="Наименование статуса" shortname="Статус" searchable="true" sortable="true" link="registryStatus"/> <registryStatus type="12" dbname="Код статуса" name="Наименование статуса" shortname="Статус" searchable="true" sortable="true" link="registryStatus"/>
<securityId type="1" dbname="Идентификатор инструмента" name="Наименование инструмента" shortname="Инструмент" searchable="false" sortable="true" visible="true" link="security" linkCode="shortName"/> <securityId type="1" dbname="Идентификатор инструмента" name="Наименование инструмента" shortname="Инструмент" searchable="false" sortable="true" visible="true" link="security" linkCode="shortName"/>
<securitySymbol type="2" length="255" name="Код инструмента" shortname="Код инструмента" searchable="true" sortable="true" visible="true"/>
<balance type="10" name="Текущий баланс" shortname="Баланс" searchable="true" sortable="true" visible="true"/> <balance type="10" name="Текущий баланс" shortname="Баланс" searchable="true" sortable="true" visible="true"/>
<openBalance type="10" name="Начальная сумма после расчетной организации" shortname="Начальный баланс" searchable="true" sortable="true" visible="true"/> <openBalance type="10" name="Начальная сумма после расчетной организации" shortname="Начальный баланс" searchable="true" sortable="true" visible="true"/>
<closeBalance type="10" name="Конечная сумма остатков ден. средств на счете" shortname="Конечный баланс" searchable="true" sortable="true" visible="true"/> <closeBalance type="10" name="Конечная сумма остатков ден. средств на счете" shortname="Конечный баланс" searchable="true" sortable="true" visible="true"/>
@ -1001,6 +1002,9 @@
<plannerTemplate name="Шаблон расписания операционного дня" destination="schedule/planner-templates" class="ru.clearing.classes.statics.data.scheduler.PlannerTemplate" table="planner_template"> <plannerTemplate name="Шаблон расписания операционного дня" destination="schedule/planner-templates" class="ru.clearing.classes.statics.data.scheduler.PlannerTemplate" table="planner_template">
<task type="12" dbname="Код задачи" name="Наименование задачи" shortname="Задача" searchable="false" sortable="false" visible="true" link="task"/> <task type="12" dbname="Код задачи" name="Наименование задачи" shortname="Задача" searchable="false" sortable="false" visible="true" link="task"/>
<taskTime type="5" name="Время задачи" shortname="Время задачи" searchable="false" sortable="false" visible="true"/> <taskTime type="5" name="Время задачи" shortname="Время задачи" searchable="false" sortable="false" visible="true"/>
<market type="12" dbname="Код рынка" name="Наименование рынка" shortname="Рынок" searchable="true" sortable="true" visible="true" link="market" linkCode="name" ignore="true"/>
<section type="12" dbname="Код наименования секции" name="Наименование секции" shortname="Секция" searchable="true" sortable="true" visible="true" link="section" linkCode="name"/>
<sessionType type="12" dbname="Код типа клиринговой сессии" name="Тип клиринговой сессии" shortname="Тип КС" searchable="true" sortable="true" visible="true" link="sessionType" linkCode="name"/>
<taskStatus type="12" dbname="Код статуса" name="Наименование статуса" shortname="Статус" searchable="false" sortable="true" visible="true" link="taskStatus"/> <taskStatus type="12" dbname="Код статуса" name="Наименование статуса" shortname="Статус" searchable="false" sortable="true" visible="true" link="taskStatus"/>
<companyId type="1" dbname="Идентификатор компании" name="Наименование компании" shortname="Компания" searchable="false" sortable="false" visible="true" link="company" linkCode="shortName"/> <companyId type="1" dbname="Идентификатор компании" name="Наименование компании" shortname="Компания" searchable="false" sortable="false" visible="true" link="company" linkCode="shortName"/>
<securityId type="1" dbname="Идентификатор инструмента" name="Наименование инструмента" shortname="Инструмент" searchable="false" sortable="true" visible="true" link="security" linkCode="shortName"/> <securityId type="1" dbname="Идентификатор инструмента" name="Наименование инструмента" shortname="Инструмент" searchable="false" sortable="true" visible="true" link="security" linkCode="shortName"/>
@ -1011,6 +1015,8 @@
<post name="Новый шаблон расписания операционного дня"> <post name="Новый шаблон расписания операционного дня">
<task type="12" name="Наименование задачи" shortname="Задача" link="task" required="true"/> <task type="12" name="Наименование задачи" shortname="Задача" link="task" required="true"/>
<taskTime type="5" name="Время задачи" shortname="Время задачи" required="true"/> <taskTime type="5" name="Время задачи" shortname="Время задачи" required="true"/>
<section type="12" name="Секция" shortname="Секция" link="section" linkCode="name" linkKeyCode="code"/>
<sessionType type="12" name="Тип клиринговой сессии" shortname="Тип клиринговой сессии" link="sessionType" linkCode="name" linkKeyCode="code"/>
<taskStatus type="12" name="Наименование статуса" shortname="Статус" link="taskStatus" required="true"/> <taskStatus type="12" name="Наименование статуса" shortname="Статус" link="taskStatus" required="true"/>
<companyId type="1" name="Наименование компании" shortname="Компания" link="company" linkCode="shortName"/> <companyId type="1" name="Наименование компании" shortname="Компания" link="company" linkCode="shortName"/>
<securityId type="1" name="Наименование инструмента" shortname="Инструмент" link="security" linkCode="shortName"/> <securityId type="1" name="Наименование инструмента" shortname="Инструмент" link="security" linkCode="shortName"/>
@ -1019,6 +1025,8 @@
<id type="1" name="Идентификатор записи" shortname="ID" link="plannerTemplate" linkCode="id" required="true"/> <id type="1" name="Идентификатор записи" shortname="ID" link="plannerTemplate" linkCode="id" required="true"/>
<task type="12" name="Наименование задачи" shortname="Задача" link="task"/> <task type="12" name="Наименование задачи" shortname="Задача" link="task"/>
<taskTime type="5" name="Время задачи" shortname="Время задачи"/> <taskTime type="5" name="Время задачи" shortname="Время задачи"/>
<section type="12" name="Секция" shortname="Секция" link="section" linkCode="name" linkKeyCode="code"/>
<sessionType type="12" name="Тип клиринговой сессии" shortname="Тип клиринговой сессии" link="sessionType" linkCode="name" linkKeyCode="code"/>
<taskStatus type="12" name="Наименование статуса" shortname="Статус" link="taskStatus"/> <taskStatus type="12" name="Наименование статуса" shortname="Статус" link="taskStatus"/>
<companyId type="1" name="Наименование компании" shortname="Компания" link="company" linkCode="shortName"/> <companyId type="1" name="Наименование компании" shortname="Компания" link="company" linkCode="shortName"/>
<securityId type="1" name="Наименование инструмента" shortname="Инструмент" link="security" linkCode="shortName"/> <securityId type="1" name="Наименование инструмента" shortname="Инструмент" link="security" linkCode="shortName"/>
@ -1056,7 +1064,9 @@
<task type="12" dbname="Код задачи" name="Наименование задачи" shortname="Задача" searchable="false" sortable="false" visible="true" link="task"/> <task type="12" dbname="Код задачи" name="Наименование задачи" shortname="Задача" searchable="false" sortable="false" visible="true" link="task"/>
<taskTime type="5" name="Время задачи" shortname="Время задачи" searchable="false" sortable="false" visible="true"/> <taskTime type="5" name="Время задачи" shortname="Время задачи" searchable="false" sortable="false" visible="true"/>
<clearingDate type="6" name="Дата задачи" shortname="Дата задачи" searchable="false" sortable="false" visible="true"/> <clearingDate type="6" name="Дата задачи" shortname="Дата задачи" searchable="false" sortable="false" visible="true"/>
<market type="12" dbname="Код секции" name="Секция" shortname="Секция" searchable="false" sortable="false" visible="true" link="market" linkCode="name"/> <market type="12" dbname="Код рынка" name="Наименование рынка" shortname="Рынок" searchable="true" sortable="true" visible="true" link="market" linkCode="name" ignore="true"/>
<section type="12" dbname="Код наименования секции" name="Наименование секции" shortname="Секция" searchable="true" sortable="true" visible="true" link="section" linkCode="name"/>
<sessionType type="12" dbname="Код типа клиринговой сессии" name="Тип клиринговой сессии" shortname="Тип КС" searchable="true" sortable="true" visible="true" link="sessionType" linkCode="name"/>
<taskStatus type="12" dbname="Код статуса" name="Наименование статуса" shortname="Статус" searchable="false" sortable="true" visible="true" link="taskStatus"/> <taskStatus type="12" dbname="Код статуса" name="Наименование статуса" shortname="Статус" searchable="false" sortable="true" visible="true" link="taskStatus"/>
<companyId type="1" dbname="Идентификатор компании" name="Наименование компании" shortname="Компания" searchable="false" sortable="false" visible="true" link="company" linkCode="shortName"/> <companyId type="1" dbname="Идентификатор компании" name="Наименование компании" shortname="Компания" searchable="false" sortable="false" visible="true" link="company" linkCode="shortName"/>
<securityId type="1" dbname="Идентификатор инструмента" name="Наименование инструмента" shortname="Инструмент" searchable="false" sortable="true" visible="true" link="security" linkCode="shortName"/> <securityId type="1" dbname="Идентификатор инструмента" name="Наименование инструмента" shortname="Инструмент" searchable="false" sortable="true" visible="true" link="security" linkCode="shortName"/>
@ -1068,7 +1078,8 @@
<task type="12" name="Наименование задачи" shortname="Задача" link="task" required="true"/> <task type="12" name="Наименование задачи" shortname="Задача" link="task" required="true"/>
<clearingDate type="6" name="Дата задачи" shortname="Дата задачи" required="true"/> <clearingDate type="6" name="Дата задачи" shortname="Дата задачи" required="true"/>
<taskTime type="5" name="Время задачи" shortname="Время задачи" required="true"/> <taskTime type="5" name="Время задачи" shortname="Время задачи" required="true"/>
<market type="12" name="Секция" shortname="Секция" link="market" linkCode="name"/> <section type="12" name="Секция" shortname="Секция" link="section" linkCode="name" linkKeyCode="code"/>
<sessionType type="12" name="Тип клиринговой сессии" shortname="Тип клиринговой сессии" link="sessionType" linkCode="name" linkKeyCode="code"/>
<taskStatus type="12" name="Наименование статуса" shortname="Статус" link="taskStatus" required="true"/> <taskStatus type="12" name="Наименование статуса" shortname="Статус" link="taskStatus" required="true"/>
<companyId type="1" name="Наименование компании" shortname="Компания" link="company" linkCode="shortName"/> <companyId type="1" name="Наименование компании" shortname="Компания" link="company" linkCode="shortName"/>
<securityId type="1" name="Наименование инструмента" shortname="Инструмент" link="security" linkCode="shortName"/> <securityId type="1" name="Наименование инструмента" shortname="Инструмент" link="security" linkCode="shortName"/>
@ -1078,7 +1089,8 @@
<task type="12" name="Наименование задачи" shortname="Задача" link="task"/> <task type="12" name="Наименование задачи" shortname="Задача" link="task"/>
<taskTime type="5" name="Время задачи" shortname="Время задачи"/> <taskTime type="5" name="Время задачи" shortname="Время задачи"/>
<clearingDate type="6" name="Дата задачи" shortname="Дата задачи"/> <clearingDate type="6" name="Дата задачи" shortname="Дата задачи"/>
<market type="12" name="Секция" shortname="Секция" link="market" linkCode="name"/> <section type="12" name="Секция" shortname="Секция" link="section" linkCode="name" linkKeyCode="code"/>
<sessionType type="12" name="Тип клиринговой сессии" shortname="Тип клиринговой сессии" link="sessionType" linkCode="name" linkKeyCode="code"/>
<taskStatus type="12" name="Наименование статуса" shortname="Статус" link="taskStatus"/> <taskStatus type="12" name="Наименование статуса" shortname="Статус" link="taskStatus"/>
<companyId type="1" name="Наименование компании" shortname="Компания" link="company" linkCode="shortName"/> <companyId type="1" name="Наименование компании" shortname="Компания" link="company" linkCode="shortName"/>
<securityId type="1" name="Наименование инструмента" shortname="Инструмент" link="security" linkCode="shortName"/> <securityId type="1" name="Наименование инструмента" shortname="Инструмент" link="security" linkCode="shortName"/>
@ -1092,7 +1104,9 @@
<task type="12" dbname="Код задачи" name="Наименование задачи" shortname="Задача" searchable="true" sortable="true" visible="true" link="task"/> <task type="12" dbname="Код задачи" name="Наименование задачи" shortname="Задача" searchable="true" sortable="true" visible="true" link="task"/>
<taskTime type="5" name="Время" shortname="Время" searchable="true" sortable="true" visible="true"/> <taskTime type="5" name="Время" shortname="Время" searchable="true" sortable="true" visible="true"/>
<clearingDate type="6" name="Дата" shortname="Дата" searchable="true" sortable="true" visible="true"/> <clearingDate type="6" name="Дата" shortname="Дата" searchable="true" sortable="true" visible="true"/>
<market type="12" dbname="Код секции" name="Наименование секции" shortname="Секция" searchable="true" sortable="true" visible="true" link="market" linkCode="name"/> <market type="12" dbname="Код рынка" name="Наименование рынка" shortname="Рынок" searchable="true" sortable="true" visible="true" link="market" linkCode="name" ignore="true"/>
<section type="12" dbname="Код наименования секции" name="Наименование секции" shortname="Секция" searchable="true" sortable="true" visible="true" link="section" linkCode="name"/>
<sessionType type="12" dbname="Код типа клиринговой сессии" name="Тип клиринговой сессии" shortname="Тип КС" searchable="true" sortable="true" visible="true" link="sessionType" linkCode="name"/>
<taskStatus type="12" dbname="Код статуса" name="Наименование статуса" shortname="Статус" searchable="true" sortable="true" visible="true" link="taskStatus"/> <taskStatus type="12" dbname="Код статуса" name="Наименование статуса" shortname="Статус" searchable="true" sortable="true" visible="true" link="taskStatus"/>
<companyId type="1" dbname="Идентификатор компании" name="Наименование компании" shortname="Компания" searchable="false" sortable="false" visible="true" link="company" linkCode="shortName"/> <companyId type="1" dbname="Идентификатор компании" name="Наименование компании" shortname="Компания" searchable="false" sortable="false" visible="true" link="company" linkCode="shortName"/>
<securityId type="1" dbname="Идентификатор инструмента" name="Наименование инструмента" shortname="Инструмент" searchable="true" sortable="true" visible="true" link="security" linkCode="shortName"/> <securityId type="1" dbname="Идентификатор инструмента" name="Наименование инструмента" shortname="Инструмент" searchable="true" sortable="true" visible="true" link="security" linkCode="shortName"/>
@ -1190,6 +1204,8 @@
</session> </session>
<sTrades name="Сделки из Торговой системы" class="ru.clearing.classes.statics.data.misc.STrades" table="s_trades"> <sTrades name="Сделки из Торговой системы" class="ru.clearing.classes.statics.data.misc.STrades" table="s_trades">
<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/> <id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
<createdAt field="created" type="4" webtype="5" dbname="Дата-время создания записи" name="Время создания записи" shortname="Создано" searchable="true" sortable="true" ignore="true"/>
<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true" ignore="true"/>
<tradeNum type="1" name="Номер сделки" shortname="Номер сделки" searchable="true" sortable="true"/> <tradeNum type="1" name="Номер сделки" shortname="Номер сделки" searchable="true" sortable="true"/>
<operation type="2" length="40" name="Направленность сделки (BUY или SELL)" shortname="Направленность сделки" searchable="true" sortable="true"/> <operation type="2" length="40" name="Направленность сделки (BUY или SELL)" shortname="Направленность сделки" searchable="true" sortable="true"/>
<classCode type="2" length="255" name="Код класса инструментов" shortname="Код класса инструментов" searchable="true" sortable="true"/> <classCode type="2" length="255" name="Код класса инструментов" shortname="Код класса инструментов" searchable="true" sortable="true"/>

9
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/Market.java
View file

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

3
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/STrades.java
View file

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

218
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/registry/Registry.java
View file

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

54
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Planner.java
View file

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

86
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/PlannerAllToday.java
View file

@ -18,6 +18,8 @@ public class PlannerAllToday extends SpcexObjectBase {
private LocalTime taskTime; private LocalTime taskTime;
private LocalDate clearingDate; private LocalDate clearingDate;
private String market; private String market;
private String section;
private String sessionType;
private String taskStatus; private String taskStatus;
private Long companyId; private Long companyId;
private Long securityId; private Long securityId;
@ -28,64 +30,56 @@ public class PlannerAllToday extends SpcexObjectBase {
return task; return task;
} }
public void setTask(String value) { public void setTask(String task) {
this.task = value; this.task = task;
} }
public LocalTime getTaskTime() { public LocalTime getTaskTime() {
return taskTime; return taskTime;
} }
public void setTaskTime(LocalTime value) { public void setTaskTime(LocalTime taskTime) {
this.taskTime = value; this.taskTime = taskTime;
} }
public LocalDate getClearingDate() { public LocalDate getClearingDate() {
return clearingDate; return clearingDate;
} }
public void setClearingDate(LocalDate value) { public void setClearingDate(LocalDate clearingDate) {
this.clearingDate = value; this.clearingDate = clearingDate;
} }
public String getMarket() { public String getMarket() {
return market; return market;
} }
public void setMarket(String value) { public void setMarket(String market) {
this.market = value; 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() { public String getTaskStatus() {
return taskStatus; return taskStatus;
} }
public void setTaskStatus(String value) { public void setTaskStatus(String taskStatus) {
this.taskStatus = value; this.taskStatus = taskStatus;
}
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 Long getCompanyId() { public Long getCompanyId() {
@ -95,4 +89,28 @@ public class PlannerAllToday extends SpcexObjectBase {
public void setCompanyId(Long companyId) { public void setCompanyId(Long companyId) {
this.companyId = 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;
}
} }

39
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/PlannerTemplate.java
View file

@ -15,6 +15,9 @@ public class PlannerTemplate extends BusinessObject {
private String task; private String task;
private LocalTime taskTime; private LocalTime taskTime;
private String market;
private String section;
private String sessionType;
private String taskStatus; private String taskStatus;
private Long companyId; private Long companyId;
private Long securityId; private Long securityId;
@ -23,24 +26,48 @@ public class PlannerTemplate extends BusinessObject {
return task; return task;
} }
public void setTask(String value) { public void setTask(String task) {
this.task = value; this.task = task;
} }
public LocalTime getTaskTime() { public LocalTime getTaskTime() {
return taskTime; return taskTime;
} }
public void setTaskTime(LocalTime value) { public void setTaskTime(LocalTime taskTime) {
this.taskTime = value; 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() { public String getTaskStatus() {
return taskStatus; return taskStatus;
} }
public void setTaskStatus(String value) { public void setTaskStatus(String taskStatus) {
this.taskStatus = value; this.taskStatus = taskStatus;
} }
public Long getCompanyId() { public Long getCompanyId() {

44
clearing-parent/db-scripts/src/main/resources/db/DDL.sql
View file

@ -1416,10 +1416,10 @@ COMMENT ON COLUMN LISTING_HISTORY.CREATED_AT IS 'Дата-время созда
COMMENT ON COLUMN LISTING_HISTORY.UPDATED_AT IS 'Дата-время изменения записи'; COMMENT ON COLUMN LISTING_HISTORY.UPDATED_AT IS 'Дата-время изменения записи';
-- market - Торговые секции -- market - Рынки
DROP TABLE IF EXISTS 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); 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 'Описание'; COMMENT ON COLUMN MARKET.DESCRIPTION IS 'Описание';
@ -1442,7 +1442,7 @@ COMMENT ON COLUMN MARKET.CREATED_AT IS 'Дата-время создания з
COMMENT ON COLUMN MARKET.UPDATED_AT IS 'Дата-время изменения записи'; COMMENT ON COLUMN MARKET.UPDATED_AT IS 'Дата-время изменения записи';
-- History log of market - Торговые секции -- History log of market - Рынки
DROP TABLE IF EXISTS MARKET_HISTORY; 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); 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'; COMMENT ON TABLE MARKET_HISTORY IS 'История изменений таблицы market';
@ -1602,7 +1602,7 @@ COMMENT ON COLUMN TRADING_CLEARING_REGISTRY_HISTORY.UPDATED_AT IS 'Дата-вр
-- registry - Регистр активов, обязательств и требований УК -- registry - Регистр активов, обязательств и требований УК
DROP TABLE IF EXISTS 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 TABLE REGISTRY IS 'Регистр активов, обязательств и требований УК';
COMMENT ON COLUMN REGISTRY.COMPANY_ID IS 'Идентификатор участника (linked to company)'; 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_ID IS 'Идентификатор инструмента (linked to security)';
COMMENT ON COLUMN REGISTRY.SECURITY_SYMBOL IS 'Код инструмента';
COMMENT ON COLUMN REGISTRY.BALANCE IS 'Текущий баланс'; COMMENT ON COLUMN REGISTRY.BALANCE IS 'Текущий баланс';
COMMENT ON COLUMN REGISTRY.OPEN_BALANCE IS 'Начальная сумма после расчетной организации'; COMMENT ON COLUMN REGISTRY.OPEN_BALANCE IS 'Начальная сумма после расчетной организации';
@ -1700,7 +1702,7 @@ COMMENT ON COLUMN REGISTRY.UPDATED_AT IS 'Дата и время изменен
-- History log of registry - Регистр активов, обязательств и требований УК -- History log of registry - Регистр активов, обязательств и требований УК
DROP TABLE IF EXISTS REGISTRY_HISTORY; 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 TABLE REGISTRY_HISTORY IS 'История изменений таблицы registry';
COMMENT ON COLUMN REGISTRY_HISTORY.REGISTRY_ID IS 'Идентификатор записи в таблице REGISTRY'; COMMENT ON COLUMN REGISTRY_HISTORY.REGISTRY_ID IS 'Идентификатор записи в таблице REGISTRY';
COMMENT ON COLUMN REGISTRY_HISTORY.EVENT_TIME IS 'Дата и время изменения'; 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_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.BALANCE IS 'Текущий баланс';
COMMENT ON COLUMN REGISTRY_HISTORY.OPEN_BALANCE IS 'Начальная сумма после расчетной организации'; COMMENT ON COLUMN REGISTRY_HISTORY.OPEN_BALANCE IS 'Начальная сумма после расчетной организации';
@ -2071,13 +2075,19 @@ COMMENT ON COLUMN CLEARING_ACCOUNT_HISTORY.ID IS 'Идентификатор з
-- plannerTemplate - Шаблон расписания операционного дня -- plannerTemplate - Шаблон расписания операционного дня
DROP TABLE IF EXISTS PLANNER_TEMPLATE; 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 TABLE PLANNER_TEMPLATE IS 'Шаблон расписания операционного дня';
COMMENT ON COLUMN PLANNER_TEMPLATE.TASK IS 'Код задачи (linked to task)'; COMMENT ON COLUMN PLANNER_TEMPLATE.TASK IS 'Код задачи (linked to task)';
COMMENT ON COLUMN PLANNER_TEMPLATE.TASK_TIME IS 'Время задачи'; 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.TASK_STATUS IS 'Код статуса (linked to taskStatus)';
COMMENT ON COLUMN PLANNER_TEMPLATE.COMPANY_ID IS 'Идентификатор компании (linked to company)'; COMMENT ON COLUMN PLANNER_TEMPLATE.COMPANY_ID IS 'Идентификатор компании (linked to company)';
@ -2109,7 +2119,7 @@ COMMENT ON COLUMN CLEARING_CALENDAR.UPDATED_AT IS 'Дата-время изме
-- planner - Расписание -- planner - Расписание
DROP TABLE IF EXISTS 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 TABLE PLANNER IS 'Расписание';
COMMENT ON COLUMN PLANNER.TASK IS 'Код задачи (linked to task)'; 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.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)'; COMMENT ON COLUMN PLANNER.TASK_STATUS IS 'Код статуса (linked to taskStatus)';
@ -2134,7 +2148,7 @@ COMMENT ON COLUMN PLANNER.UPDATED_AT IS 'Дата-время изменения
-- plannerAllToday - Расписание на текущий день -- plannerAllToday - Расписание на текущий день
DROP TABLE IF EXISTS PLANNER_ALL_TODAY; 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 TABLE PLANNER_ALL_TODAY IS 'Расписание на текущий день';
COMMENT ON COLUMN PLANNER_ALL_TODAY.TASK IS 'Код задачи (linked to task)'; 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.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)'; 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 - Сделки из Торговой системы -- sTrades - Сделки из Торговой системы
DROP TABLE IF EXISTS S_TRADES; 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 TABLE S_TRADES IS 'Сделки из Торговой системы';
COMMENT ON COLUMN S_TRADES.ID 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.TRADE_NUM IS 'Номер сделки';
COMMENT ON COLUMN S_TRADES.OPERATION IS 'Направленность сделки (BUY или SELL)'; COMMENT ON COLUMN S_TRADES.OPERATION IS 'Направленность сделки (BUY или SELL)';

3
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/MarketHistoryMapStore.java
View file

@ -28,7 +28,7 @@ public class MarketHistoryMapStore extends TemplateEventMapStore<MarketHistory>
@Override @Override
public String[] getFields() { public String[] getFields() {
return new String[]{"ID", "EVENT_TIME", "EVENT_USER_ID", "EVENT_TYPE", 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.getCode(),
object.getSettlementCurrency(), object.getSettlementCurrency(),
object.getSection(), object.getSection(),
object.getMarketType()
}; };
return args; return args;
} }

13
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/RegistryHistoryMapStore.java
View file

@ -28,7 +28,7 @@ public class RegistryHistoryMapStore extends TemplateEventMapStore<RegistryHisto
@Override @Override
public String[] getFields() { public String[] getFields() {
return new String[]{"ID", "EVENT_TIME", "EVENT_USER_ID", "EVENT_TYPE", 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.getUserId(),
historyLog.getEventType(), historyLog.getEventType(),
object.getId(),
TimeUtil.toDateFromInstant(object.getCreated()),
TimeUtil.toDateFromInstant(object.getUpdated()),
object.getCompanyId(), object.getCompanyId(),
object.getTradingCode(), object.getTradingCode(),
object.getClearingCode(), object.getClearingCode(),
@ -58,6 +61,7 @@ public class RegistryHistoryMapStore extends TemplateEventMapStore<RegistryHisto
object.getTradingClearingRegistry(), object.getTradingClearingRegistry(),
object.getRegistryStatus(), object.getRegistryStatus(),
object.getSecurityId(), object.getSecurityId(),
object.getSecuritySymbol(),
object.getBalance(), object.getBalance(),
object.getOpenBalance(), object.getOpenBalance(),
object.getCloseBalance(), object.getCloseBalance(),
@ -82,11 +86,8 @@ public class RegistryHistoryMapStore extends TemplateEventMapStore<RegistryHisto
object.getParentId(), object.getParentId(),
object.getGroupId(), object.getGroupId(),
object.getSessionId(), object.getSessionId(),
object.getPaymentId(), object.getSessionType(),
object.getRefundPaymentId(), object.getPaymentId()
object.getId(),
TimeUtil.toDateFromInstant(object.getCreatedAt()),
TimeUtil.toDateFromInstant(object.getUpdatedAt())
}; };
return args; return args;
} }

15
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/MarketMapStore.java
View file

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

17
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/PlannerMapStore.java
View file

@ -9,6 +9,7 @@ import ru.spcex.platform.utils.time.TimeUtil;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.time.LocalTime;
@Component @Component
public class PlannerMapStore extends TemplateMapStore<Planner> { public class PlannerMapStore extends TemplateMapStore<Planner> {
@ -30,23 +31,25 @@ public class PlannerMapStore extends TemplateMapStore<Planner> {
@Override @Override
public String[] getFields() { public String[] getFields() {
return new String[]{ 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 @Override
public Planner objectReader(ResultSet resultSet) throws SQLException { public Planner objectReader(ResultSet resultSet) throws SQLException {
Planner object = new Planner(); 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.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.setClearingDate(getLocalDateFromSqlDate(resultSet, "CLEARING_DATE"));
object.setMarket(resultSet.getObject("MARKET", String.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.setTaskStatus(resultSet.getObject("TASK_STATUS", String.class));
object.setCompanyId(resultSet.getObject("COMPANY_ID", Long.class)); object.setCompanyId(resultSet.getObject("COMPANY_ID", Long.class));
object.setSecurityId(resultSet.getObject("SECURITY_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; return object;
} }
@ -57,9 +60,11 @@ public class PlannerMapStore extends TemplateMapStore<Planner> {
TimeUtil.toDateFromInstant(object.getCreated()), TimeUtil.toDateFromInstant(object.getCreated()),
TimeUtil.toDateFromInstant(object.getUpdated()), TimeUtil.toDateFromInstant(object.getUpdated()),
object.getTask(), object.getTask(),
TimeUtil.toDateFromLocalTime(object.getTaskTime()), object.getTaskTime(),
TimeUtil.toDateFromLocalDate(object.getClearingDate()), TimeUtil.toDateFromLocalDate(object.getClearingDate()),
object.getMarket(), object.getMarket(),
object.getSection(),
object.getSessionType(),
object.getTaskStatus(), object.getTaskStatus(),
object.getCompanyId(), object.getCompanyId(),
object.getSecurityId() object.getSecurityId()

27
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/PlannerTemplateMapStore.java
View file

@ -9,6 +9,7 @@ import ru.spcex.platform.utils.time.TimeUtil;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.time.LocalTime;
@Component @Component
public class PlannerTemplateMapStore extends TemplateMapStore<PlannerTemplate> { public class PlannerTemplateMapStore extends TemplateMapStore<PlannerTemplate> {
@ -30,35 +31,41 @@ public class PlannerTemplateMapStore extends TemplateMapStore<PlannerTemplate> {
@Override @Override
public String[] getFields() { public String[] getFields() {
return new String[]{ 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 @Override
public PlannerTemplate objectReader(ResultSet resultSet) throws SQLException { public PlannerTemplate objectReader(ResultSet resultSet) throws SQLException {
PlannerTemplate object = new PlannerTemplate(); 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.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.setTaskStatus(resultSet.getObject("TASK_STATUS", String.class));
object.setCompanyId(resultSet.getObject("COMPANY_ID", Long.class)); object.setCompanyId(resultSet.getObject("COMPANY_ID", Long.class));
object.setSecurityId(resultSet.getObject("SECURITY_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; return object;
} }
@Override @Override
public Object[] objectToField(PlannerTemplate object) { public Object[] objectToField(PlannerTemplate object) {
Object[] args = new Object[]{ Object[] args = new Object[]{
object.getId(),
TimeUtil.toDateFromInstant(object.getCreated()),
TimeUtil.toDateFromInstant(object.getUpdated()),
object.getTask(), object.getTask(),
TimeUtil.toDateFromLocalTime(object.getTaskTime()), object.getTaskTime(),
object.getMarket(),
object.getSection(),
object.getSessionType(),
object.getTaskStatus(), object.getTaskStatus(),
object.getCompanyId(), object.getCompanyId(),
object.getSecurityId() object.getSecurityId(),
object.getId(),
TimeUtil.toDateFromInstant(object.getCreated()),
TimeUtil.toDateFromInstant(object.getUpdated())
}; };
return args; return args;
} }

16
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/RegistryMapStore.java
View file

@ -32,7 +32,7 @@ public class RegistryMapStore extends TemplateMapStore<Registry> {
@Override @Override
public String[] getFields() { public String[] getFields() {
return new String[]{ 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.setTradingClearingRegistry(resultSet.getObject("TRADING_CLEARING_REGISTRY", String.class));
object.setRegistryStatus(resultSet.getObject("REGISTRY_STATUS", String.class)); object.setRegistryStatus(resultSet.getObject("REGISTRY_STATUS", String.class));
object.setSecurityId(resultSet.getObject("SECURITY_ID", Long.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.setBalance(resultSet.getObject("BALANCE", BigDecimal.class));
object.setOpenBalance(resultSet.getObject("OPEN_BALANCE", BigDecimal.class)); object.setOpenBalance(resultSet.getObject("OPEN_BALANCE", BigDecimal.class));
object.setCloseBalance(resultSet.getObject("CLOSE_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.setParentId(resultSet.getObject("PARENT_ID", Long.class));
object.setGroupId(resultSet.getObject("GROUP_ID", Long.class)); object.setGroupId(resultSet.getObject("GROUP_ID", Long.class));
object.setSessionId(resultSet.getObject("SESSION_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.setPaymentId(resultSet.getObject("PAYMENT_ID", Long.class));
object.setRefundPaymentId(resultSet.getObject("REFUND_PAYMENT_ID", Long.class));
object.setId(resultSet.getObject("ID", Long.class)); object.setId(resultSet.getObject("ID", Long.class));
object.setCreatedAt(getInstantFromTimestamp(resultSet, "CREATED_AT")); object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT"));
object.setUpdatedAt(getInstantFromTimestamp(resultSet, "UPDATED_AT")); object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT"));
return object; return object;
} }
@ -108,6 +109,7 @@ public class RegistryMapStore extends TemplateMapStore<Registry> {
object.getTradingClearingRegistry(), object.getTradingClearingRegistry(),
object.getRegistryStatus(), object.getRegistryStatus(),
object.getSecurityId(), object.getSecurityId(),
object.getSecuritySymbol(),
object.getBalance(), object.getBalance(),
object.getOpenBalance(), object.getOpenBalance(),
object.getCloseBalance(), object.getCloseBalance(),
@ -132,11 +134,11 @@ public class RegistryMapStore extends TemplateMapStore<Registry> {
object.getParentId(), object.getParentId(),
object.getGroupId(), object.getGroupId(),
object.getSessionId(), object.getSessionId(),
object.getSessionType(),
object.getPaymentId(), object.getPaymentId(),
object.getRefundPaymentId(),
object.getId(), object.getId(),
TimeUtil.toDateFromInstant(object.getCreatedAt()), TimeUtil.toDateFromInstant(object.getCreated()),
TimeUtil.toDateFromInstant(object.getUpdatedAt()) TimeUtil.toDateFromInstant(object.getUpdated())
}; };
return args; return args;
} }

12
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/PlannerAllTodayMapStore.java
View file

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

21
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/STradesMapStore.java
View file

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