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 index ef4d8adc9..1a73b72ab 100644 --- 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 @@ -4,7 +4,8 @@ import ru.clearing.classes.ConstSerializable; import ru.spcex.platform.classes.base.SpcexObjectBase; import java.math.BigDecimal; -import java.time.Instant; +import java.time.LocalDate; +import java.time.LocalTime; /** * Журнал входящих документов @@ -14,34 +15,34 @@ import java.time.Instant; public class InDocumentJournal extends SpcexObjectBase { private static final long serialVersionUID = ConstSerializable.serialVersionUID; - private Instant registrationDate; - private Instant registrationTime; + private LocalDate registrationDate; + private LocalTime registrationTime; private Long registrationNumber; private String documentName; private String sender; private Long quantity; private String clearingCode; private String courierType; - private Instant emailDate; + private LocalDate emailDate; private BigDecimal amount; private String dossierNumber; private String comment; - private Instant receiptDate; + private LocalDate receiptDate; private String resultStatus; - public Instant getRegistrationDate() { + public LocalDate getRegistrationDate() { return registrationDate; } - public void setRegistrationDate(Instant value) { + public void setRegistrationDate(LocalDate value) { this.registrationDate = value; } - public Instant getRegistrationTime() { + public LocalTime getRegistrationTime() { return registrationTime; } - public void setRegistrationTime(Instant value) { + public void setRegistrationTime(LocalTime value) { this.registrationTime = value; } @@ -93,11 +94,11 @@ public class InDocumentJournal extends SpcexObjectBase { this.courierType = value; } - public Instant getEmailDate() { + public LocalDate getEmailDate() { return emailDate; } - public void setEmailDate(Instant value) { + public void setEmailDate(LocalDate value) { this.emailDate = value; } @@ -125,11 +126,11 @@ public class InDocumentJournal extends SpcexObjectBase { this.comment = value; } - public Instant getReceiptDate() { + public LocalDate getReceiptDate() { return receiptDate; } - public void setReceiptDate(Instant value) { + public void setReceiptDate(LocalDate value) { this.receiptDate = value; } 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 index ff2738907..e1a2930c8 100644 --- 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 @@ -4,7 +4,8 @@ import ru.clearing.classes.ConstSerializable; import ru.spcex.platform.classes.base.SpcexObjectBase; import java.math.BigDecimal; -import java.time.Instant; +import java.time.LocalDate; +import java.time.LocalTime; /** * Журнал исходящих документов @@ -14,33 +15,33 @@ import java.time.Instant; public class OutDocumentJournal extends SpcexObjectBase { private static final long serialVersionUID = ConstSerializable.serialVersionUID; - private Instant registrationDate; - private Instant registrationTime; + private LocalDate registrationDate; + private LocalTime registrationTime; private Long registrationNumber; private String documentName; private String addressee; private Long quantity; private String clearingCode; private String courierType; - private Instant emailDate; + private LocalDate emailDate; private BigDecimal amount; private String dossierNumber; - private Instant postDate; + private LocalDate postDate; private String resultStatus; - public Instant getRegistrationDate() { + public LocalDate getRegistrationDate() { return registrationDate; } - public void setRegistrationDate(Instant value) { + public void setRegistrationDate(LocalDate value) { this.registrationDate = value; } - public Instant getRegistrationTime() { + public LocalTime getRegistrationTime() { return registrationTime; } - public void setRegistrationTime(Instant value) { + public void setRegistrationTime(LocalTime value) { this.registrationTime = value; } @@ -92,11 +93,11 @@ public class OutDocumentJournal extends SpcexObjectBase { this.courierType = value; } - public Instant getEmailDate() { + public LocalDate getEmailDate() { return emailDate; } - public void setEmailDate(Instant value) { + public void setEmailDate(LocalDate value) { this.emailDate = value; } @@ -116,11 +117,11 @@ public class OutDocumentJournal extends SpcexObjectBase { this.dossierNumber = value; } - public Instant getPostDate() { + public LocalDate getPostDate() { return postDate; } - public void setPostDate(Instant value) { + public void setPostDate(LocalDate value) { this.postDate = value; } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/KeyRate.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/KeyRate.java index 5e7211360..c61a198c1 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/KeyRate.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/KeyRate.java @@ -3,7 +3,7 @@ package ru.clearing.classes.statics.data.misc; import ru.spcex.platform.classes.base.SpcexObjectBase; import java.math.BigDecimal; -import java.time.Instant; +import java.time.LocalDate; /** * Ключевая ставка ЦБ @@ -12,8 +12,8 @@ import java.time.Instant; **/ public class KeyRate extends SpcexObjectBase { private BigDecimal rate; - private Instant startDate; - private Instant endDate; + private LocalDate startDate; + private LocalDate endDate; private String document; private String workflowStatus; @@ -25,19 +25,19 @@ public class KeyRate extends SpcexObjectBase { this.rate = rate; } - public Instant getStartDate() { + public LocalDate getStartDate() { return startDate; } - public void setStartDate(Instant startDate) { + public void setStartDate(LocalDate startDate) { this.startDate = startDate; } - public Instant getEndDate() { + public LocalDate getEndDate() { return endDate; } - public void setEndDate(Instant endDate) { + public void setEndDate(LocalDate endDate) { this.endDate = endDate; } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/MoneyMarketSecurity.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/MoneyMarketSecurity.java index feca98c31..bae2e34bf 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/MoneyMarketSecurity.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/MoneyMarketSecurity.java @@ -3,7 +3,7 @@ package ru.clearing.classes.statics.data.misc; import ru.spcex.platform.classes.base.SpcexObjectBase; import java.math.BigDecimal; -import java.time.Instant; +import java.time.LocalDate; /** * Инструменты Денежного рынка @@ -13,8 +13,8 @@ import java.time.Instant; public class MoneyMarketSecurity extends SpcexObjectBase { private Long securityId;// (linked to security) private String description; - private Instant startDate; - private Instant endDate; + private LocalDate startDate; + private LocalDate endDate; private BigDecimal nominalValue; private Long nominalCurrency; // (linked to currencyCode) private String instrumentType; // (linked to instrumentType) @@ -37,19 +37,19 @@ public class MoneyMarketSecurity extends SpcexObjectBase { this.description = description; } - public Instant getStartDate() { + public LocalDate getStartDate() { return startDate; } - public void setStartDate(Instant startDate) { + public void setStartDate(LocalDate startDate) { this.startDate = startDate; } - public Instant getEndDate() { + public LocalDate getEndDate() { return endDate; } - public void setEndDate(Instant endDate) { + public void setEndDate(LocalDate endDate) { this.endDate = endDate; } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/profile/ProfileDocument.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/profile/ProfileDocument.java index ca034fac6..92e9d1a2c 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/profile/ProfileDocument.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/profile/ProfileDocument.java @@ -3,7 +3,7 @@ package ru.clearing.classes.statics.data.profile; import ru.clearing.classes.ConstSerializable; import ru.spcex.platform.classes.base.SpcexObjectBase; -import java.time.Instant; +import java.time.LocalDate; /** * DB: PROFILE_DOCUMENT @@ -13,15 +13,15 @@ public class ProfileDocument extends SpcexObjectBase { private Long companyId; private String documentType; // ref CHAR(4) - private Instant issueDate; + private LocalDate issueDate; private String issuePlace; private String issuer; private String issuerCode; private String name; private String number; private String place; - private Instant validFromDate; - private Instant validToDate; + private LocalDate validFromDate; + private LocalDate validToDate; private String link; public Long getCompanyId() { @@ -40,11 +40,11 @@ public class ProfileDocument extends SpcexObjectBase { this.documentType = documentType; } - public Instant getIssueDate() { + public LocalDate getIssueDate() { return issueDate; } - public void setIssueDate(Instant issueDate) { + public void setIssueDate(LocalDate issueDate) { this.issueDate = issueDate; } @@ -96,19 +96,19 @@ public class ProfileDocument extends SpcexObjectBase { this.place = place; } - public Instant getValidFromDate() { + public LocalDate getValidFromDate() { return validFromDate; } - public void setValidFromDate(Instant validFromDate) { + public void setValidFromDate(LocalDate validFromDate) { this.validFromDate = validFromDate; } - public Instant getValidToDate() { + public LocalDate getValidToDate() { return validToDate; } - public void setValidToDate(Instant validToDate) { + public void setValidToDate(LocalDate validToDate) { this.validToDate = validToDate; } 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 index 71d15c3e6..764287c2d 100644 --- 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 @@ -3,7 +3,8 @@ package ru.clearing.classes.statics.data.scheduler; import ru.clearing.classes.ConstSerializable; import ru.spcex.platform.classes.base.SpcexObjectBase; -import java.time.Instant; +import java.time.LocalDate; +import java.time.LocalTime; /** * Расписание на текущий день @@ -14,8 +15,8 @@ public class SchedulerAllToday extends SpcexObjectBase { private static final long serialVersionUID = ConstSerializable.serialVersionUID; private String task; - private Instant taskTime; - private Instant clearingDate; + private LocalTime taskTime; + private LocalDate clearingDate; private String market; private String taskStatus; private Long securityId; @@ -30,19 +31,19 @@ public class SchedulerAllToday extends SpcexObjectBase { this.task = value; } - public Instant getTaskTime() { + public LocalTime getTaskTime() { return taskTime; } - public void setTaskTime(Instant value) { + public void setTaskTime(LocalTime value) { this.taskTime = value; } - public Instant getClearingDate() { + public LocalDate getClearingDate() { return clearingDate; } - public void setClearingDate(Instant value) { + public void setClearingDate(LocalDate value) { this.clearingDate = value; } diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf10.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf10.java index 6e2ea9670..dab3f0299 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf10.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf10.java @@ -8,14 +8,14 @@ import java.time.Instant; /** * ДФ-10 Подтверждение о загрузке по поступлению на клиринговый счет - * + *

* DB table: S_DF10 */ public class SDf10 extends SpcexObjectBase { private static final long serialVersionUID = ConstSerializable.serialVersionUID; private String account; - private String sum; + private BigDecimal sum; private String market; private String type; private BigDecimal number; @@ -33,11 +33,11 @@ public class SDf10 extends SpcexObjectBase { this.account = account; } - public String getSum() { + public BigDecimal getSum() { return sum; } - public void setSum(String sum) { + public void setSum(BigDecimal sum) { this.sum = sum; } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CompanyRoleSetMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CompanyRoleSetMapStore.java index ee62a53af..d3e61e171 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CompanyRoleSetMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CompanyRoleSetMapStore.java @@ -3,8 +3,8 @@ package ru.spcex.clearing.imdg.object; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.company.CompanyRoleSet; -import ru.spcex.clearing.imdg.base.TemplateMapStore; import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.imdg.base.TemplateMapStore; import java.sql.ResultSet; import java.sql.SQLException; @@ -34,15 +34,15 @@ public class CompanyRoleSetMapStore extends TemplateMapStore { @Override public String[] getFields() { - return new String[]{"id", "roleid", "companyid"}; + return new String[]{"ID", "ROLE_ID", "COMPANY_ID"}; } @Override protected CompanyRoleSet objectReader(ResultSet resultSet) throws SQLException { CompanyRoleSet companyRoleSet = new CompanyRoleSet(); - companyRoleSet.setId(resultSet.getObject("id", Long.class)); - companyRoleSet.setRoleId(resultSet.getObject("roleid", Long.class)); - companyRoleSet.setCompanyId(resultSet.getObject("companyid", Long.class)); + companyRoleSet.setId(resultSet.getObject("ID", Long.class)); + companyRoleSet.setRoleId(resultSet.getObject("ROLE_ID", Long.class)); + companyRoleSet.setCompanyId(resultSet.getObject("COMPANY_ID", Long.class)); return companyRoleSet; } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CompanySymbolsMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CompanySymbolsMapStore.java index 74dadc2a6..42008cf1b 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CompanySymbolsMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CompanySymbolsMapStore.java @@ -37,9 +37,9 @@ public class CompanySymbolsMapStore extends TemplateMapStore { protected CompanySymbols objectReader(ResultSet resultSet) throws SQLException { CompanySymbols object = new CompanySymbols(); object.setId(resultSet.getObject("id", Long.class)); - object.setCompanyId(resultSet.getObject("companyid", Long.class)); - object.setCompanySymbol(resultSet.getObject("companysymbol", String.class)); - object.setCompanySymbolValue(resultSet.getObject("companysymbolvalue", String.class)); + object.setCompanyId(resultSet.getObject("company_id", Long.class)); + object.setCompanySymbol(resultSet.getObject("company_symbol", String.class)); + object.setCompanySymbolValue(resultSet.getObject("company_symbol_value", String.class)); return object; } 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 index ce1858fd3..939c43c13 100644 --- 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 @@ -39,20 +39,20 @@ public class InDocumentJournalMapStore extends TemplateMapStore { KeyRate keyRate = new KeyRate(); keyRate.setId(resultSet.getObject("ID", Long.class)); keyRate.setRate(resultSet.getObject("RATE", BigDecimal.class)); - keyRate.setStartDate(getInstantFromTimestamp(resultSet, "START_DATE")); - keyRate.setEndDate(getInstantFromTimestamp(resultSet, "END_DATE")); + keyRate.setStartDate(getLocalDateFromSqlDate(resultSet, "START_DATE")); + keyRate.setEndDate(getLocalDateFromSqlDate(resultSet, "END_DATE")); keyRate.setDocument(resultSet.getObject("DOCUMENT", String.class)); keyRate.setWorkflowStatus(resultSet.getObject("WORKFLOW_STATUS", String.class)); return keyRate; @@ -55,8 +55,8 @@ public class KeyRateMapStore extends TemplateMapStore { Object[] args = new Object[]{ partnerList.getId(), partnerList.getRate(), - TimeUtil.toDateFromInstant(partnerList.getStartDate()), - TimeUtil.toDateFromInstant(partnerList.getEndDate()), + TimeUtil.toDateFromLocalDate(partnerList.getStartDate()), + TimeUtil.toDateFromLocalDate(partnerList.getEndDate()), partnerList.getDocument(), partnerList.getWorkflowStatus() }; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/MoneyMarketSecurityMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/MoneyMarketSecurityMapStore.java index 3a4ae51bd..03d526135 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/MoneyMarketSecurityMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/MoneyMarketSecurityMapStore.java @@ -44,8 +44,8 @@ public class MoneyMarketSecurityMapStore extends TemplateMapStore { object.setId(resultSet.getObject("id", Long.class)); object.setCompanyId(resultSet.getObject("company_id", Long.class)); object.setDocumentType(resultSet.getObject("document_type", String.class)); - object.setIssueDate(getInstantFromTimestamp(resultSet, "issue_date")); + object.setIssueDate(getLocalDateFromSqlDate(resultSet, "issue_date")); object.setIssuePlace(resultSet.getObject("issue_place", String.class)); object.setIssuer(resultSet.getObject("issuer", String.class)); object.setIssuerCode(resultSet.getObject("issuer_code", String.class)); object.setName(resultSet.getObject("name", String.class)); object.setNumber(resultSet.getObject("number", String.class)); object.setPlace(resultSet.getObject("place", String.class)); - object.setValidFromDate(getInstantFromTimestamp(resultSet, "valid_from_date")); - object.setValidToDate(getInstantFromTimestamp(resultSet, "valid_to_date")); + object.setValidFromDate(getLocalDateFromSqlDate(resultSet, "valid_from_date")); + object.setValidToDate(getLocalDateFromSqlDate(resultSet, "valid_to_date")); object.setLink(resultSet.getObject("LINK", String.class)); return object; } @@ -60,15 +60,15 @@ public class ProfileDocumentMapStore extends TemplateMapStore { resultSet.getId(), resultSet.getCompanyId(), resultSet.getDocumentType(), - TimeUtil.toDateFromInstant(resultSet.getIssueDate()), + TimeUtil.toDateFromLocalDate(resultSet.getIssueDate()), resultSet.getIssuePlace(), resultSet.getIssuer(), resultSet.getIssuerCode(), resultSet.getName(), resultSet.getNumber(), resultSet.getPlace(), - TimeUtil.toDateFromInstant(resultSet.getValidFromDate()), - TimeUtil.toDateFromInstant(resultSet.getValidToDate()), + TimeUtil.toDateFromLocalDate(resultSet.getValidFromDate()), + TimeUtil.toDateFromLocalDate(resultSet.getValidToDate()), resultSet.getLink() }; return args; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf04MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf04MapStore.java index bfd65f662..b2cd9d2fd 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf04MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf04MapStore.java @@ -5,6 +5,7 @@ import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.sdf.SDf04; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.base.TemplateMapStore; +import ru.spcex.platform.utils.time.TimeUtil; import java.sql.ResultSet; import java.sql.SQLException; @@ -145,7 +146,7 @@ public class SDf04MapStore extends TemplateMapStore { object.getDoc_result(), object.getImp_result(), object.getFile_name(), - object.getGenerationTime(), + TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId() }; return args; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf09MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf09MapStore.java index c91ec5b82..34a9269b3 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf09MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf09MapStore.java @@ -5,6 +5,7 @@ import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.sdf.SDf09; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.base.TemplateMapStore; +import ru.spcex.platform.utils.time.TimeUtil; import java.math.BigDecimal; import java.sql.ResultSet; @@ -41,6 +42,7 @@ public class SDf09MapStore extends TemplateMapStore { object.setId(resultSet.getObject("ID", Long.class)); object.setAccount(resultSet.getString("ACCOUNT")); object.setSum(resultSet.getObject("SUM", BigDecimal.class)); + object.setMarket(resultSet.getString("MARKET")); object.setType(resultSet.getString("TYPE")); object.setNumber(resultSet.getObject("NUMBER", BigDecimal.class)); object.setInn(resultSet.getObject("_I_N_N", BigDecimal.class)); @@ -56,11 +58,12 @@ public class SDf09MapStore extends TemplateMapStore { object.getId(), object.getAccount(), object.getSum(), + object.getMarket(), object.getType(), object.getNumber(), object.getInn(), object.getFileName(), - object.getGenerationTime(), + TimeUtil.toDateFromInstant(object.getGenerationTime()), object.getGenerationId() }; return args; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf10MapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf10MapStore.java index d6cfa16df..bb0ef14bd 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf10MapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SDf10MapStore.java @@ -41,6 +41,7 @@ public class SDf10MapStore extends TemplateMapStore { SDf10 object = new SDf10(); object.setId(resultSet.getObject("ID", Long.class)); object.setAccount(resultSet.getObject("ACCOUNT", String.class)); + object.setSum(resultSet.getObject("SUM", BigDecimal.class)); object.setMarket(resultSet.getObject("MARKET", String.class)); object.setType(resultSet.getObject("TYPE", String.class)); object.setNumber(resultSet.getObject("NUMBER", BigDecimal.class)); @@ -57,6 +58,7 @@ public class SDf10MapStore extends TemplateMapStore { Object[] args = new Object[]{ object.getId(), object.getAccount(), + object.getSum(), object.getMarket(), object.getType(), object.getNumber(), 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 index 6071dbd9a..b72be8e6f 100644 --- 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 @@ -30,7 +30,7 @@ public class SchedulerAllTodayMapStore extends TemplateMapStore { } public static class SettingOperation { - private static String methodName; - private static Class[] parameterTypes; - private static Object[] params; + private final String methodName; + private final Class[] parameterTypes; + private final Object[] params; //сеттер для полей значения которых обрезаются при вставке в БД public SettingOperation(String methodName, Class[] parameterTypes, Object[] params) { - SettingOperation.methodName = methodName; - SettingOperation.parameterTypes = parameterTypes; - SettingOperation.params = params; + this.methodName = methodName; + this.parameterTypes = parameterTypes; + this.params = params; } public String getMethodName() { diff --git a/clearing-parent/imdg/src/test/java/ru/spcex/clearing/imdg/structure/RunnableMapNamesForTesting.java b/clearing-parent/imdg/src/test/java/ru/spcex/clearing/imdg/structure/RunnableMapNamesForTesting.java index 6e7e9b50c..153812e43 100644 --- a/clearing-parent/imdg/src/test/java/ru/spcex/clearing/imdg/structure/RunnableMapNamesForTesting.java +++ b/clearing-parent/imdg/src/test/java/ru/spcex/clearing/imdg/structure/RunnableMapNamesForTesting.java @@ -3,20 +3,24 @@ package ru.spcex.clearing.imdg.structure; import ru.clearing.classes.statics.data.account.*; import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.CompanyHistory; +import ru.clearing.classes.statics.data.company.CompanyRoleSet; +import ru.clearing.classes.statics.data.company.CompanySymbols; import ru.clearing.classes.statics.data.company.relation.Relation; import ru.clearing.classes.statics.data.company.relation.RelationHistory; +import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; +import ru.clearing.classes.statics.data.journal.InDocumentJournal; +import ru.clearing.classes.statics.data.journal.OutDocumentJournal; import ru.clearing.classes.statics.data.messages.ErrorText; -import ru.clearing.classes.statics.data.scheduler.Scheduler; -import ru.clearing.classes.statics.data.scheduler.TaskRunner; -import ru.clearing.classes.statics.data.scheduler.Timetable; -import ru.clearing.classes.statics.data.scheduler.TradingCalendar; +import ru.clearing.classes.statics.data.misc.KeyRate; +import ru.clearing.classes.statics.data.misc.MoneyMarketSecurity; +import ru.clearing.classes.statics.data.profile.Contact; +import ru.clearing.classes.statics.data.profile.ProfileDocument; +import ru.clearing.classes.statics.data.scheduler.*; +import ru.clearing.classes.statics.data.sdf.*; import ru.clearing.classes.statics.data.security.Security; import ru.clearing.classes.statics.data.security.SecurityHistory; import ru.clearing.classes.statics.data.statement.Statement; -import ru.clearing.classes.statics.data.user.User; -import ru.clearing.classes.statics.data.user.UserConnect; -import ru.clearing.classes.statics.data.user.UserConnectHistory; -import ru.clearing.classes.statics.data.user.UserHistory; +import ru.clearing.classes.statics.data.user.*; import ru.clearing.platform.dictionary.*; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.structure.BusinessObjectAndBusinessEventForCheckMapStore.SettingOperation; @@ -109,5 +113,36 @@ public class RunnableMapNamesForTesting { //object businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_AccountRouting, AccountRouting.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_BankAccount, BankAccount.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_ClearingMemberCategory, ClearingMemberCategory.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_CompanyRoleSet, CompanyRoleSet.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_Contact, Contact.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_InDocumentJournal, InDocumentJournal.class, + new SettingOperation("setAmount", new Class[]{BigDecimal.class}, new Object[]{new BigDecimal("23.22")}))); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_InformationAccount, InformationAccount.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_KeyRate, KeyRate.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_MoneyMarketSecurity, MoneyMarketSecurity.class, + new SettingOperation("setNominalValue", new Class[]{BigDecimal.class}, new Object[]{new BigDecimal("23.22")}))); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_OutDocumentJournal, OutDocumentJournal.class, + new SettingOperation("setAmount", new Class[]{BigDecimal.class}, new Object[]{new BigDecimal("23.22")}))); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_ProfileDocument, ProfileDocument.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_SchedulerAllToday, SchedulerAllToday.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_SDf01, SDf01.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_SDf02, SDf02.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_SDf03, SDf03.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_SDf04, SDf04.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_SDf05, SDf05.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_SDf08, SDf08.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_SDf09, SDf09.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_SDf10, SDf10.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_SDf11, SDf11.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_SDf12, SDf12.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_SDf13, SDf13.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_SDf16, SDf16.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_SDf17, SDf17.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_SDf18, SDf18.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_UserRoleSession, UserRoleSession.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_UserSettings, UserSettings.class)); } }