diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/UserAutoCreateService.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/UserAutoCreateService.java index fa8ad673b..a4816b31b 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/UserAutoCreateService.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/UserAutoCreateService.java @@ -4,7 +4,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import ru.clearing.classes.statics.data.user.ClearingUser; +import ru.clearing.classes.statics.data.user.User; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; @@ -17,11 +17,11 @@ import java.util.Map; public class UserAutoCreateService { private final Logger log = LoggerFactory.getLogger(getClass()); - private final Imdg userMap; + private final Imdg userMap; @Autowired public UserAutoCreateService(ImdgProvider imdgProvider) { - this.userMap = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingUser, ClearingUser.class); + this.userMap = imdgProvider.getImdg(IMDGDistributedNames.Map_User, User.class); } /** @@ -30,10 +30,11 @@ public class UserAutoCreateService { public void createUserIfNeeded(String userName) { userMap.lockAndPerform(() -> { try { - ClearingUser username = userMap.getSingleObjectByFieldValues(Map.of("username", userName)); + User username = userMap.getSingleObjectByFieldValues(Map.of("name", userName)); if (username == null) { - username = new ClearingUser(); - username.setUsername(userName); + username = new User(); + username.setId(userMap.nextIDSequenceFor()); + username.setName(userName); username.setCreated(Instant.now()); userMap.insert(username); } diff --git a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf02Service.java b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf02Service.java index 3a9b1b2e5..1b873fde7 100644 --- a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf02Service.java +++ b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf02Service.java @@ -50,7 +50,7 @@ public class Sdf02Service extends QueueConsumer implements InitializingBean { sDf02.setSumunblock(req.getSumunblock()); sDf02.setFile_type(req.getFile_type()); sDf02.setResult(req.getResult()); - sDf02.setFileName(req.getFileName()); +// sDf02.setFileName(req.getFileName()); sDf02.setGenerationTime(req.getGenerationTime()); sDf02.setGenerationId(req.getGenerationId()); sdf8Map.insert(sDf02); diff --git a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf08Service.java b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf08Service.java index 52e56b56a..b7b2143c4 100644 --- a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf08Service.java +++ b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf08Service.java @@ -39,7 +39,6 @@ public class Sdf08Service extends QueueConsumer implements InitializingBean { SDf08 sDf08 = new SDf08(); sDf08.setNumber(req.getNumber()); sDf08.setDatetime(req.getDatetime()); - sDf08.setFileName(req.getFileName()); sDf08.setGenerationTime(req.getGenerationTime()); sDf08.setGenerationId(req.getGenerationId()); sdf8Map.insert(sDf08); diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/journal/InDocumentJournal.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/journal/InDocumentJournal.java new file mode 100644 index 000000000..cb797dcdf --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/journal/InDocumentJournal.java @@ -0,0 +1,135 @@ +package ru.clearing.classes.statics.data.journal; + +import ru.clearing.classes.ConstSerializable; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +import java.math.BigDecimal; +import java.time.Instant; + +/** + * Журнал входящих документов + *

+ * DB table: IN_DOCUMENT_JOURNAL + **/ +public class InDocumentJournal extends SpcexObjectBase { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private Instant registrationDate; + private Instant registrationTime; + private Long registrationNumber; + private String documentName; + private Long senderId; + private Long quantity; + private String clearingCode; + private String courierType; + private Instant emailDate; + private BigDecimal amount; + private Long dossierNumber; + private String comment; + private Instant receiptDate; + + public Instant getRegistrationDate() { + return registrationDate; + } + + public void setRegistrationDate(Instant value) { + this.registrationDate = value; + } + + public Instant getRegistrationTime() { + return registrationTime; + } + + public void setRegistrationTime(Instant value) { + this.registrationTime = value; + } + + public Long getRegistrationNumber() { + return registrationNumber; + } + + public void setRegistrationNumber(Long value) { + this.registrationNumber = value; + } + + public String getDocumentName() { + return documentName; + } + + public void setDocumentName(String value) { + this.documentName = value; + } + + public Long getSenderId() { + return senderId; + } + + public void setSenderId(Long value) { + this.senderId = value; + } + + public Long getQuantity() { + return quantity; + } + + public void setQuantity(Long value) { + this.quantity = value; + } + + public String getClearingCode() { + return clearingCode; + } + + public void setClearingCode(String value) { + this.clearingCode = value; + } + + public String getCourierType() { + return courierType; + } + + public void setCourierType(String value) { + this.courierType = value; + } + + public Instant getEmailDate() { + return emailDate; + } + + public void setEmailDate(Instant value) { + this.emailDate = value; + } + + public BigDecimal getAmount() { + return amount; + } + + public void setAmount(BigDecimal value) { + this.amount = value; + } + + public Long getDossierNumber() { + return dossierNumber; + } + + public void setDossierNumber(Long value) { + this.dossierNumber = value; + } + + public String getComment() { + return comment; + } + + public void setComment(String value) { + this.comment = value; + } + + public Instant getReceiptDate() { + return receiptDate; + } + + public void setReceiptDate(Instant value) { + this.receiptDate = value; + } + +} \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/journal/OutDocumentJournal.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/journal/OutDocumentJournal.java new file mode 100644 index 000000000..711dce5e9 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/journal/OutDocumentJournal.java @@ -0,0 +1,126 @@ +package ru.clearing.classes.statics.data.journal; + +import ru.clearing.classes.ConstSerializable; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +import java.math.BigDecimal; +import java.time.Instant; + +/** + * Журнал исходящих документов + *

+ * DB table: OUT_DOCUMENT_JOURNAL + **/ +public class OutDocumentJournal extends SpcexObjectBase { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private Instant registrationDate; + private Instant registrationTime; + private Long registrationNumber; + private String documentName; + private Long addresseeId; + private Long quantity; + private String clearingCode; + private String courierType; + private Instant emailDate; + private BigDecimal amount; + private Long dossierNumber; + private Instant postDate; + + public Instant getRegistrationDate() { + return registrationDate; + } + + public void setRegistrationDate(Instant value) { + this.registrationDate = value; + } + + public Instant getRegistrationTime() { + return registrationTime; + } + + public void setRegistrationTime(Instant value) { + this.registrationTime = value; + } + + public Long getRegistrationNumber() { + return registrationNumber; + } + + public void setRegistrationNumber(Long value) { + this.registrationNumber = value; + } + + public String getDocumentName() { + return documentName; + } + + public void setDocumentName(String value) { + this.documentName = value; + } + + public Long getAddresseeId() { + return addresseeId; + } + + public void setAddresseeId(Long value) { + this.addresseeId = value; + } + + public Long getQuantity() { + return quantity; + } + + public void setQuantity(Long value) { + this.quantity = value; + } + + public String getClearingCode() { + return clearingCode; + } + + public void setClearingCode(String value) { + this.clearingCode = value; + } + + public String getCourierType() { + return courierType; + } + + public void setCourierType(String value) { + this.courierType = value; + } + + public Instant getEmailDate() { + return emailDate; + } + + public void setEmailDate(Instant value) { + this.emailDate = value; + } + + public BigDecimal getAmount() { + return amount; + } + + public void setAmount(BigDecimal value) { + this.amount = value; + } + + public Long getDossierNumber() { + return dossierNumber; + } + + public void setDossierNumber(Long value) { + this.dossierNumber = value; + } + + public Instant getPostDate() { + return postDate; + } + + public void setPostDate(Instant value) { + this.postDate = value; + } + +} \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Scheduler.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Scheduler.java new file mode 100644 index 000000000..a3d6c1d16 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Scheduler.java @@ -0,0 +1,73 @@ +package ru.clearing.classes.statics.data.scheduler; + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessObject; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +import java.time.Instant; + +/** + * Расписание планировщика + *

+ * DB table: SCHEDULER + **/ +public class Scheduler extends BusinessObject { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private String task; + private Instant taskTime; + private Instant clearingDate; + private String market; + private String taskStatus; + private Long securityId; + + + public String getTask() { + return task; + } + + public void setTask(String value) { + this.task = value; + } + + public Instant getTaskTime() { + return taskTime; + } + + public void setTaskTime(Instant value) { + this.taskTime = value; + } + + public Instant getClearingDate() { + return clearingDate; + } + + public void setClearingDate(Instant value) { + this.clearingDate = value; + } + + public String getMarket() { + return market; + } + + public void setMarket(String value) { + this.market = value; + } + + public String getTaskStatus() { + return taskStatus; + } + + public void setTaskStatus(String value) { + this.taskStatus = value; + } + + public Long getSecurityId() { + return securityId; + } + + public void setSecurityId(Long value) { + this.securityId = value; + } + +} diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/SchedulerAllToday.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/SchedulerAllToday.java new file mode 100644 index 000000000..71d15c3e6 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/SchedulerAllToday.java @@ -0,0 +1,89 @@ +package ru.clearing.classes.statics.data.scheduler; + +import ru.clearing.classes.ConstSerializable; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +import java.time.Instant; + +/** + * Расписание на текущий день + *

+ * DB table: SCHEDULER_ALL_TODAY + **/ +public class SchedulerAllToday extends SpcexObjectBase { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private String task; + private Instant taskTime; + private Instant clearingDate; + private String market; + private String taskStatus; + private Long securityId; + private String source; + private Long origId; + + public String getTask() { + return task; + } + + public void setTask(String value) { + this.task = value; + } + + public Instant getTaskTime() { + return taskTime; + } + + public void setTaskTime(Instant value) { + this.taskTime = value; + } + + public Instant getClearingDate() { + return clearingDate; + } + + public void setClearingDate(Instant value) { + this.clearingDate = value; + } + + public String getMarket() { + return market; + } + + public void setMarket(String value) { + this.market = value; + } + + public String getTaskStatus() { + return taskStatus; + } + + public void setTaskStatus(String value) { + this.taskStatus = value; + } + + public Long getSecurityId() { + return securityId; + } + + public void setSecurityId(Long value) { + this.securityId = value; + } + + public String getSource() { + return source; + } + + public void setSource(String value) { + this.source = value; + } + + public Long getOrigId() { + return origId; + } + + public void setOrigId(Long value) { + this.origId = value; + } + +} \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/TaskRunner.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/TaskRunner.java new file mode 100644 index 000000000..50c571b23 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/TaskRunner.java @@ -0,0 +1,36 @@ +package ru.clearing.classes.statics.data.scheduler; + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessObject; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +import java.time.Instant; + +/** + * Запуск задачи + *

+ * DB table: TASK_RUNNER + **/ +public class TaskRunner extends BusinessObject { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private Long senderId; + private String task; + + public Long getSenderId() { + return senderId; + } + + public void setSenderId(Long value) { + this.senderId = value; + } + + public String getTask() { + return task; + } + + public void setTask(String value) { + this.task = value; + } + +} \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Timetable.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Timetable.java new file mode 100644 index 000000000..6ea30abba --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Timetable.java @@ -0,0 +1,44 @@ +package ru.clearing.classes.statics.data.scheduler; + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessObject; + +import java.time.Instant; + +/** + * Постоянное расписание операционного дня + *

+ * DB table: TIMETABLE + **/ +public class Timetable extends BusinessObject { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private String task; + private Instant taskTime; + private String taskStatus; + + public String getTask() { + return task; + } + + public void setTask(String value) { + this.task = value; + } + + public Instant getTaskTime() { + return taskTime; + } + + public void setTaskTime(Instant value) { + this.taskTime = value; + } + + public String getTaskStatus() { + return taskStatus; + } + + public void setTaskStatus(String value) { + this.taskStatus = value; + } + +} \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/TradingCalendar.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/TradingCalendar.java new file mode 100644 index 000000000..5c9dfd401 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/TradingCalendar.java @@ -0,0 +1,44 @@ +package ru.clearing.classes.statics.data.scheduler; + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessObject; + +import java.time.Instant; + +/** + * Торговые и неторговые дни + *

+ * DB table: TRADING_CALENDAR + **/ +public class TradingCalendar extends BusinessObject { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private Instant clearingDate; + private Long companyId; + private String tradingStatus; + + public Instant getClearingDate() { + return clearingDate; + } + + public void setClearingDate(Instant value) { + this.clearingDate = value; + } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long value) { + this.companyId = value; + } + + public String getTradingStatus() { + return tradingStatus; + } + + public void setTradingStatus(String value) { + this.tradingStatus = value; + } + +} \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf02.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf02.java index 6a4030761..587fc6002 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf02.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf02.java @@ -26,9 +26,9 @@ public class SDf02 extends SpcexObjectBase { private String sumunblock; private String file_type; private String result; - private String fileName; private Instant generationTime; private Long generationId; + private Long inSDf01Id; public String getCurr_code() { return curr_code; @@ -134,14 +134,6 @@ public class SDf02 extends SpcexObjectBase { this.result = value; } - public String getFileName() { - return fileName; - } - - public void setFileName(String value) { - this.fileName = value; - } - public Instant getGenerationTime() { return generationTime; } @@ -158,4 +150,12 @@ public class SDf02 extends SpcexObjectBase { this.generationId = value; } -} + public Long getInSDf01Id() { + return inSDf01Id; + } + + public void setInSDf01Id(Long value) { + this.inSDf01Id = value; + } + +} \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf08.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf08.java index 5e207e210..862fcb57b 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf08.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf08.java @@ -16,7 +16,6 @@ public class SDf08 extends SpcexObjectBase { private BigDecimal number; private Instant datetime; - private String fileName; private Instant generationTime; private Long generationId; @@ -36,14 +35,6 @@ public class SDf08 extends SpcexObjectBase { this.datetime = value; } - public String getFileName() { - return fileName; - } - - public void setFileName(String value) { - this.fileName = value; - } - public Instant getGenerationTime() { return generationTime; } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf12.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf12.java new file mode 100644 index 000000000..42f1a00f6 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf12.java @@ -0,0 +1,72 @@ +package ru.clearing.classes.statics.data.sdf; + +import ru.clearing.classes.ConstSerializable; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +import java.math.BigDecimal; +import java.time.Instant; + +/** + * ДФ-12 Из ПРЦ в КС Информация о блокировке/разблокировке/закрытии ТБС УК + *

+ * DB table: S_DF12 + **/ +public class SDf12 extends SpcexObjectBase { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private String account; + private String deal; + private BigDecimal status; + private String fileName; + private Instant generationTime; + private Long generationId; + + public String getAccount() { + return account; + } + + public void setAccount(String value) { + this.account = value; + } + + public String getDeal() { + return deal; + } + + public void setDeal(String value) { + this.deal = value; + } + + public BigDecimal getStatus() { + return status; + } + + public void setStatus(BigDecimal value) { + this.status = value; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String value) { + this.fileName = value; + } + + public Instant getGenerationTime() { + return generationTime; + } + + public void setGenerationTime(Instant value) { + this.generationTime = value; + } + + public Long getGenerationId() { + return generationId; + } + + public void setGenerationId(Long value) { + this.generationId = value; + } + +} \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf18.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf18.java new file mode 100644 index 000000000..3bd48ccdf --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf18.java @@ -0,0 +1,81 @@ +package ru.clearing.classes.statics.data.sdf; + +import ru.clearing.classes.ConstSerializable; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +import java.math.BigDecimal; +import java.time.Instant; + +/** + * ДФ-18 Из КС в ПРЦ Квитанция о получении информации о состоянии счета (блокировка/разблокировка/закрытие) + *

+ * DB table: S_DF18 + **/ +public class SDf18 extends SpcexObjectBase { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private String account; + private String deal; + private BigDecimal status; + private BigDecimal result; + private Instant generationTime; + private Long generationId; + private Long inSDf12Id; + + public String getAccount() { + return account; + } + + public void setAccount(String value) { + this.account = value; + } + + public String getDeal() { + return deal; + } + + public void setDeal(String value) { + this.deal = value; + } + + public BigDecimal getStatus() { + return status; + } + + public void setStatus(BigDecimal value) { + this.status = value; + } + + public BigDecimal getResult() { + return result; + } + + public void setResult(BigDecimal value) { + this.result = value; + } + + public Instant getGenerationTime() { + return generationTime; + } + + public void setGenerationTime(Instant value) { + this.generationTime = value; + } + + public Long getGenerationId() { + return generationId; + } + + public void setGenerationId(Long value) { + this.generationId = value; + } + + public Long getInSDf12Id() { + return inSDf12Id; + } + + public void setInSDf12Id(Long value) { + this.inSDf12Id = value; + } + +} \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/statement/Statement.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/statement/Statement.java index af0f96e1e..92a9019cf 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/statement/Statement.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/statement/Statement.java @@ -30,6 +30,7 @@ public class Statement extends BusinessObject { private String errorText; private Long inSDfId; private Long outSDfId; + private String inOutSDfType; public Long getAddresseeId() { return addresseeId; @@ -159,4 +160,12 @@ public class Statement extends BusinessObject { this.outSDfId = value; } + public String getInOutSDfType() { + return inOutSDfType; + } + + public void setInOutSDfType(String value) { + this.inOutSDfType = value; + } + } \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/ClearingUser.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/ClearingUser.java deleted file mode 100644 index 2f751c07b..000000000 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/ClearingUser.java +++ /dev/null @@ -1,36 +0,0 @@ -package ru.clearing.classes.statics.data.user; - - -import ru.clearing.classes.ConstSerializable; -import ru.clearing.classes.objects.BusinessObject; - -/** - * Database table: USER_CLEARING todo name for user ? - */ -public class ClearingUser extends BusinessObject { - private static final long serialVersionUID = ConstSerializable.serialVersionUID; - private String username; - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - -// private String idpUuid; -// -// public ClearingUser() { -// super(); -// } -// -// public String toString() { -// return String.format("%s{id=%d, idpUuid='%s'}", getClass().getSimpleName(), getId(), getIdpUuid()); -// } -// -// public String getIdpUuid() { -// return idpUuid; -// } - -} \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/MarketAccess.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/MarketAccess.java new file mode 100644 index 000000000..5528e8186 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/MarketAccess.java @@ -0,0 +1,51 @@ +package ru.clearing.classes.statics.data.user; + +import ru.clearing.classes.ConstSerializable; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +/** + * Доступ к рынкам + *

+ * 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/classes/src/main/java/ru/clearing/classes/statics/data/user/User.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/User.java new file mode 100644 index 000000000..27a9de294 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/User.java @@ -0,0 +1,43 @@ +package ru.clearing.classes.statics.data.user; + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessObject; + +/** + * Пользователь + * UserCls + *

+ * DB table: USER_CLR + **/ +public class User extends BusinessObject { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private Long companyId; + private String identifier; + private String name; + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long value) { + this.companyId = value; + } + + public String getIdentifier() { + return identifier; + } + + public void setIdentifier(String value) { + this.identifier = value; + } + + public String getName() { + return name; + } + + public void setName(String value) { + this.name = value; + } + +} \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/UserConnect.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/UserConnect.java new file mode 100644 index 000000000..15b140f1b --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/UserConnect.java @@ -0,0 +1,99 @@ +package ru.clearing.classes.statics.data.user; + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessObject; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +import java.time.Instant; + +/** + * Активность пользователей в системе + *

+ * DB table: USER_CONNECT + **/ +public class UserConnect extends BusinessObject { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private Long userId; + private Instant connectionTime; + private Instant disconnectionTime; + private String serverIP; + private String clientIP; + private String connectionState; + private Instant clearingDate; + private String errorCode; + private String errorText; + + public Long getUserId() { + return userId; + } + + public void setUserId(Long value) { + this.userId = value; + } + + public Instant getConnectionTime() { + return connectionTime; + } + + public void setConnectionTime(Instant value) { + this.connectionTime = value; + } + + public Instant getDisconnectionTime() { + return disconnectionTime; + } + + public void setDisconnectionTime(Instant value) { + this.disconnectionTime = value; + } + + public String getServerIP() { + return serverIP; + } + + public void setServerIP(String value) { + this.serverIP = value; + } + + public String getClientIP() { + return clientIP; + } + + public void setClientIP(String value) { + this.clientIP = value; + } + + public String getConnectionState() { + return connectionState; + } + + public void setConnectionState(String value) { + this.connectionState = value; + } + + public Instant getClearingDate() { + return clearingDate; + } + + public void setClearingDate(Instant value) { + this.clearingDate = value; + } + + public String getErrorCode() { + return errorCode; + } + + public void setErrorCode(String value) { + this.errorCode = value; + } + + public String getErrorText() { + return errorText; + } + + public void setErrorText(String value) { + this.errorText = value; + } + +} \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/UserConnectHistory.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/UserConnectHistory.java new file mode 100644 index 000000000..b8d32cb58 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/UserConnectHistory.java @@ -0,0 +1,26 @@ +package ru.clearing.classes.statics.data.user; + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessEvent; +import java.io.Serial; +/** + * Изменение состояния объекта Активность пользователей в системе + * + * DB table: USER_CONNECT_HISTORY + **/ +public class UserConnectHistory extends BusinessEvent { + @Serial + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private UserConnect object; + + @Override + public UserConnect getObject() { + return object; + } + + @Override + public void setObject(UserConnect object) { + this.object = object; + } +} \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/UserHistory.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/UserHistory.java new file mode 100644 index 000000000..5c8872b62 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/UserHistory.java @@ -0,0 +1,28 @@ +package ru.clearing.classes.statics.data.user; + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessEvent; + +import java.io.Serial; + +/** + * Изменение состояния объекта Пользователь + *

+ * DB table: USER_CLR_HISTORY + **/ +public class UserHistory extends BusinessEvent { + @Serial + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private User object; + + @Override + public User getObject() { + return object; + } + + @Override + public void setObject(User object) { + this.object = object; + } +} \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/UserRoleSession.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/UserRoleSession.java new file mode 100644 index 000000000..4abccecb5 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/UserRoleSession.java @@ -0,0 +1,42 @@ +package ru.clearing.classes.statics.data.user; + +import ru.clearing.classes.ConstSerializable; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +/** + * Набор ролей + *

+ * DB table: USER_ROLE_SESSION + **/ +public class UserRoleSession extends SpcexObjectBase { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private Long userId; + private String userRole; + private Long companyId; + + public Long getUserId() { + return userId; + } + + public void setUserId(Long value) { + this.userId = value; + } + + public String getUserRole() { + return userRole; + } + + public void setUserRole(String value) { + this.userRole = value; + } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long value) { + this.companyId = value; + } + +} diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/UserSettings.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/UserSettings.java new file mode 100644 index 000000000..fd358fd82 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/UserSettings.java @@ -0,0 +1,42 @@ +package ru.clearing.classes.statics.data.user; + +import ru.clearing.classes.ConstSerializable; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +/** + * Настройки пользователя + *

+ * DB table: USER_SETTINGS + **/ +public class UserSettings extends SpcexObjectBase { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private Long userId; + private String version; + private String json; + + public Long getUserId() { + return userId; + } + + public void setUserId(Long value) { + this.userId = value; + } + + public String getVersion() { + return version; + } + + public void setVersion(String value) { + this.version = value; + } + + public String getJson() { + return json; + } + + public void setJson(String value) { + this.json = value; + } + +} \ No newline at end of file diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ConnectionStateDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ConnectionStateDictionary.java new file mode 100644 index 000000000..ed96817e5 --- /dev/null +++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ConnectionStateDictionary.java @@ -0,0 +1,11 @@ +package ru.clearing.platform.dictionary; + +/** + * Справочник состояний соединений + * + * Dictionary DB table: CONNECTION_STATE_DICTIONARY + **/ +public class ConnectionStateDictionary extends AbstractDictionary { + private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID; + +} \ No newline at end of file diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/SourceDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/SourceDictionary.java new file mode 100644 index 000000000..48c4c0875 --- /dev/null +++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/SourceDictionary.java @@ -0,0 +1,11 @@ +package ru.clearing.platform.dictionary; + +/** + * Справочник источников + * + * Dictionary DB table: SOURCE_DICTIONARY + **/ +public class SourceDictionary extends AbstractDictionary { + private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID; + +} \ No newline at end of file diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/TaskDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/TaskDictionary.java new file mode 100644 index 000000000..791f61433 --- /dev/null +++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/TaskDictionary.java @@ -0,0 +1,12 @@ +package ru.clearing.platform.dictionary; + + +/** + * Справочник задач + * + * Dictionary DB table: TASK_DICTIONARY + **/ +public class TaskDictionary extends AbstractDictionary { + private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID; + +} \ No newline at end of file diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/TaskStatusDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/TaskStatusDictionary.java new file mode 100644 index 000000000..cc3447d80 --- /dev/null +++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/TaskStatusDictionary.java @@ -0,0 +1,12 @@ +package ru.clearing.platform.dictionary; + +/** + * Справочник статусов задач + *

+ * Dictionary DB table: TASK_STATUS_DICTIONARY + **/ +public class TaskStatusDictionary extends AbstractDictionary { + private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID; + + +} diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/TradingStatusDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/TradingStatusDictionary.java new file mode 100644 index 000000000..8046d202b --- /dev/null +++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/TradingStatusDictionary.java @@ -0,0 +1,11 @@ +package ru.clearing.platform.dictionary; + +/** + * Справочник торговых статусов + * + * Dictionary DB table: TRADING_STATUS_DICTIONARY + **/ +public class TradingStatusDictionary extends AbstractDictionary { + private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID; + +} \ No newline at end of file diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/UserRoleDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/UserRoleDictionary.java new file mode 100644 index 000000000..107b4bc36 --- /dev/null +++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/UserRoleDictionary.java @@ -0,0 +1,11 @@ +package ru.clearing.platform.dictionary; + +/** + * Роли пользователей + * + * Dictionary DB table: USER_ROLE_DICTIONARY + **/ +public class UserRoleDictionary extends AbstractDictionary { + private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID; + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/UserConnectHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/UserConnectHistoryMapStore.java new file mode 100644 index 000000000..4e51214af --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/UserConnectHistoryMapStore.java @@ -0,0 +1,59 @@ +package ru.spcex.clearing.imdg.businessevent; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.user.UserConnect; +import ru.clearing.classes.statics.data.user.UserConnectHistory; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.imdg.base.TemplateEventMapStore; +import ru.spcex.clearing.imdg.utils.TimeUtil; + +@Component +public class UserConnectHistoryMapStore extends TemplateEventMapStore { + + public UserConnectHistoryMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_UserConnectHistory; + } + + @Override + public String getTableName() { + return "USER_CONNECT_HISTORY"; + } + + @Override + public String[] getFields() { + return new String[]{"ID", "EVENT_TIME", "EVENT_USER_ID", + "USER_CONNECT_ID", "CREATED_AT", "UPDATED_AT", "USER_ID", "CONNECTION_TIME", "DISCONNECTION_TIME", "SERVER_I_P", "CLIENT_I_P", "CONNECTION_STATE", "CLEARING_DATE", "ERROR_CODE", "ERROR_TEXT" + }; + } + + @Override + public Object[] objectToField(UserConnectHistory historyLog) { + UserConnect object = historyLog.getObject(); + Object[] args = new Object[]{ + historyLog.getId(), + historyLog.getEventTime(), + historyLog.getUserId(), + + object.getId(), + TimeUtil.fromInstant(object.getCreated()), + TimeUtil.fromInstant(object.getUpdated()), + object.getUserId(), + TimeUtil.fromInstant(object.getConnectionTime()), + TimeUtil.fromInstant(object.getDisconnectionTime()), + object.getServerIP(), + object.getClientIP(), + object.getConnectionState(), + TimeUtil.fromInstant(object.getClearingDate()), + object.getErrorCode(), + object.getErrorText() + }; + return args; + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/UserHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/UserHistoryMapStore.java new file mode 100644 index 000000000..f82cdc318 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/UserHistoryMapStore.java @@ -0,0 +1,53 @@ +package ru.spcex.clearing.imdg.businessevent; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.user.User; +import ru.clearing.classes.statics.data.user.UserHistory; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.imdg.base.TemplateEventMapStore; +import ru.spcex.clearing.imdg.utils.TimeUtil; + +@Component +public class UserHistoryMapStore extends TemplateEventMapStore { + + public UserHistoryMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_UserHistory; + } + + @Override + public String getTableName() { + return "USER_HISTORY"; + } + + @Override + public String[] getFields() { + return new String[]{"ID","EVENT_TIME", "EVENT_USER_ID", + "USER_ID", "CREATED_AT", "UPDATED_AT", "COMPANY_ID", "IDENTIFIER", "NAME" + }; + } + + @Override + public Object[] objectToField(UserHistory historyLog) { + User object=historyLog.getObject(); + Object[] args = new Object[]{ + historyLog.getId(), + historyLog.getEventTime(), + historyLog.getUserId(), + + object.getId(), + TimeUtil.fromInstant(object.getCreated()), + TimeUtil.fromInstant(object.getUpdated()), + object.getCompanyId(), + object.getIdentifier(), + object.getName() + }; + return args; + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/SchedulerMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/SchedulerMapStore.java new file mode 100644 index 000000000..b6a1707c5 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/SchedulerMapStore.java @@ -0,0 +1,70 @@ +package ru.spcex.clearing.imdg.businessobject; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.scheduler.Scheduler; +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 SchedulerMapStore extends TemplateMapStore { + + public SchedulerMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_Scheduler; + } + + @Override + public String getTableName() { + return "SCHEDULER"; + } + + @Override + public String[] getFields() { + return new String[]{ + "ID", "CREATED_AT", "UPDATED_AT", "TASK", "TASK_TIME", "CLEARING_DATE", "MARKET", "TASK_STATUS", "SECURITY_ID" + }; + } + + @Override + public Scheduler objectReader(ResultSet resultSet) throws SQLException { + Scheduler object = new Scheduler(); + object.setId(resultSet.getObject("ID", Long.class)); + object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT")); + object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT")); + object.setTask(resultSet.getObject("TASK", String.class)); + object.setTaskTime(getInstantFromTimestamp(resultSet, "TASK_TIME")); + object.setClearingDate(getInstantFromTimestamp(resultSet, "CLEARING_DATE")); + object.setMarket(resultSet.getObject("MARKET", String.class)); + object.setTaskStatus(resultSet.getObject("TASK_STATUS", String.class)); + object.setSecurityId(resultSet.getObject("SECURITY_ID", Long.class)); + return object; + } + + @Override + public Object[] objectToField(Scheduler object) { + Object[] args = new Object[]{ + object.getId(), + TimeUtil.fromInstant(object.getCreated()), + TimeUtil.fromInstant(object.getUpdated()), + object.getTask(), + TimeUtil.fromInstant(object.getTaskTime()), + TimeUtil.fromInstant(object.getClearingDate()), + object.getMarket(), + object.getTaskStatus(), + object.getSecurityId() + }; + return args; + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/StatementMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/StatementMapStore.java index 047cf1d80..d5704e253 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/StatementMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/StatementMapStore.java @@ -33,7 +33,7 @@ public class StatementMapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "ADDRESSEE_ID", "SENDER_ID", "CREATED_AT", "UPDATED_AT", "CLEARING_DATE", "STATEMENT_TYPE_ID", "COMMENT", "ACCOUNT_ID", "ACCOUNT", "IN_OUT_DIRECTION", "SETTLEMENT_DATE", "AMOUNT", "CASH_MOVEMENT_CURRENCY_CODE", "STATUS", "ERROR_CODE", "ERROR_TEXT", "IN_S_DF_ID", "OUT_S_DF_ID" + "ID", "ADDRESSEE_ID", "SENDER_ID", "CREATED_AT", "UPDATED_AT", "CLEARING_DATE", "STATEMENT_TYPE_ID", "COMMENT", "ACCOUNT_ID", "ACCOUNT", "IN_OUT_DIRECTION", "SETTLEMENT_DATE", "AMOUNT", "CASH_MOVEMENT_CURRENCY_CODE", "STATUS", "ERROR_CODE", "ERROR_TEXT", "IN_S_DF_ID", "OUT_S_DF_ID", "IN_OUT_S_DF_TYPE" }; } @@ -59,6 +59,7 @@ public class StatementMapStore extends TemplateMapStore { object.setErrorText(resultSet.getObject("ERROR_TEXT", String.class)); object.setInSDfId(resultSet.getObject("IN_S_DF_ID", Long.class)); object.setOutSDfId(resultSet.getObject("OUT_S_DF_ID", Long.class)); + object.setInOutSDfType(resultSet.getObject("IN_OUT_S_DF_TYPE", String.class)); return object; } @@ -83,7 +84,8 @@ public class StatementMapStore extends TemplateMapStore { object.getErrorCode(), object.getErrorText(), object.getInSDfId(), - object.getOutSDfId() + object.getOutSDfId(), + object.getInOutSDfType() }; return args; } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/TaskRunnerMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/TaskRunnerMapStore.java new file mode 100644 index 000000000..622d59898 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/TaskRunnerMapStore.java @@ -0,0 +1,62 @@ +package ru.spcex.clearing.imdg.businessobject; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.scheduler.TaskRunner; +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 TaskRunnerMapStore extends TemplateMapStore { + + public TaskRunnerMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_TaskRunner; + } + + @Override + public String getTableName() { + return "TASK_RUNNER"; + } + + @Override + public String[] getFields() { + return new String[]{ + "ID", "CREATED_AT", "UPDATED_AT", "SENDER_ID", "TASK" + }; + } + + @Override + public TaskRunner objectReader(ResultSet resultSet) throws SQLException { + TaskRunner object = new TaskRunner(); + object.setId(resultSet.getObject("ID", Long.class)); + object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT")); + object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT")); + object.setSenderId(resultSet.getObject("SENDER_ID", Long.class)); + object.setTask(resultSet.getObject("TASK", String.class)); + return object; + } + + @Override + public Object[] objectToField(TaskRunner object) { + Object[] args = new Object[]{ + object.getId(), + TimeUtil.fromInstant(object.getCreated()), + TimeUtil.fromInstant(object.getUpdated()), + object.getSenderId(), + object.getTask() + }; + return args; + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/TimetableMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/TimetableMapStore.java new file mode 100644 index 000000000..02fc1c213 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/TimetableMapStore.java @@ -0,0 +1,64 @@ +package ru.spcex.clearing.imdg.businessobject; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.scheduler.Timetable; +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 TimetableMapStore extends TemplateMapStore { + + public TimetableMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_Timetable; + } + + @Override + public String getTableName() { + return "TIMETABLE"; + } + + @Override + public String[] getFields() { + return new String[]{ + "ID", "CREATED_AT", "UPDATED_AT", "TASK", "TASK_TIME", "TASK_STATUS" + }; + } + + @Override + public Timetable objectReader(ResultSet resultSet) throws SQLException { + Timetable object = new Timetable(); + object.setId(resultSet.getObject("ID", Long.class)); + object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT")); + object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT")); + object.setTask(resultSet.getObject("TASK", String.class)); + object.setTaskTime(getInstantFromTimestamp(resultSet, "TASK_TIME")); + object.setTaskStatus(resultSet.getObject("TASK_STATUS", String.class)); + return object; + } + + @Override + public Object[] objectToField(Timetable object) { + Object[] args = new Object[]{ + object.getId(), + TimeUtil.fromInstant(object.getCreated()), + TimeUtil.fromInstant(object.getUpdated()), + object.getTask(), + TimeUtil.fromInstant(object.getTaskTime()), + object.getTaskStatus() + }; + return args; + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/TradingCalendarMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/TradingCalendarMapStore.java new file mode 100644 index 000000000..5d49efc74 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/TradingCalendarMapStore.java @@ -0,0 +1,64 @@ +package ru.spcex.clearing.imdg.businessobject; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.scheduler.TradingCalendar; +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 TradingCalendarMapStore extends TemplateMapStore { + + public TradingCalendarMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_TradingCalendar; + } + + @Override + public String getTableName() { + return "TRADING_CALENDAR"; + } + + @Override + public String[] getFields() { + return new String[]{ + "ID", "CREATED_AT", "UPDATED_AT", "CLEARING_DATE", "COMPANY_ID", "TRADING_STATUS" + }; + } + + @Override + public TradingCalendar objectReader(ResultSet resultSet) throws SQLException { + TradingCalendar object = new TradingCalendar(); + object.setId(resultSet.getObject("ID", Long.class)); + object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT")); + object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT")); + object.setClearingDate(getInstantFromTimestamp(resultSet, "CLEARING_DATE")); + object.setCompanyId(resultSet.getObject("COMPANY_ID", Long.class)); + object.setTradingStatus(resultSet.getObject("TRADING_STATUS", String.class)); + return object; + } + + @Override + public Object[] objectToField(TradingCalendar object) { + Object[] args = new Object[]{ + object.getId(), + TimeUtil.fromInstant(object.getCreated()), + TimeUtil.fromInstant(object.getUpdated()), + TimeUtil.fromInstant(object.getClearingDate()), + object.getCompanyId(), + object.getTradingStatus() + }; + return args; + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/UserConnectMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/UserConnectMapStore.java new file mode 100644 index 000000000..c8e37bda6 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/UserConnectMapStore.java @@ -0,0 +1,76 @@ +package ru.spcex.clearing.imdg.businessobject; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.user.UserConnect; +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 UserConnectMapStore extends TemplateMapStore { + + public UserConnectMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_UserConnect; + } + + @Override + public String getTableName() { + return "USER_CONNECT"; + } + + @Override + public String[] getFields() { + return new String[]{ + "ID", "CREATED_AT", "UPDATED_AT", "USER_ID", "CONNECTION_TIME", "DISCONNECTION_TIME", "SERVER_I_P", "CLIENT_I_P", "CONNECTION_STATE", "CLEARING_DATE", "ERROR_CODE", "ERROR_TEXT" + }; + } + + @Override + public UserConnect objectReader(ResultSet resultSet) throws SQLException { + UserConnect object = new UserConnect(); + object.setId(resultSet.getObject("ID", Long.class)); + object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT")); + object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT")); + object.setUserId(resultSet.getObject("USER_ID", Long.class)); + object.setConnectionTime(getInstantFromTimestamp(resultSet, "CONNECTION_TIME")); + object.setDisconnectionTime(getInstantFromTimestamp(resultSet, "DISCONNECTION_TIME")); + object.setServerIP(resultSet.getObject("SERVER_I_P", String.class)); + object.setClientIP(resultSet.getObject("CLIENT_I_P", String.class)); + object.setConnectionState(resultSet.getObject("CONNECTION_STATE", String.class)); + object.setClearingDate(getInstantFromTimestamp(resultSet, "CLEARING_DATE")); + object.setErrorCode(resultSet.getObject("ERROR_CODE", String.class)); + object.setErrorText(resultSet.getObject("ERROR_TEXT", String.class)); + return object; + } + + @Override + public Object[] objectToField(UserConnect object) { + Object[] args = new Object[]{ + object.getId(), + TimeUtil.fromInstant(object.getCreated()), + TimeUtil.fromInstant(object.getUpdated()), + object.getUserId(), + TimeUtil.fromInstant(object.getConnectionTime()), + TimeUtil.fromInstant(object.getDisconnectionTime()), + object.getServerIP(), + object.getClientIP(), + object.getConnectionState(), + TimeUtil.fromInstant(object.getClearingDate()), + object.getErrorCode(), + object.getErrorText() + }; + return args; + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/UserMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/UserMapStore.java new file mode 100644 index 000000000..a2fffb3b4 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/UserMapStore.java @@ -0,0 +1,62 @@ +package ru.spcex.clearing.imdg.businessobject; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.user.User; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.imdg.base.TemplateMapStore; +import ru.spcex.clearing.imdg.utils.TimeUtil; + +import java.sql.ResultSet; +import java.sql.SQLException; + +@Component +public class UserMapStore extends TemplateMapStore { + + public UserMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_User; + } + + @Override + public String getTableName() { + return "USER_CLR"; + } + + @Override + public String[] getFields() { + return new String[]{ + "ID", "CREATED_AT", "UPDATED_AT", "COMPANY_ID", "IDENTIFIER", "NAME" + }; + } + + @Override + public User objectReader(ResultSet resultSet) throws SQLException { + User object = new User(); + object.setId(resultSet.getObject("ID", Long.class)); + object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT")); + object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT")); + object.setCompanyId(resultSet.getObject("COMPANY_ID", Long.class)); + object.setIdentifier(resultSet.getObject("IDENTIFIER", String.class)); + object.setName(resultSet.getObject("NAME", String.class)); + return object; + } + + @Override + public Object[] objectToField(User object) { + Object[] args = new Object[]{ + object.getId(), + TimeUtil.fromInstant(object.getCreated()), + TimeUtil.fromInstant(object.getUpdated()), + object.getCompanyId(), + object.getIdentifier(), + object.getName() + }; + return args; + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ConnectionStateDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ConnectionStateDictionaryMapStore.java new file mode 100644 index 000000000..d3a4bd822 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ConnectionStateDictionaryMapStore.java @@ -0,0 +1,31 @@ +package ru.spcex.clearing.imdg.dictionary; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.platform.dictionary.ConnectionStateDictionary; +import ru.spcex.clearing.imdg.base.DictionaryTMapStore; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +@Component +public class ConnectionStateDictionaryMapStore extends DictionaryTMapStore { + + public ConnectionStateDictionaryMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_ConnectionStateDictionary; + } + + @Override + public String getTableName() { + return "CONNECTION_STATE_DICTIONARY"; + } + + @Override + public ConnectionStateDictionary getDictionaryObject() { + return new ConnectionStateDictionary(); + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/SourceDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/SourceDictionaryMapStore.java new file mode 100644 index 000000000..6ea7f468b --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/SourceDictionaryMapStore.java @@ -0,0 +1,31 @@ +package ru.spcex.clearing.imdg.dictionary; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.platform.dictionary.SourceDictionary; +import ru.spcex.clearing.imdg.base.DictionaryTMapStore; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +@Component +public class SourceDictionaryMapStore extends DictionaryTMapStore { + + public SourceDictionaryMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_SourceDictionary; + } + + @Override + public String getTableName() { + return "SOURCE_DICTIONARY"; + } + + @Override + public SourceDictionary getDictionaryObject() { + return new SourceDictionary(); + } + +} diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/TaskDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/TaskDictionaryMapStore.java new file mode 100644 index 000000000..cc7d2475a --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/TaskDictionaryMapStore.java @@ -0,0 +1,31 @@ +package ru.spcex.clearing.imdg.dictionary; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.platform.dictionary.TaskDictionary; +import ru.spcex.clearing.imdg.base.DictionaryTMapStore; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +@Component +public class TaskDictionaryMapStore extends DictionaryTMapStore { + + public TaskDictionaryMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_TaskDictionary; + } + + @Override + public String getTableName() { + return "TASK_DICTIONARY"; + } + + @Override + public TaskDictionary getDictionaryObject() { + return new TaskDictionary(); + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/TaskStatusDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/TaskStatusDictionaryMapStore.java new file mode 100644 index 000000000..b98bc638e --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/TaskStatusDictionaryMapStore.java @@ -0,0 +1,31 @@ +package ru.spcex.clearing.imdg.dictionary; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.platform.dictionary.TaskStatusDictionary; +import ru.spcex.clearing.imdg.base.DictionaryTMapStore; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +@Component +public class TaskStatusDictionaryMapStore extends DictionaryTMapStore { + + public TaskStatusDictionaryMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_TaskStatusDictionary; + } + + @Override + public String getTableName() { + return "TASK_STATUS_DICTIONARY"; + } + + @Override + public TaskStatusDictionary getDictionaryObject() { + return new TaskStatusDictionary(); + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/TradingStatusDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/TradingStatusDictionaryMapStore.java new file mode 100644 index 000000000..6ed62f8ab --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/TradingStatusDictionaryMapStore.java @@ -0,0 +1,31 @@ +package ru.spcex.clearing.imdg.dictionary; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.platform.dictionary.TradingStatusDictionary; +import ru.spcex.clearing.imdg.base.DictionaryTMapStore; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +@Component +public class TradingStatusDictionaryMapStore extends DictionaryTMapStore { + + public TradingStatusDictionaryMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_TradingStatusDictionary; + } + + @Override + public String getTableName() { + return "TRADING_STATUS_DICTIONARY"; + } + + @Override + public TradingStatusDictionary getDictionaryObject() { + return new TradingStatusDictionary(); + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/UserRoleDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/UserRoleDictionaryMapStore.java new file mode 100644 index 000000000..0f9cab541 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/UserRoleDictionaryMapStore.java @@ -0,0 +1,31 @@ +package ru.spcex.clearing.imdg.dictionary; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.platform.dictionary.UserRoleDictionary; +import ru.spcex.clearing.imdg.base.DictionaryTMapStore; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +@Component +public class UserRoleDictionaryMapStore extends DictionaryTMapStore { + + public UserRoleDictionaryMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_UserRoleDictionary; + } + + @Override + public String getTableName() { + return "USER_ROLE_DICTIONARY"; + } + + @Override + public UserRoleDictionary getDictionaryObject() { + return new UserRoleDictionary(); + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ClearingUserMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ClearingUserMapStore.java deleted file mode 100644 index 6b00310c5..000000000 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ClearingUserMapStore.java +++ /dev/null @@ -1,61 +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.ClearingUser; -import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.imdg.base.AutoconfiguredMap; -import ru.spcex.clearing.imdg.base.SimpleObjectMapStore; - -import java.util.Collection; -import java.util.Collections; -import java.util.Map; - -//todo rewrite -@Component -public class ClearingUserMapStore extends SimpleObjectMapStore implements AutoconfiguredMap { - - public ClearingUserMapStore(JdbcTemplate jdbcTemplate) { - super(jdbcTemplate); - //super(jdbcTemplate); - } - - @Override - public String getTableName() { - - return "COMPANY"; - } - - @Override - public String[] getFields() { - return new String[0]; - } - - @Override - public void store(Map map) {} - - @Override - public String getMapName() { - return IMDGDistributedNames.Map_ClearingUser; - } - - @Override - public String[] getIndexingField() { - return new String[] {"username"}; - } - - @Override - public ClearingUser load(Long key) { - return null; - } - - @Override - public Map loadAll(Collection keys) { - return null; - } - - @Override - public Iterable loadAllKeys() { - return Collections.emptyList(); - } -} diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/InDocumentJournalMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/InDocumentJournalMapStore.java new file mode 100644 index 000000000..92318d548 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/InDocumentJournalMapStore.java @@ -0,0 +1,81 @@ +package ru.spcex.clearing.imdg.object; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.journal.InDocumentJournal; +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.math.BigDecimal; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.*; + +@Component +public class InDocumentJournalMapStore extends TemplateMapStore { + + public InDocumentJournalMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_InDocumentJournal; + } + + @Override + public String getTableName() { + return "IN_DOCUMENT_JOURNAL"; + } + + @Override + public String[] getFields() { + return new String[]{ + "ID", "REGISTRATION_DATE", "REGISTRATION_TIME", "REGISTRATION_NUMBER", "DOCUMENT_NAME", "SENDER_ID", "QUANTITY", "CLEARING_CODE", "COURIER_TYPE", "EMAIL_DATE", "AMOUNT", "DOSSIER_NUMBER", "COMMENT", "RECEIPT_DATE" + }; + } + + @Override + public InDocumentJournal objectReader(ResultSet resultSet) throws SQLException { + InDocumentJournal object = new InDocumentJournal(); + object.setId(resultSet.getObject("ID", Long.class)); + object.setRegistrationDate(getInstantFromTimestamp(resultSet, "REGISTRATION_DATE")); + object.setRegistrationTime(getInstantFromTimestamp(resultSet, "REGISTRATION_TIME")); + object.setRegistrationNumber(resultSet.getObject("REGISTRATION_NUMBER", Long.class)); + object.setDocumentName(resultSet.getObject("DOCUMENT_NAME", String.class)); + object.setSenderId(resultSet.getObject("SENDER_ID", Long.class)); + object.setQuantity(resultSet.getObject("QUANTITY", Long.class)); + object.setClearingCode(resultSet.getObject("CLEARING_CODE", String.class)); + object.setCourierType(resultSet.getObject("COURIER_TYPE", String.class)); + object.setEmailDate(getInstantFromTimestamp(resultSet, "EMAIL_DATE")); + object.setAmount(resultSet.getObject("AMOUNT", BigDecimal.class)); + object.setDossierNumber(resultSet.getObject("DOSSIER_NUMBER", Long.class)); + object.setComment(resultSet.getObject("COMMENT", String.class)); + object.setReceiptDate(getInstantFromTimestamp(resultSet, "RECEIPT_DATE")); + return object; + } + + @Override + public Object[] objectToField(InDocumentJournal object) { + Object[] args = new Object[]{ + object.getId(), + TimeUtil.fromInstant(object.getRegistrationDate()), + TimeUtil.fromInstant(object.getRegistrationTime()), + object.getRegistrationNumber(), + object.getDocumentName(), + object.getSenderId(), + object.getQuantity(), + object.getClearingCode(), + object.getCourierType(), + TimeUtil.fromInstant(object.getEmailDate()), + object.getAmount(), + object.getDossierNumber(), + object.getComment(), + TimeUtil.fromInstant(object.getReceiptDate()) + }; + return args; + } + +} \ No newline at end of file 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 new file mode 100644 index 000000000..9d3e7c88a --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/MarketAccessMapStore.java @@ -0,0 +1,62 @@ +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 { + + 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; + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/OutDocumentJournalMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/OutDocumentJournalMapStore.java new file mode 100644 index 000000000..1cef77d91 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/OutDocumentJournalMapStore.java @@ -0,0 +1,79 @@ +package ru.spcex.clearing.imdg.object; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.journal.OutDocumentJournal; +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.math.BigDecimal; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.*; + +@Component +public class OutDocumentJournalMapStore extends TemplateMapStore { + + public OutDocumentJournalMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_OutDocumentJournal; + } + + @Override + public String getTableName() { + return "OUT_DOCUMENT_JOURNAL"; + } + + @Override + public String[] getFields() { + return new String[]{ + "ID", "REGISTRATION_DATE", "REGISTRATION_TIME", "REGISTRATION_NUMBER", "DOCUMENT_NAME", "ADDRESSEE_ID", "QUANTITY", "CLEARING_CODE", "COURIER_TYPE", "EMAIL_DATE", "AMOUNT", "DOSSIER_NUMBER", "POST_DATE" + }; + } + + @Override + public OutDocumentJournal objectReader(ResultSet resultSet) throws SQLException { + OutDocumentJournal object = new OutDocumentJournal(); + object.setId(resultSet.getObject("ID", Long.class)); + object.setRegistrationDate(getInstantFromTimestamp(resultSet, "REGISTRATION_DATE")); + object.setRegistrationTime(getInstantFromTimestamp(resultSet, "REGISTRATION_TIME")); + object.setRegistrationNumber(resultSet.getObject("REGISTRATION_NUMBER", Long.class)); + object.setDocumentName(resultSet.getObject("DOCUMENT_NAME", String.class)); + object.setAddresseeId(resultSet.getObject("ADDRESSEE_ID", Long.class)); + object.setQuantity(resultSet.getObject("QUANTITY", Long.class)); + object.setClearingCode(resultSet.getObject("CLEARING_CODE", String.class)); + object.setCourierType(resultSet.getObject("COURIER_TYPE", String.class)); + object.setEmailDate(getInstantFromTimestamp(resultSet, "EMAIL_DATE")); + object.setAmount(resultSet.getObject("AMOUNT", BigDecimal.class)); + object.setDossierNumber(resultSet.getObject("DOSSIER_NUMBER", Long.class)); + object.setPostDate(getInstantFromTimestamp(resultSet, "POST_DATE")); + return object; + } + + @Override + public Object[] objectToField(OutDocumentJournal object) { + Object[] args = new Object[]{ + object.getId(), + TimeUtil.fromInstant(object.getRegistrationDate()), + TimeUtil.fromInstant(object.getRegistrationTime()), + object.getRegistrationNumber(), + object.getDocumentName(), + object.getAddresseeId(), + object.getQuantity(), + object.getClearingCode(), + object.getCourierType(), + TimeUtil.fromInstant(object.getEmailDate()), + object.getAmount(), + object.getDossierNumber(), + TimeUtil.fromInstant(object.getPostDate()) + }; + return args; + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf02MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf02MapStore.java index 05ebd151c..1a53b17fe 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf02MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf02MapStore.java @@ -32,7 +32,7 @@ public class SDf02MapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "CURR_CODE", "ACCOUNT", "REMAINDER", "DEAL", "ACC_CODE", "DAT", "MARKET", "ACC_NAME", "ACC_TYPE", "SUMENGAGE", "SUMUNBLOCK", "FILE_TYPE", "RESULT", "FILE_NAME", "GENERATION_TIME", "GENERATION_ID" + "ID", "CURR_CODE", "ACCOUNT", "REMAINDER", "DEAL", "ACC_CODE", "DAT", "MARKET", "ACC_NAME", "ACC_TYPE", "SUMENGAGE", "SUMUNBLOCK", "FILE_TYPE", "RESULT", "GENERATION_TIME", "GENERATION_ID", "IN_S_DF01_ID" }; } @@ -53,9 +53,9 @@ public class SDf02MapStore extends TemplateMapStore { object.setSumunblock(resultSet.getObject("SUMUNBLOCK", String.class)); object.setFile_type(resultSet.getObject("FILE_TYPE", String.class)); object.setResult(resultSet.getObject("RESULT", String.class)); - object.setFileName(resultSet.getObject("FILE_NAME", String.class)); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); + object.setInSDf01Id(resultSet.getObject("IN_S_DF01_ID", Long.class)); return object; } @@ -76,9 +76,9 @@ public class SDf02MapStore extends TemplateMapStore { object.getSumunblock(), object.getFile_type(), object.getResult(), - object.getFileName(), TimeUtil.fromInstant(object.getGenerationTime()), - object.getGenerationId() + object.getGenerationId(), + object.getInSDf01Id() }; return args; } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf08MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf08MapStore.java index a699f0396..5943090fe 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf08MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf08MapStore.java @@ -33,7 +33,7 @@ public class SDf08MapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "NUMBER", "DATETIME", "FILE_NAME", "GENERATION_TIME", "GENERATION_ID" + "ID", "NUMBER", "DATETIME", "GENERATION_TIME", "GENERATION_ID" }; } @@ -42,8 +42,7 @@ public class SDf08MapStore extends TemplateMapStore { SDf08 object = new SDf08(); object.setId(resultSet.getObject("ID", Long.class)); object.setNumber(resultSet.getObject("NUMBER", BigDecimal.class)); - object.setDatetime(getInstantFromTimestamp(resultSet,"DATETIME")); - object.setFileName(resultSet.getObject("FILE_NAME", String.class)); + object.setDatetime(getInstantFromTimestamp(resultSet, "DATETIME")); object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); return object; @@ -55,7 +54,6 @@ public class SDf08MapStore extends TemplateMapStore { object.getId(), object.getNumber(), TimeUtil.fromInstant(object.getDatetime()), - object.getFileName(), TimeUtil.fromInstant(object.getGenerationTime()), object.getGenerationId() }; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf12MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf12MapStore.java new file mode 100644 index 000000000..9ba204d21 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf12MapStore.java @@ -0,0 +1,68 @@ +package ru.spcex.clearing.imdg.object; + + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.sdf.SDf12; +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.math.BigDecimal; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.*; + +@Component +public class SDf12MapStore extends TemplateMapStore { + + public SDf12MapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_SDf12; + } + + @Override + public String getTableName() { + return "S_DF12"; + } + + @Override + public String[] getFields() { + return new String[]{ + "ID", "ACCOUNT", "DEAL", "STATUS", "FILE_NAME", "GENERATION_TIME", "GENERATION_ID" + }; + } + + @Override + public SDf12 objectReader(ResultSet resultSet) throws SQLException { + SDf12 object = new SDf12(); + object.setId(resultSet.getObject("ID", Long.class)); + object.setAccount(resultSet.getObject("ACCOUNT", String.class)); + object.setDeal(resultSet.getObject("DEAL", String.class)); + object.setStatus(resultSet.getObject("STATUS", BigDecimal.class)); + object.setFileName(resultSet.getObject("FILE_NAME", String.class)); + object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); + object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); + return object; + } + + @Override + public Object[] objectToField(SDf12 object) { + Object[] args = new Object[]{ + object.getId(), + object.getAccount(), + object.getDeal(), + object.getStatus(), + object.getFileName(), + TimeUtil.fromInstant(object.getGenerationTime()), + object.getGenerationId() + }; + return args; + } + +} diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf18MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf18MapStore.java new file mode 100644 index 000000000..406f66499 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf18MapStore.java @@ -0,0 +1,69 @@ +package ru.spcex.clearing.imdg.object; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.clearing.classes.statics.data.sdf.SDf18; +import ru.spcex.clearing.imdg.base.TemplateMapStore; +import ru.spcex.clearing.imdg.utils.DbUtilsHelper; +import ru.spcex.clearing.imdg.utils.TimeUtil; + +import java.math.BigDecimal; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.*; + +@Component +public class SDf18MapStore extends TemplateMapStore { + + public SDf18MapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_SDf18; + } + + @Override + public String getTableName() { + return "S_DF18"; + } + + @Override + public String[] getFields() { + return new String[]{ + "ID", "ACCOUNT", "DEAL", "STATUS", "RESULT", "GENERATION_TIME", "GENERATION_ID", "IN_S_DF12_ID" + }; + } + + @Override + public SDf18 objectReader(ResultSet resultSet) throws SQLException { + SDf18 object = new SDf18(); + object.setId(resultSet.getObject("ID", Long.class)); + object.setAccount(resultSet.getObject("ACCOUNT", String.class)); + object.setDeal(resultSet.getObject("DEAL", String.class)); + object.setStatus(resultSet.getObject("STATUS", BigDecimal.class)); + object.setResult(resultSet.getObject("RESULT", BigDecimal.class)); + object.setGenerationTime(getInstantFromTimestamp(resultSet, "GENERATION_TIME")); + object.setGenerationId(resultSet.getObject("GENERATION_ID", Long.class)); + object.setInSDf12Id(resultSet.getObject("IN_S_DF12_ID", Long.class)); + return object; + } + + @Override + public Object[] objectToField(SDf18 object) { + Object[] args = new Object[]{ + object.getId(), + object.getAccount(), + object.getDeal(), + object.getStatus(), + object.getResult(), + TimeUtil.fromInstant(object.getGenerationTime()), + object.getGenerationId(), + object.getInSDf12Id() + }; + return args; + } + +} diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SchedulerAllTodayMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SchedulerAllTodayMapStore.java new file mode 100644 index 000000000..e7ea70879 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SchedulerAllTodayMapStore.java @@ -0,0 +1,70 @@ +package ru.spcex.clearing.imdg.object; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.scheduler.SchedulerAllToday; +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 SchedulerAllTodayMapStore extends TemplateMapStore { + + public SchedulerAllTodayMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_SchedulerAllToday; + } + + @Override + public String getTableName() { + return "SCHEDULER_ALL_TODAY"; + } + + @Override + public String[] getFields() { + return new String[]{ + "ID", "TASK", "TASK_TIME", "CLEARING_DATE", "MARKET", "TASK_STATUS", "SECURITY_ID", "SOURCE", "ORIG_ID" + }; + } + + @Override + public SchedulerAllToday objectReader(ResultSet resultSet) throws SQLException { + SchedulerAllToday object = new SchedulerAllToday(); + object.setId(resultSet.getObject("ID", Long.class)); + object.setTask(resultSet.getObject("TASK", String.class)); + object.setTaskTime(getInstantFromTimestamp(resultSet, "TASK_TIME")); + object.setClearingDate(getInstantFromTimestamp(resultSet, "CLEARING_DATE")); + object.setMarket(resultSet.getObject("MARKET", String.class)); + object.setTaskStatus(resultSet.getObject("TASK_STATUS", String.class)); + object.setSecurityId(resultSet.getObject("SECURITY_ID", Long.class)); + object.setSource(resultSet.getObject("SOURCE", String.class)); + object.setOrigId(resultSet.getObject("ORIG_ID", Long.class)); + return object; + } + + @Override + public Object[] objectToField(SchedulerAllToday object) { + Object[] args = new Object[]{ + object.getId(), + object.getTask(), + TimeUtil.fromInstant(object.getTaskTime()), + TimeUtil.fromInstant(object.getClearingDate()), + object.getMarket(), + object.getTaskStatus(), + object.getSecurityId(), + object.getSource(), + object.getOrigId() + }; + return args; + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/UserRoleSessionMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/UserRoleSessionMapStore.java new file mode 100644 index 000000000..59b68dcc1 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/UserRoleSessionMapStore.java @@ -0,0 +1,60 @@ +package ru.spcex.clearing.imdg.object; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.user.UserRoleSession; +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 UserRoleSessionMapStore extends TemplateMapStore { + + public UserRoleSessionMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_UserRoleSession; + } + + @Override + public String getTableName() { + return "USER_ROLE_SESSION"; + } + + @Override + public String[] getFields() { + return new String[]{ + "ID", "USER_ID", "USER_ROLE", "COMPANY_ID" + }; + } + + @Override + public UserRoleSession objectReader(ResultSet resultSet) throws SQLException { + UserRoleSession object = new UserRoleSession(); + object.setId(resultSet.getObject("ID", Long.class)); + object.setUserId(resultSet.getObject("USER_ID", Long.class)); + object.setUserRole(resultSet.getObject("USER_ROLE", String.class)); + object.setCompanyId(resultSet.getObject("COMPANY_ID", Long.class)); + return object; + } + + @Override + public Object[] objectToField(UserRoleSession object) { + Object[] args = new Object[]{ + object.getId(), + object.getUserId(), + object.getUserRole(), + object.getCompanyId() + }; + return args; + } + +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/UserSettingsMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/UserSettingsMapStore.java new file mode 100644 index 000000000..606ed4b8e --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/UserSettingsMapStore.java @@ -0,0 +1,60 @@ +package ru.spcex.clearing.imdg.object; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.user.UserSettings; +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 UserSettingsMapStore extends TemplateMapStore { + + public UserSettingsMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_UserSettings; + } + + @Override + public String getTableName() { + return "USER_SETTINGS"; + } + + @Override + public String[] getFields() { + return new String[]{ + "ID", "USER_ID", "VERSION", "JSON" + }; + } + + @Override + public UserSettings objectReader(ResultSet resultSet) throws SQLException { + UserSettings object = new UserSettings(); + object.setId(resultSet.getObject("ID", Long.class)); + object.setUserId(resultSet.getObject("USER_ID", Long.class)); + object.setVersion(resultSet.getObject("VERSION", String.class)); + object.setJson(resultSet.getObject("JSON", String.class)); + return object; + } + + @Override + public Object[] objectToField(UserSettings object) { + Object[] args = new Object[]{ + object.getId(), + object.getUserId(), + object.getVersion(), + object.getJson() + }; + return args; + } + +} \ No newline at end of file diff --git a/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java b/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java index 908a3cdfd..3e0d9633e 100644 --- a/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java +++ b/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java @@ -31,6 +31,18 @@ public final class IMDGDistributedNames { public static final String Map_RelationHistory = "Map_RelationHistory"; public static final String Map_ErrorText = "Map_ErrorText"; public static final String Map_Statement = "Map_Statement"; + public static final String Map_MarketAccess = "Map_MarketAccess"; + public static final String Map_UserConnect = "Map_UserConnect"; + public static final String Map_UserConnectHistory = "Map_UserConnectHistory"; + public static final String Map_User = "Map_User"; + public static final String Map_UserHistory = "Map_UserHistory"; + public static final String Map_TaskRunner = "Map_TaskRunner"; + public static final String Map_SchedulerAllToday = "Map_SchedulerAllToday"; + public static final String Map_Scheduler = "Map_Scheduler"; + public static final String Map_TradingCalendar = "Map_TradingCalendar"; + public static final String Map_Timetable = "Map_Timetable"; + public static final String Map_InDocumentJournal = "Map_InDocumentJournal"; + public static final String Map_OutDocumentJournal = "Map_OutDocumentJournal"; public static final String Map_SDf16 = "Map_SDf16"; public static final String Map_RequestDf18 = "Map_RequestDf18"; public static final String Map_RequestDf03 = "Map_RequestDf03"; @@ -38,7 +50,8 @@ public final class IMDGDistributedNames { public static final String Map_SDf08 = "Map_SDf08"; public static final String Map_SDf02 = "Map_SDf02"; public static final String Map_SDf01 = "Map_SDf01"; - public static final String Map_ClearingUser = "Map_ClearingUser"; + public static final String Map_SDf12 = "Map_SDf12"; + public static final String Map_SDf18 = "Map_SDf18"; // public static final String Map_InterestStatusDictionary = "Map_InterestStatusDictionary"; future public static final String Map_AllowedDictionary = "Map_AllowedDictionary"; @@ -75,6 +88,14 @@ public final class IMDGDistributedNames { public static final String Map_TermTypeDictionary = "Map_TermTypeDictionary"; public static final String Map_CourierTypeDictionary = "Map_CourierTypeDictionary"; public static final String Map_ChargeDirectionDictionary = "Map_ChargeDirectionDictionary"; + public static final String Map_TaskDictionary = "Map_TaskDictionary"; + public static final String Map_TaskStatusDictionary = "Map_TaskStatusDictionary"; + public static final String Map_TradingStatusDictionary = "Map_TradingStatusDictionary"; + public static final String Map_SourceDictionary = "Map_SourceDictionary"; + public static final String Map_ConnectionStateDictionary = "Map_ConnectionStateDictionary"; + public static final String Map_UserRoleDictionary = "Map_UserRoleDictionary"; + public static final String Map_UserSettings = "Map_UserSettings"; + public static final String Map_UserRoleSession = "Map_UserRoleSession"; public static final String Map_KeyRate = "Map_KeyRate"; public static final String Map_MoneyMarketSecurity = "Map_MoneyMarketSecurity";