- * 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;
- }
-
-}
diff --git a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql
index b378940d8..ef29f19b0 100644
--- a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql
+++ b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql
@@ -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 'Активность пользователей в системе';
diff --git a/clearing-parent/db-scripts/src/main/resources/db/DDL_first.sql b/clearing-parent/db-scripts/src/main/resources/db/DDL_first.sql
index 08b3b562a..bf08896d7 100644
--- a/clearing-parent/db-scripts/src/main/resources/db/DDL_first.sql
+++ b/clearing-parent/db-scripts/src/main/resources/db/DDL_first.sql
@@ -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)';
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/MarketAccessMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/MarketAccessMapStore.java
deleted file mode 100644
index 9d3e7c88a..000000000
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/MarketAccessMapStore.java
+++ /dev/null
@@ -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