IMDG, DDL убрали лишний MarketAccess
This commit is contained in:
AKurakin
parent
f2a9a26636
commit
a4957bbbc8
5 changed files with 25 additions and 169 deletions
|
|
@ -223,6 +223,7 @@
|
|||
<updatedAt type="4" name="Изменено" shortname="Изменено" searchable="true" sortable="true"/>
|
||||
<companyId type="1" name="Компания" shortname="Компания" searchable="true" sortable="true" visible="true" link="company"/>
|
||||
<identifier type="2" length="250" name="Внешний идентификатор" shortname="Идентификатор" searchable="true" sortable="true" visible="true"/>
|
||||
<name length="250" type="2" name="Наименование" shortname="Наименование" searchable="true" sortable="true" visible="true"/>
|
||||
</user>
|
||||
<userRoleSession name="Набор ролей" class="ccom.spicex.Static.User.UserRoleSession" table="UserRoleSession">
|
||||
<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true" visible="true"/>
|
||||
|
|
@ -243,13 +244,6 @@
|
|||
</put>
|
||||
</actions>
|
||||
</userSettings>
|
||||
<marketAccess name="Доступ к рынкам" class="com.spicex.Static.User.MarketAccess" table="MarketAccess">
|
||||
<id type="1" name="Идентификатор" shortname="ID" searchable="true" sortable="true" visible="true"/>
|
||||
<userId type="1" name="Пользователь" shortname="Пользователь" searchable="true" sortable="true" visible="true" link="user"/>
|
||||
<market type="1" name="Секция" shortname="Секция" searchable="true" sortable="true" visible="true" link="market"/>
|
||||
<status type="12" name="Статус" shortname="Статус" searchable="true" sortable="true" visible="true" link="workflowStatus"/>
|
||||
<companyId type="1" name="Компания" shortname="Компания" searchable="true" sortable="true" visible="true" link="company"/>
|
||||
</marketAccess>
|
||||
<userConnect name="Активность пользователей в системе" class="com.spicex.Static.User.UserConnect" logUpdates="true" table="UserConnect">
|
||||
<id type="1" name="Идентификатор" shortname="ID" searchable="true" sortable="true"/>
|
||||
<createdAt type="4" name="Создано" shortname="Создано" searchable="true" sortable="true"/>
|
||||
|
|
|
|||
|
|
@ -1,51 +0,0 @@
|
|||
package ru.clearing.classes.statics.data.user;
|
||||
|
||||
import ru.clearing.classes.ConstSerializable;
|
||||
import ru.spcex.platform.classes.base.SpcexObjectBase;
|
||||
|
||||
/**
|
||||
* Доступ к рынкам
|
||||
* <p>
|
||||
* DB table: MARKET_ACCESS
|
||||
**/
|
||||
public class MarketAccess extends SpcexObjectBase {
|
||||
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
|
||||
|
||||
private Long userId;
|
||||
private Long market;
|
||||
private String status;
|
||||
private Long companyId;
|
||||
|
||||
public Long getUserId() {
|
||||
return userId;
|
||||
}
|
||||
|
||||
public void setUserId(Long value) {
|
||||
this.userId = value;
|
||||
}
|
||||
|
||||
public Long getMarket() {
|
||||
return market;
|
||||
}
|
||||
|
||||
public void setMarket(Long value) {
|
||||
this.market = value;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String value) {
|
||||
this.status = value;
|
||||
}
|
||||
|
||||
public Long getCompanyId() {
|
||||
return companyId;
|
||||
}
|
||||
|
||||
public void setCompanyId(Long value) {
|
||||
this.companyId = value;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -484,20 +484,6 @@ COMMENT ON COLUMN USER_SETTINGS.VERSION IS 'Версия настроек пол
|
|||
|
||||
COMMENT ON COLUMN USER_SETTINGS.JSON IS 'Данные конфигурации';
|
||||
|
||||
-- marketAccess - Доступ к рынкам
|
||||
CREATE TABLE IF NOT EXISTS MARKET_ACCESS(ID bigint PRIMARY KEY, USER_ID bigint, MARKET bigint, STATUS char(4), COMPANY_ID bigint);
|
||||
COMMENT ON TABLE MARKET_ACCESS IS 'Доступ к рынкам';
|
||||
|
||||
COMMENT ON COLUMN MARKET_ACCESS.ID IS 'Идентификатор';
|
||||
|
||||
COMMENT ON COLUMN MARKET_ACCESS.USER_ID IS 'Пользователь (linked to user)';
|
||||
|
||||
COMMENT ON COLUMN MARKET_ACCESS.MARKET IS 'Секция (linked to market)';
|
||||
|
||||
COMMENT ON COLUMN MARKET_ACCESS.STATUS IS 'Статус (linked to workflowStatus)';
|
||||
|
||||
COMMENT ON COLUMN MARKET_ACCESS.COMPANY_ID IS 'Компания (linked to company)';
|
||||
|
||||
-- userConnect - Активность пользователей в системе
|
||||
CREATE TABLE IF NOT EXISTS USER_CONNECT(ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, USER_ID bigint, CONNECTION_TIME timestamp, DISCONNECTION_TIME timestamp, SERVER_I_P varchar(250), CLIENT_I_P varchar(250), CONNECTION_STATE char(4), CLEARING_DATE date, ERROR_CODE char(4), ERROR_TEXT char(4));
|
||||
COMMENT ON TABLE USER_CONNECT IS 'Активность пользователей в системе';
|
||||
|
|
|
|||
|
|
@ -424,38 +424,41 @@ COMMENT ON COLUMN IN_OUT_S_DF_TYPE_DICTIONARY.CODE IS '
|
|||
COMMENT ON COLUMN IN_OUT_S_DF_TYPE_DICTIONARY.NAME IS 'Òèï çàïèñè';
|
||||
|
||||
/* Business objects */
|
||||
|
||||
-- user - Ïîëüçîâàòåëü
|
||||
CREATE TABLE IF NOT EXISTS "USER"(ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, COMPANY_ID bigint, IDENTIFIER varchar(250));
|
||||
COMMENT ON TABLE "USER" IS 'Ïîëüçîâàòåëü';
|
||||
CREATE TABLE IF NOT EXISTS USER_CLR(ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, COMPANY_ID bigint, IDENTIFIER varchar(250), NAME varchar(250));
|
||||
COMMENT ON TABLE USER_CLR IS 'Ïîëüçîâàòåëü';
|
||||
|
||||
COMMENT ON COLUMN "USER".ID IS 'Èäåíòèôèêàòîð';
|
||||
COMMENT ON COLUMN USER_CLR.ID IS 'Èäåíòèôèêàòîð';
|
||||
|
||||
COMMENT ON COLUMN "USER".CREATED_AT IS 'Ñîçäàíî';
|
||||
COMMENT ON COLUMN USER_CLR.CREATED_AT IS 'Ñîçäàíî';
|
||||
|
||||
COMMENT ON COLUMN "USER".UPDATED_AT IS 'Èçìåíåíî';
|
||||
COMMENT ON COLUMN USER_CLR.UPDATED_AT IS 'Èçìåíåíî';
|
||||
|
||||
COMMENT ON COLUMN "USER".COMPANY_ID IS 'Êîìïàíèÿ (linked to company)';
|
||||
COMMENT ON COLUMN USER_CLR.COMPANY_ID IS 'Êîìïàíèÿ (linked to company)';
|
||||
|
||||
COMMENT ON COLUMN "USER".IDENTIFIER IS 'Âíåøíèé èäåíòèôèêàòîð';
|
||||
COMMENT ON COLUMN USER_CLR.IDENTIFIER IS 'Âíåøíèé èäåíòèôèêàòîð';
|
||||
|
||||
COMMENT ON COLUMN USER_CLR.NAME IS 'Íàèìåíîâàíèå';
|
||||
|
||||
|
||||
-- History log of user - Ïîëüçîâàòåëü
|
||||
CREATE TABLE IF NOT EXISTS USER_HISTORY(USER_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, COMPANY_ID bigint, IDENTIFIER varchar(250));
|
||||
COMMENT ON TABLE USER_HISTORY IS 'Èñòîðèÿ èçìåíåíèé òàáëèöû user';
|
||||
COMMENT ON COLUMN USER_HISTORY.USER_ID IS 'Èäåíòèôèêàòîð çàïèñè â òàáëèöå USER';
|
||||
COMMENT ON COLUMN USER_HISTORY.EVENT_TIME IS 'Äàòà è âðåìÿ èçìåíåíèÿ';
|
||||
COMMENT ON COLUMN USER_HISTORY.EVENT_USER_ID IS 'Èíèöèàòîð èçìåíåíèÿ';
|
||||
CREATE TABLE IF NOT EXISTS USER_CLR_HISTORY(USER_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, COMPANY_ID bigint, IDENTIFIER varchar(250), NAME varchar(250));
|
||||
COMMENT ON TABLE USER_CLR_HISTORY IS 'Èñòîðèÿ èçìåíåíèé òàáëèöû user';
|
||||
COMMENT ON COLUMN USER_CLR_HISTORY.USER_ID IS 'Èäåíòèôèêàòîð çàïèñè â òàáëèöå USER';
|
||||
COMMENT ON COLUMN USER_CLR_HISTORY.EVENT_TIME IS 'Äàòà è âðåìÿ èçìåíåíèÿ';
|
||||
COMMENT ON COLUMN USER_CLR_HISTORY.EVENT_USER_ID IS 'Èíèöèàòîð èçìåíåíèÿ';
|
||||
|
||||
COMMENT ON COLUMN USER_HISTORY.ID IS 'Èäåíòèôèêàòîð';
|
||||
COMMENT ON COLUMN USER_CLR_HISTORY.ID IS 'Èäåíòèôèêàòîð';
|
||||
|
||||
COMMENT ON COLUMN USER_HISTORY.CREATED_AT IS 'Ñîçäàíî';
|
||||
COMMENT ON COLUMN USER_CLR_HISTORY.CREATED_AT IS 'Ñîçäàíî';
|
||||
|
||||
COMMENT ON COLUMN USER_HISTORY.UPDATED_AT IS 'Èçìåíåíî';
|
||||
COMMENT ON COLUMN USER_CLR_HISTORY.UPDATED_AT IS 'Èçìåíåíî';
|
||||
|
||||
COMMENT ON COLUMN USER_HISTORY.COMPANY_ID IS 'Êîìïàíèÿ (linked to company)';
|
||||
COMMENT ON COLUMN USER_CLR_HISTORY.COMPANY_ID IS 'Êîìïàíèÿ (linked to company)';
|
||||
|
||||
COMMENT ON COLUMN USER_HISTORY.IDENTIFIER IS 'Âíåøíèé èäåíòèôèêàòîð';
|
||||
COMMENT ON COLUMN USER_CLR_HISTORY.IDENTIFIER IS 'Âíåøíèé èäåíòèôèêàòîð';
|
||||
|
||||
COMMENT ON COLUMN USER_CLR_HISTORY.NAME IS 'Íàèìåíîâàíèå';
|
||||
|
||||
-- userRoleSession - Íàáîð ðîëåé
|
||||
CREATE TABLE IF NOT EXISTS USER_ROLE_SESSION(ID bigint PRIMARY KEY, USER_ID bigint, USER_ROLE char(4), COMPANY_ID bigint);
|
||||
|
|
@ -481,20 +484,6 @@ COMMENT ON COLUMN USER_SETTINGS.VERSION IS '
|
|||
|
||||
COMMENT ON COLUMN USER_SETTINGS.JSON IS 'Äàííûå êîíôèãóðàöèè';
|
||||
|
||||
-- marketAccess - Äîñòóï ê ðûíêàì
|
||||
CREATE TABLE IF NOT EXISTS MARKET_ACCESS(ID bigint PRIMARY KEY, USER_ID bigint, MARKET bigint, STATUS char(4), COMPANY_ID bigint);
|
||||
COMMENT ON TABLE MARKET_ACCESS IS 'Äîñòóï ê ðûíêàì';
|
||||
|
||||
COMMENT ON COLUMN MARKET_ACCESS.ID IS 'Èäåíòèôèêàòîð';
|
||||
|
||||
COMMENT ON COLUMN MARKET_ACCESS.USER_ID IS 'Ïîëüçîâàòåëü (linked to user)';
|
||||
|
||||
COMMENT ON COLUMN MARKET_ACCESS.MARKET IS 'Ñåêöèÿ (linked to market)';
|
||||
|
||||
COMMENT ON COLUMN MARKET_ACCESS.STATUS IS 'Ñòàòóñ (linked to workflowStatus)';
|
||||
|
||||
COMMENT ON COLUMN MARKET_ACCESS.COMPANY_ID IS 'Êîìïàíèÿ (linked to company)';
|
||||
|
||||
-- userConnect - Àêòèâíîñòü ïîëüçîâàòåëåé â ñèñòåìå
|
||||
CREATE TABLE IF NOT EXISTS USER_CONNECT(ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, USER_ID bigint, CONNECTION_TIME timestamp, DISCONNECTION_TIME timestamp, SERVER_I_P varchar(250), CLIENT_I_P varchar(250), CONNECTION_STATE char(4), CLEARING_DATE date, ERROR_CODE char(4), ERROR_TEXT char(4));
|
||||
COMMENT ON TABLE USER_CONNECT IS 'Àêòèâíîñòü ïîëüçîâàòåëåé â ñèñòåìå';
|
||||
|
|
@ -632,14 +621,14 @@ COMMENT ON COLUMN SCHEDULER_ALL_TODAY.SOURCE IS '
|
|||
COMMENT ON COLUMN SCHEDULER_ALL_TODAY.ORIG_ID IS 'Èäåíòèôèêàòîð èñòî÷íèêà';
|
||||
|
||||
-- taskRunner - Çàïóñê çàäà÷è
|
||||
CREATE TABLE IF NOT EXISTS TASK_RUNNER(ID bigint PRIMARY KEY, CREATED timestamp, UPDATED timestamp, SENDER_ID bigint, TASK char(4));
|
||||
CREATE TABLE IF NOT EXISTS TASK_RUNNER(ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, SENDER_ID bigint, TASK char(4));
|
||||
COMMENT ON TABLE TASK_RUNNER IS 'Çàïóñê çàäà÷è';
|
||||
|
||||
COMMENT ON COLUMN TASK_RUNNER.ID IS 'Èäåíòèôèêàòîð';
|
||||
|
||||
COMMENT ON COLUMN TASK_RUNNER.CREATED IS 'Ñîçäàíî';
|
||||
COMMENT ON COLUMN TASK_RUNNER.CREATED_AT IS 'Ñîçäàíî';
|
||||
|
||||
COMMENT ON COLUMN TASK_RUNNER.UPDATED IS 'Èçìåíåíî';
|
||||
COMMENT ON COLUMN TASK_RUNNER.UPDATED_AT IS 'Èçìåíåíî';
|
||||
|
||||
COMMENT ON COLUMN TASK_RUNNER.SENDER_ID IS 'Îòïðàâèòåëü (linked to user)';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,62 +0,0 @@
|
|||
package ru.spcex.clearing.imdg.object;
|
||||
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
import org.springframework.stereotype.Component;
|
||||
import ru.clearing.classes.statics.data.user.MarketAccess;
|
||||
import ru.spcex.clearing.imdg.IMDGDistributedNames;
|
||||
import ru.spcex.clearing.imdg.base.TemplateMapStore;
|
||||
import ru.spcex.clearing.imdg.utils.DbUtilsHelper;
|
||||
import ru.spcex.clearing.imdg.utils.TimeUtil;
|
||||
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.util.*;
|
||||
|
||||
@Component
|
||||
public class MarketAccessMapStore extends TemplateMapStore<MarketAccess> {
|
||||
|
||||
public MarketAccessMapStore(JdbcTemplate jdbcTemplate) {
|
||||
super(jdbcTemplate);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMapName() {
|
||||
return IMDGDistributedNames.Map_MarketAccess;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTableName() {
|
||||
return "MARKET_ACCESS";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String[] getFields() {
|
||||
return new String[]{
|
||||
"ID", "USER_ID", "MARKET", "STATUS", "COMPANY_ID"
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
public MarketAccess objectReader(ResultSet resultSet) throws SQLException {
|
||||
MarketAccess object = new MarketAccess();
|
||||
object.setId(resultSet.getObject("ID", Long.class));
|
||||
object.setUserId(resultSet.getObject("USER_ID", Long.class));
|
||||
object.setMarket(resultSet.getObject("MARKET", Long.class));
|
||||
object.setStatus(resultSet.getObject("STATUS", String.class));
|
||||
object.setCompanyId(resultSet.getObject("COMPANY_ID", Long.class));
|
||||
return object;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object[] objectToField(MarketAccess object) {
|
||||
Object[] args = new Object[]{
|
||||
object.getId(),
|
||||
object.getUserId(),
|
||||
object.getMarket(),
|
||||
object.getStatus(),
|
||||
object.getCompanyId()
|
||||
};
|
||||
return args;
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue