diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditClearingMemberCategoryController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditClearingMemberCategoryController.java index e7f84d5b6..8d4f64ae4 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditClearingMemberCategoryController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditClearingMemberCategoryController.java @@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; -import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; +import ru.clearing.classes.statics.data.company.ClearingMemberCategory; import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController; import ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction; import ru.spcex.clearing.backendapi.controller.request.cud.company.ClearingMemberCategoryNewAction; diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/ClearingMemberCategoryBackendGetAll.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/ClearingMemberCategoryBackendGetAll.java index 18a5a4335..6d98ce5e2 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/ClearingMemberCategoryBackendGetAll.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/ClearingMemberCategoryBackendGetAll.java @@ -3,7 +3,7 @@ package ru.spcex.clearing.backendapi.controller.response.entity.company; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; +import ru.clearing.classes.statics.data.company.ClearingMemberCategory; import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse; import java.util.ArrayList; diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.xml b/clearing-parent/backend-api/src/main/resources/meta/meta.xml index 4b220a528..1e1012672 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml @@ -421,7 +421,7 @@ - + diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditClearingMemberCategoryControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditClearingMemberCategoryControllerTest.java index 1126570ca..116f90605 100644 --- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditClearingMemberCategoryControllerTest.java +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditClearingMemberCategoryControllerTest.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; import org.springframework.core.NestedExceptionUtils; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; +import ru.clearing.classes.statics.data.company.ClearingMemberCategory; import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest; import ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction; import ru.spcex.clearing.backendapi.controller.request.cud.company.ClearingMemberCategoryNewAction; diff --git a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/AccountBalanceService.java b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/AccountBalanceService.java index ea7db2f9b..d10e23a02 100644 --- a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/AccountBalanceService.java +++ b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/AccountBalanceService.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.account.Account; import ru.clearing.classes.statics.data.account.AccountBalance; import ru.clearing.classes.statics.data.company.Company; -import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; +import ru.clearing.classes.statics.data.company.ClearingMemberCategory; import ru.spcex.clearing.balance.validation.AccountBalanceValidation; import ru.spcex.clearing.balance.validation.ValidationStored; import ru.spcex.clearing.imdg.IMDGDistributedNames; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/generated/ClearingMemberCategory.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/ClearingMemberCategory.java similarity index 90% rename from clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/generated/ClearingMemberCategory.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/ClearingMemberCategory.java index a9c962512..f009fa5db 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/generated/ClearingMemberCategory.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/ClearingMemberCategory.java @@ -1,4 +1,4 @@ -package ru.clearing.classes.statics.data.generated; +package ru.clearing.classes.statics.data.company; import ru.clearing.classes.ConstSerializable; import ru.spcex.platform.classes.base.SpcexObjectBase; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/ClearingMemberCategoryHistory.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/ClearingMemberCategoryHistory.java new file mode 100644 index 000000000..6260aa3d4 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/ClearingMemberCategoryHistory.java @@ -0,0 +1,26 @@ +package ru.clearing.classes.statics.data.company; + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessEvent; + +import java.io.Serial; + +/** + * DB: CLEARING_MEMBER_CATEGORY_HISTORY + */ +public class ClearingMemberCategoryHistory extends BusinessEvent { + @Serial + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private ClearingMemberCategory object; + + @Override + public ClearingMemberCategory getObject() { + return object; + } + + @Override + public void setObject(ClearingMemberCategory object) { + this.object = object; + } +} \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/CompanySymbolsHistory.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/CompanySymbolsHistory.java new file mode 100644 index 000000000..97e9babf0 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/CompanySymbolsHistory.java @@ -0,0 +1,27 @@ +package ru.clearing.classes.statics.data.company; + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessEvent; + +import java.io.Serial; + +/** + * DB: COMPANY_SYMBOLS_HISTORY + */ +public class CompanySymbolsHistory extends BusinessEvent { + + @Serial + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private CompanySymbols object; + + @Override + public CompanySymbols getObject() { + return object; + } + + @Override + public void setObject(CompanySymbols object) { + this.object = object; + } +} diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/instrument/issue/CouponPeriodHistory.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/instrument/issue/CouponPeriodHistory.java new file mode 100644 index 000000000..a06c672e7 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/instrument/issue/CouponPeriodHistory.java @@ -0,0 +1,26 @@ +package ru.clearing.classes.statics.data.instrument.issue; + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessEvent; + +import java.io.Serial; + +/** + * DB: COUPON_PERIOD_HISTORY + */ +public class CouponPeriodHistory extends BusinessEvent { + @Serial + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private CouponPeriod object; + + @Override + public CouponPeriod getObject() { + return object; + } + + @Override + public void setObject(CouponPeriod object) { + this.object = object; + } +} diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/instrument/issue/EquitySecurityHistory.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/instrument/issue/EquitySecurityHistory.java new file mode 100644 index 000000000..b5065b978 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/instrument/issue/EquitySecurityHistory.java @@ -0,0 +1,23 @@ +package ru.clearing.classes.statics.data.instrument.issue; + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessEvent; + +import java.io.Serial; + +public class EquitySecurityHistory extends BusinessEvent { + @Serial + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private EquitySecurity object; + + @Override + public EquitySecurity getObject() { + return object; + } + + @Override + public void setObject(EquitySecurity object) { + this.object = object; + } +} diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/instrument/issue/FixedIncomeCashFlowHistory.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/instrument/issue/FixedIncomeCashFlowHistory.java new file mode 100644 index 000000000..d3c6c591f --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/instrument/issue/FixedIncomeCashFlowHistory.java @@ -0,0 +1,23 @@ +package ru.clearing.classes.statics.data.instrument.issue; + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessEvent; + +import java.io.Serial; + +public class FixedIncomeCashFlowHistory extends BusinessEvent { + @Serial + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private FixedIncomeCashFlow object; + + @Override + public FixedIncomeCashFlow getObject() { + return object; + } + + @Override + public void setObject(FixedIncomeCashFlow object) { + this.object = object; + } +} diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/instrument/issue/FixedIncomeSecurityHistory.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/instrument/issue/FixedIncomeSecurityHistory.java new file mode 100644 index 000000000..0c081e1da --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/instrument/issue/FixedIncomeSecurityHistory.java @@ -0,0 +1,23 @@ +package ru.clearing.classes.statics.data.instrument.issue; + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessEvent; + +import java.io.Serial; + +public class FixedIncomeSecurityHistory extends BusinessEvent { + @Serial + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private FixedIncomeSecurity object; + + @Override + public FixedIncomeSecurity getObject() { + return object; + } + + @Override + public void setObject(FixedIncomeSecurity object) { + this.object = object; + } +} diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/MoneyMarketSecurityHistory.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/MoneyMarketSecurityHistory.java new file mode 100644 index 000000000..f24b02f70 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/MoneyMarketSecurityHistory.java @@ -0,0 +1,26 @@ +package ru.clearing.classes.statics.data.misc; + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessEvent; + +import java.io.Serial; + +/** + * DB table: MONEY_MARKET_SECURITY_HISTORY + **/ +public class MoneyMarketSecurityHistory extends BusinessEvent { + @Serial + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private MoneyMarketSecurity object; + + @Override + public MoneyMarketSecurity getObject() { + return object; + } + + @Override + public void setObject(MoneyMarketSecurity object) { + this.object = object; + } +} diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/profile/ProfileDocumentHistory.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/profile/ProfileDocumentHistory.java new file mode 100644 index 000000000..c58e9108a --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/profile/ProfileDocumentHistory.java @@ -0,0 +1,27 @@ +package ru.clearing.classes.statics.data.profile; + + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessEvent; + +import java.io.Serial; + +/** + * DB: PROFILE_DOCUMENT_HISTORY + */ +public class ProfileDocumentHistory extends BusinessEvent { + @Serial + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private ProfileDocument object; + + @Override + public ProfileDocument getObject() { + return object; + } + + @Override + public void setObject(ProfileDocument object) { + this.object = object; + } +} \ No newline at end of file diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/SortingConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/SortingConfig.java index b45a0085d..b84cc8e95 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/SortingConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/SortingConfig.java @@ -3,7 +3,7 @@ package ru.spcex.clearing.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; +import ru.clearing.classes.statics.data.company.ClearingMemberCategory; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.platform.enumeration.ClearingCategory; import ru.spcex.platform.imdg.api.Imdg; diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/Clearing.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/Clearing.java index 7dcbd75a6..3e97acbb6 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/Clearing.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/Clearing.java @@ -5,7 +5,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import ru.clearing.classes.statics.data.execution.ExecutionDeposit; -import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; +import ru.clearing.classes.statics.data.company.ClearingMemberCategory; import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsMoney; import ru.clearing.classes.statics.data.payment.PaymentInstruction; diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/SdfCreatorBySTLDPayment.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/SdfCreatorBySTLDPayment.java index 22f2c9c4e..8d49ef72e 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/SdfCreatorBySTLDPayment.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/SdfCreatorBySTLDPayment.java @@ -5,7 +5,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.company.Company; -import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; +import ru.clearing.classes.statics.data.company.ClearingMemberCategory; import ru.clearing.classes.statics.data.payment.PaymentInstruction; import ru.clearing.classes.statics.data.sdf.SDf03; import ru.clearing.classes.statics.data.sdf.SDf11; diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/order/PaymentInstructionSorter.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/order/PaymentInstructionSorter.java index 031bcf128..1fa43982d 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/order/PaymentInstructionSorter.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/order/PaymentInstructionSorter.java @@ -5,7 +5,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.account.Account; -import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; +import ru.clearing.classes.statics.data.company.ClearingMemberCategory; import ru.clearing.classes.statics.data.payment.PaymentInstruction; import ru.spcex.clearing.error.ClearingError; import ru.spcex.clearing.imdg.IMDGDistributedNames; diff --git a/clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/service/ClearingServiceTest.java b/clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/service/ClearingServiceTest.java index e2964030e..4ca6ad3cc 100644 --- a/clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/service/ClearingServiceTest.java +++ b/clearing-parent/clearing-service/src/test/java/ru/spcex/clearing/service/ClearingServiceTest.java @@ -9,7 +9,7 @@ import ru.clearing.classes.statics.data.account.AccountBalance; import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.relation.Relation; import ru.clearing.classes.statics.data.execution.ExecutionDeposit; -import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; +import ru.clearing.classes.statics.data.company.ClearingMemberCategory; import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsMoney; import ru.clearing.classes.statics.data.payment.PaymentInstruction; diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ClearingMemberCategoryValidationConfig.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ClearingMemberCategoryValidationConfig.java index d1c44aa66..573a2793c 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ClearingMemberCategoryValidationConfig.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ClearingMemberCategoryValidationConfig.java @@ -3,7 +3,7 @@ package ru.spcex.clearing.company.config.validation; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import ru.clearing.classes.statics.data.company.Company; -import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; +import ru.clearing.classes.statics.data.company.ClearingMemberCategory; import ru.clearing.platform.dictionary.ClearingCategoryDictionary; import ru.spcex.clearing.company.error.CompanyErrors; import ru.spcex.clearing.imdg.IMDGDistributedNames; diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ValidationConfig.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ValidationConfig.java index a076fa999..597365270 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ValidationConfig.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/ValidationConfig.java @@ -4,7 +4,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.CompanySymbols; -import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; +import ru.clearing.classes.statics.data.company.ClearingMemberCategory; import ru.clearing.classes.statics.data.profile.Contact; import ru.clearing.classes.statics.data.profile.ProfileDocument; import ru.clearing.platform.dictionary.*; diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClearingMemberCategoryService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClearingMemberCategoryService.java index b777d0a1e..15551060b 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClearingMemberCategoryService.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClearingMemberCategoryService.java @@ -8,7 +8,7 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; -import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; +import ru.clearing.classes.statics.data.company.ClearingMemberCategory; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.domain.Consts; diff --git a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClearingMemberCategoryServiceTest.java b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClearingMemberCategoryServiceTest.java index 25a487333..3902be6aa 100644 --- a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClearingMemberCategoryServiceTest.java +++ b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClearingMemberCategoryServiceTest.java @@ -14,7 +14,7 @@ import org.springframework.boot.test.mock.mockito.SpyBean; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; import ru.clearing.classes.statics.data.company.Company; -import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; +import ru.clearing.classes.statics.data.company.ClearingMemberCategory; import ru.clearing.platform.dictionary.ClearingCategoryDictionary; import ru.spcex.clearing.company.config.BeanConfiguration; import ru.spcex.clearing.company.config.validation.ClearingMemberCategoryValidationConfig; diff --git a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyServiceTest.java b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyServiceTest.java index 1eb67af79..85af35dc6 100644 --- a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyServiceTest.java +++ b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyServiceTest.java @@ -15,7 +15,7 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.CompanySymbols; -import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; +import ru.clearing.classes.statics.data.company.ClearingMemberCategory; import ru.clearing.platform.dictionary.CompanySymbolDictionary; import ru.clearing.platform.dictionary.WorkflowStatusDictionary; import ru.spcex.clearing.company.config.BeanConfiguration; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/ClearingMemberCategoryHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/ClearingMemberCategoryHistoryMapStore.java new file mode 100644 index 000000000..728799b99 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/ClearingMemberCategoryHistoryMapStore.java @@ -0,0 +1,49 @@ +package ru.spcex.clearing.imdg.businessevent; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.company.ClearingMemberCategory; +import ru.clearing.classes.statics.data.company.ClearingMemberCategoryHistory; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.imdg.base.TemplateEventMapStore; + +@Component +public class ClearingMemberCategoryHistoryMapStore extends TemplateEventMapStore { + + public ClearingMemberCategoryHistoryMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_ClearingMemberCategoryHistory; + } + + @Override + public String getTableName() { + return "CLEARING_MEMBER_CATEGORY_HISTORY"; + } + + @Override + public String[] getFields() { + return new String[]{"ID", "EVENT_TIME", "EVENT_USER_ID", "EVENT_TYPE", + "CLEARING_MEMBER_CATEGORY_ID", "COMPANY_ID", "CLEARING_MEMBER_CATEGORY" + }; + } + + @Override + public Object[] objectToField(ClearingMemberCategoryHistory historyLog) { + ClearingMemberCategory object = historyLog.getObject(); + Object[] args = new Object[]{ + historyLog.getId(), + historyLog.getEventTime(), + historyLog.getUserId(), + historyLog.getEventType(), + + object.getId(), + object.getCompanyId(), + object.getClearingMemberCategory() + }; + return args; + } +} diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CompanySymbolsHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CompanySymbolsHistoryMapStore.java new file mode 100644 index 000000000..e145db919 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CompanySymbolsHistoryMapStore.java @@ -0,0 +1,50 @@ +package ru.spcex.clearing.imdg.businessevent; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.company.CompanySymbols; +import ru.clearing.classes.statics.data.company.CompanySymbolsHistory; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.imdg.base.TemplateEventMapStore; + +@Component +public class CompanySymbolsHistoryMapStore extends TemplateEventMapStore { + + public CompanySymbolsHistoryMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_CompanySymbolsHistory; + } + + @Override + public String getTableName() { + return "COMPANY_SYMBOLS_HISTORY"; + } + + @Override + public String[] getFields() { + return new String[]{"ID", "EVENT_TIME", "EVENT_USER_ID", "EVENT_TYPE", + "company_symbols_id", "company_id", "company_symbol", "company_symbol_value" + }; + } + + @Override + public Object[] objectToField(CompanySymbolsHistory historyLog) { + CompanySymbols object = historyLog.getObject(); + Object[] args = new Object[]{ + historyLog.getId(), + historyLog.getEventTime(), + historyLog.getUserId(), + historyLog.getEventType(), + + object.getId(), + object.getCompanyId(), + object.getCompanySymbol(), + object.getCompanySymbolValue() + }; + return args; + } +} diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CouponPeriodHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CouponPeriodHistoryMapStore.java new file mode 100644 index 000000000..0bcc6d6d9 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CouponPeriodHistoryMapStore.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.instrument.issue.CouponPeriod; +import ru.clearing.classes.statics.data.instrument.issue.CouponPeriodHistory; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.imdg.base.TemplateEventMapStore; +import ru.spcex.platform.utils.time.TimeUtil; + +@Component +public class CouponPeriodHistoryMapStore extends TemplateEventMapStore { + + public CouponPeriodHistoryMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_CouponPeriodHistory; + } + + @Override + public String getTableName() { + return "COUPON_PERIOD_HISTORY"; + } + + @Override + public String[] getFields() { + return new String[]{"ID", "EVENT_TIME", "EVENT_USER_ID", "EVENT_TYPE", + "COUPON_PERIOD_ID", "SECURITY_ID", "COUPON_RATE", "NUMBER", "PERIOD_END_DATE", "PERIOD_START_DATE" + }; + } + + @Override + public Object[] objectToField(CouponPeriodHistory historyLog) { + CouponPeriod object = historyLog.getObject(); + Object[] args = new Object[]{ + historyLog.getId(), + historyLog.getEventTime(), + historyLog.getUserId(), + historyLog.getEventType(), + + object.getId(), + object.getSecurityId(), + object.getCouponRate(), + object.getNumber(), + TimeUtil.toDateFromLocalDate(object.getPeriodEndDate()), + TimeUtil.toDateFromLocalDate(object.getPeriodStartDate()), + }; + return args; + } +} diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/EquitySecurityHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/EquitySecurityHistoryMapStore.java new file mode 100644 index 000000000..5c4af9ad2 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/EquitySecurityHistoryMapStore.java @@ -0,0 +1,107 @@ +package ru.spcex.clearing.imdg.businessevent; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.instrument.issue.EquitySecurity; +import ru.clearing.classes.statics.data.instrument.issue.EquitySecurityHistory; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.imdg.base.TemplateEventMapStore; +import ru.spcex.platform.utils.time.TimeUtil; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@Component +public class EquitySecurityHistoryMapStore extends TemplateEventMapStore { + + public EquitySecurityHistoryMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_EquitySecurityHistory; + } + + @Override + public String getTableName() { + return "EQUITY_SECURITY_HISTORY"; + } + + + @Override + public String[] getFields() { + return new String[]{ + "ID", "EVENT_TIME", "EVENT_USER_ID", "EVENT_TYPE", + "EQUITY_SECURITY_ID", "SECURITY_ID", "SHARE_TYPE"}; + } + + public String[] getFieldsSecurity() { + return new String[]{ + "ID", "EVENT_TIME", "EVENT_USER_ID", "EVENT_TYPE", + "SECURITY_ID", "CREATED_AT", "UPDATED_AT", "INSTRUMENT_TYPE", "ISSUER_ID", "SHORT_NAME", "FULL_NAME", "SHORT_NAME_ENG", "FULL_NAME_ENG", "SECURITY_SYMBOL", "ISIN", "WORKFLOW_STATUS"}; + } + + private final String insertToSecurityStatement = makeInsertSql("SECURITY", + getFieldsSecurity(), "id"); + + + @Override + protected Object[] objectToField(EquitySecurityHistory historyLog) { + EquitySecurity equitySecurity = historyLog.getObject(); + Object[] args = new Object[]{ + historyLog.getId(), + historyLog.getEventTime(), + historyLog.getUserId(), + historyLog.getEventType(), + + equitySecurity.getId(), + equitySecurity.getSecurityId(), + equitySecurity.getShareType() + }; + return args; + } + + protected Object[] securityField(EquitySecurityHistory historyLog) { + EquitySecurity object = historyLog.getObject(); + Object[] args = new Object[]{ + historyLog.getId(), + historyLog.getEventTime(), + historyLog.getUserId(), + historyLog.getEventType(), + + object.getSecurityId(), + TimeUtil.toDateFromInstant(object.getCreated()), + TimeUtil.toDateFromInstant(object.getUpdated()), + object.getInstrumentType(), + object.getIssuerId(), + object.getShortName(), + object.getFullName(), + object.getShortNameEng(), + object.getFullNameEng(), + object.getSecuritySymbol(), + object.getIsin(), + object.getWorkflowStatus() + }; + return args; + } + + @Override + public void store(Map map) { + List moneyMarketArgs = new ArrayList<>(); + List securityArgs = new ArrayList<>(); + + for (Map.Entry entry : map.entrySet()) { + EquitySecurityHistory obj = entry.getValue(); + Object[] args = objectToField(obj); + if (args.length != validateSize) { + throw new IllegalArgumentException("objectToField return " + args.length + " arguments, but expected " + validateSize); + } + moneyMarketArgs.add(args); + securityArgs.add(securityField(obj)); + } + batchInsertUpdate(insertStatement, moneyMarketArgs); + batchInsertUpdate(insertToSecurityStatement, securityArgs); + } +} diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/FixedIncomeCashFlowHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/FixedIncomeCashFlowHistoryMapStore.java new file mode 100644 index 000000000..23039f283 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/FixedIncomeCashFlowHistoryMapStore.java @@ -0,0 +1,57 @@ +package ru.spcex.clearing.imdg.businessevent; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.instrument.issue.FixedIncomeCashFlow; +import ru.clearing.classes.statics.data.instrument.issue.FixedIncomeCashFlowHistory; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.imdg.base.TemplateEventMapStore; +import ru.spcex.platform.utils.time.TimeUtil; + + +@Component +public class FixedIncomeCashFlowHistoryMapStore extends TemplateEventMapStore { + + public FixedIncomeCashFlowHistoryMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_FixedIncomeCashFlowHistory; + } + + @Override + public String getTableName() { + return "FIXED_INCOME_CASH_FLOW_HISTORY"; + } + + + @Override + public String[] getFields() { + return new String[]{ + "ID", "EVENT_TIME", "EVENT_USER_ID", "EVENT_TYPE", + "FIXED_INCOME_CASH_FLOW_ID", "SECURITY_ID", "ACCRUED_COUPON", "NOMINAL_VALUE", "NUMBER", "VALUE_DATE" + }; + } + + @Override + protected Object[] objectToField(FixedIncomeCashFlowHistory historyLog) { + FixedIncomeCashFlow fixedIncomeCashFlow = historyLog.getObject(); + Object[] args = new Object[]{ + historyLog.getId(), + historyLog.getEventTime(), + historyLog.getUserId(), + historyLog.getEventType(), + + fixedIncomeCashFlow.getId(), + fixedIncomeCashFlow.getSecurityId(), + fixedIncomeCashFlow.getAccruedCoupon(), + fixedIncomeCashFlow.getNominalValue(), + fixedIncomeCashFlow.getNumber(), + TimeUtil.toDateFromLocalDate(fixedIncomeCashFlow.getValueDate()), + }; + return args; + } + +} diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/FixedIncomeSecurityHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/FixedIncomeSecurityHistoryMapStore.java new file mode 100644 index 000000000..cfa67916d --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/FixedIncomeSecurityHistoryMapStore.java @@ -0,0 +1,113 @@ +package ru.spcex.clearing.imdg.businessevent; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.instrument.issue.FixedIncomeSecurity; +import ru.clearing.classes.statics.data.instrument.issue.FixedIncomeSecurityHistory; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.imdg.base.TemplateEventMapStore; +import ru.spcex.platform.utils.time.TimeUtil; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@Component +public class FixedIncomeSecurityHistoryMapStore extends TemplateEventMapStore { + + public FixedIncomeSecurityHistoryMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_FixedIncomeSecurityHistory; + } + + @Override + public String getTableName() { + return "FIXED_INCOME_SECURITY_HISTORY"; + } + + + @Override + public String[] getFields() { + return new String[]{ + "ID", "EVENT_TIME", "EVENT_USER_ID", "EVENT_TYPE", + "FIXED_INCOME_SECURITY_ID", "SECURITY_ID", "BOND_TYPE", "MATURITY_DATE", "NOMINAL_VALUE", "NOMINAL_CURRENCY", "COUPON", "COUPON_FREQUENCY" + }; + } + + public String[] getFieldsSecurity() { + return new String[]{ + "ID", "EVENT_TIME", "EVENT_USER_ID", "EVENT_TYPE", + "SECURITY_ID", "CREATED_AT", "UPDATED_AT", "INSTRUMENT_TYPE", "ISSUER_ID", "SHORT_NAME", "FULL_NAME", "SHORT_NAME_ENG", "FULL_NAME_ENG", "SECURITY_SYMBOL", "ISIN", "WORKFLOW_STATUS"}; + } + + private final String insertToSecurityStatement = makeInsertSql("SECURITY", + getFieldsSecurity(), "id"); + + + @Override + protected Object[] objectToField(FixedIncomeSecurityHistory historyLog) { + FixedIncomeSecurity fixedIncomeSecurity = historyLog.getObject(); + Object[] args = new Object[]{ + historyLog.getId(), + historyLog.getEventTime(), + historyLog.getUserId(), + historyLog.getEventType(), + + fixedIncomeSecurity.getId(), + fixedIncomeSecurity.getSecurityId(), + fixedIncomeSecurity.getBondType(), + TimeUtil.toDateFromLocalDate(fixedIncomeSecurity.getMaturityDate()), + fixedIncomeSecurity.getNominalValue(), + fixedIncomeSecurity.getNominalCurrency(), + fixedIncomeSecurity.getCoupon(), + fixedIncomeSecurity.getCouponFrequency() + }; + return args; + } + + protected Object[] securityField(FixedIncomeSecurityHistory historyLog) { + FixedIncomeSecurity object = historyLog.getObject(); + Object[] args = new Object[]{ + historyLog.getId(), + historyLog.getEventTime(), + historyLog.getUserId(), + historyLog.getEventType(), + + object.getSecurityId(), + TimeUtil.toDateFromInstant(object.getCreated()), + TimeUtil.toDateFromInstant(object.getUpdated()), + object.getInstrumentType(), + object.getIssuerId(), + object.getShortName(), + object.getFullName(), + object.getShortNameEng(), + object.getFullNameEng(), + object.getSecuritySymbol(), + object.getIsin(), + object.getWorkflowStatus() + }; + return args; + } + + @Override + public void store(Map map) { + List moneyMarketArgs = new ArrayList<>(); + List securityArgs = new ArrayList<>(); + + for (Map.Entry entry : map.entrySet()) { + FixedIncomeSecurityHistory obj = entry.getValue(); + Object[] args = objectToField(obj); + if (args.length != validateSize) { + throw new IllegalArgumentException("objectToField return " + args.length + " arguments, but expected " + validateSize); + } + moneyMarketArgs.add(args); + securityArgs.add(securityField(obj)); + } + batchInsertUpdate(insertStatement, moneyMarketArgs); + batchInsertUpdate(insertToSecurityStatement, securityArgs); + } +} diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/MoneyMarketSecurityHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/MoneyMarketSecurityHistoryMapStore.java new file mode 100644 index 000000000..56ca67880 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/MoneyMarketSecurityHistoryMapStore.java @@ -0,0 +1,112 @@ +package ru.spcex.clearing.imdg.businessevent; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.clearing.classes.statics.data.misc.MoneyMarketSecurity; +import ru.clearing.classes.statics.data.misc.MoneyMarketSecurityHistory; +import ru.spcex.clearing.imdg.base.TemplateEventMapStore; +import ru.spcex.platform.utils.time.TimeUtil; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@Component +public class MoneyMarketSecurityHistoryMapStore extends TemplateEventMapStore { + + public MoneyMarketSecurityHistoryMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_MoneyMarketSecurityHistory; + } + + @Override + public String getTableName() { + return "MONEY_MARKET_SECURITY_HISTORY"; + } + + + @Override + public String[] getFields() { + return new String[]{ + "ID", "EVENT_TIME", "EVENT_USER_ID", "EVENT_TYPE", + "MONEY_MARKET_SECURITY_ID", "SECURITY_ID", "DESCRIPTION", "START_DATE", "END_DATE", "NOMINAL_VALUE", "NOMINAL_CURRENCY", "TERM_TYPE"}; + } + + public String[] getFieldsSecurity() { + return new String[]{ + "ID", "EVENT_TIME", "EVENT_USER_ID", "EVENT_TYPE", + "SECURITY_ID", "CREATED_AT", "UPDATED_AT", "INSTRUMENT_TYPE", "ISSUER_ID", "SHORT_NAME", "FULL_NAME", "SHORT_NAME_ENG", "FULL_NAME_ENG", "SECURITY_SYMBOL", "ISIN", "WORKFLOW_STATUS"}; + } + + private final String insertToSecurityStatement = makeInsertSql("SECURITY", + getFieldsSecurity(), "id"); + + + @Override + protected Object[] objectToField(MoneyMarketSecurityHistory historyLog) { + MoneyMarketSecurity moneyMarketSecurity = historyLog.getObject(); + Object[] args = new Object[]{ + historyLog.getId(), + historyLog.getEventTime(), + historyLog.getUserId(), + historyLog.getEventType(), + + moneyMarketSecurity.getId(), + moneyMarketSecurity.getSecurityId(), + moneyMarketSecurity.getDescription(), + TimeUtil.toDateFromLocalDate(moneyMarketSecurity.getStartDate()), + TimeUtil.toDateFromLocalDate(moneyMarketSecurity.getEndDate()), + moneyMarketSecurity.getNominalValue(), + moneyMarketSecurity.getNominalCurrency(), + moneyMarketSecurity.getTermType() + }; + return args; + } + + protected Object[] securityField(MoneyMarketSecurityHistory historyLog) { + MoneyMarketSecurity object = historyLog.getObject(); + Object[] args = new Object[]{ + historyLog.getId(), + historyLog.getEventTime(), + historyLog.getUserId(), + historyLog.getEventType(), + + object.getSecurityId(), + TimeUtil.toDateFromInstant(object.getCreated()), + TimeUtil.toDateFromInstant(object.getUpdated()), + object.getInstrumentType(), + object.getIssuerId(), + object.getShortName(), + object.getFullName(), + object.getShortNameEng(), + object.getFullNameEng(), + object.getSecuritySymbol(), + object.getIsin(), + object.getWorkflowStatus() + }; + return args; + } + + @Override + public void store(Map map) { + List moneyMarketArgs = new ArrayList<>(); + List securityArgs = new ArrayList<>(); + + for (Map.Entry entry : map.entrySet()) { + MoneyMarketSecurityHistory obj = entry.getValue(); + Object[] args = objectToField(obj); + if (args.length != validateSize) { + throw new IllegalArgumentException("objectToField return " + args.length + " arguments, but expected " + validateSize); + } + moneyMarketArgs.add(args); + securityArgs.add(securityField(obj)); + } + batchInsertUpdate(insertStatement, moneyMarketArgs); + batchInsertUpdate(insertToSecurityStatement, securityArgs); + } +} diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/ProfileDocumentHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/ProfileDocumentHistoryMapStore.java new file mode 100644 index 000000000..b2bf17603 --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/ProfileDocumentHistoryMapStore.java @@ -0,0 +1,61 @@ +package ru.spcex.clearing.imdg.businessevent; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import ru.clearing.classes.statics.data.profile.ProfileDocument; +import ru.clearing.classes.statics.data.profile.ProfileDocumentHistory; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.imdg.base.TemplateEventMapStore; +import ru.spcex.platform.utils.time.TimeUtil; + +@Component +public class ProfileDocumentHistoryMapStore extends TemplateEventMapStore { + + public ProfileDocumentHistoryMapStore(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } + + @Override + public String getMapName() { + return IMDGDistributedNames.Map_ProfileDocumentHistory; + } + + @Override + public String getTableName() { + return "PROFILE_DOCUMENT_HISTORY"; + } + + @Override + public String[] getFields() { + return new String[]{"ID", "EVENT_TIME", "EVENT_USER_ID", "EVENT_TYPE", + "profile_document_id", "company_id", "document_type", "issue_date", "issue_place", "issuer", "issuer_code", + "name", "number", "place", "valid_from_date", "valid_to_date", "link" + }; + } + + @Override + public Object[] objectToField(ProfileDocumentHistory historyLog) { + ProfileDocument object = historyLog.getObject(); + Object[] args = new Object[]{ + historyLog.getId(), + historyLog.getEventTime(), + historyLog.getUserId(), + historyLog.getEventType(), + + object.getId(), + object.getCompanyId(), + object.getDocumentType(), + TimeUtil.toDateFromLocalDate(object.getIssueDate()), + object.getIssuePlace(), + object.getIssuer(), + object.getIssuerCode(), + object.getName(), + object.getNumber(), + object.getPlace(), + TimeUtil.toDateFromLocalDate(object.getValidFromDate()), + TimeUtil.toDateFromLocalDate(object.getValidToDate()), + object.getLink() + }; + return args; + } +} diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/FixedIncomeSecurityMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/FixedIncomeSecurityMapStore.java index 7ff20d516..89ff3e9a8 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/FixedIncomeSecurityMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/FixedIncomeSecurityMapStore.java @@ -85,16 +85,16 @@ public class FixedIncomeSecurityMapStore extends TemplateMapStore(IMDGDistributedNames.Map_InformationAccountHistory, InformationAccountHistory.class)); businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_RelationHistory, RelationHistory.class)); - businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_SecurityHistory, SecurityHistory.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_SecurityHistory, SecurityHistory.class)); // parent table businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_UserConnectHistory, UserConnectHistory.class)); businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_UserHistory, UserHistory.class)); businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_CurrencyHistory, CurrencyHistory.class)); businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_ListingHistory, ListingHistory.class)); businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_MarketHistory, MarketHistory.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_CompanySymbolsHistory, CompanySymbolsHistory.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_ProfileDocumentHistory, ProfileDocumentHistory.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_ClearingMemberCategoryHistory, ClearingMemberCategoryHistory.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_MoneyMarketSecurityHistory, MoneyMarketSecurityHistory.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_EquitySecurityHistory, EquitySecurityHistory.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_FixedIncomeSecurityHistory, FixedIncomeSecurityHistory.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_FixedIncomeCashFlowHistory, FixedIncomeCashFlowHistory.class)); + businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_CouponPeriodHistory, CouponPeriodHistory.class)); //business object businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_AccountBalance, AccountBalance.class)); diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P1_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P1_Collector.java index 2c87bdf45..2daa9d14c 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P1_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P1_Collector.java @@ -4,7 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.CompanySymbols; -import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; +import ru.clearing.classes.statics.data.company.ClearingMemberCategory; import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.reports.reports.bt_17_5.ReportBR_0420312_P1; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P8_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P8_Collector.java index c3aafad83..76f53b9fc 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P8_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420312_P8_Collector.java @@ -4,7 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.CompanySymbols; -import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; +import ru.clearing.classes.statics.data.company.ClearingMemberCategory; import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.clearing.platform.dictionary.CurrencyCodeDictionary; import ru.spcex.clearing.imdg.IMDGDistributedNames; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P1_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P1_Collector.java index 824ddfd32..75e0d3f0c 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P1_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P1_Collector.java @@ -4,7 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.CompanySymbols; -import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; +import ru.clearing.classes.statics.data.company.ClearingMemberCategory; import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.clearing.platform.dictionary.ClearingStatusDictionary; import ru.spcex.clearing.imdg.IMDGDistributedNames; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P1_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P1_Collector.java index 5c0ddb435..3f4f9f381 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P1_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420315_P1_Collector.java @@ -4,7 +4,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.company.Company; -import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; +import ru.clearing.classes.statics.data.company.ClearingMemberCategory; import ru.clearing.classes.statics.data.misc.Listing; import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.clearing.platform.dictionary.ClearingStatusDictionary; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420318_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420318_Collector.java index 2dd08ed64..fa512d506 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420318_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420318_Collector.java @@ -4,7 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.CompanySymbols; -import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; +import ru.clearing.classes.statics.data.company.ClearingMemberCategory; import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsMoney; import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.spcex.clearing.imdg.IMDGDistributedNames; @@ -16,7 +16,6 @@ import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; import java.math.BigDecimal; -import java.time.Instant; import java.time.LocalDate; import java.util.Collection; import java.util.List; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_B_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_B_Collector.java index bc373378d..22f76e2b2 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_B_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_B_Collector.java @@ -1,7 +1,7 @@ package ru.spcex.clearing.reports.services.collector; import org.springframework.stereotype.Component; -import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; +import ru.clearing.classes.statics.data.company.ClearingMemberCategory; import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.reports.reports.bt_12_2.ReportPA_B; diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_IV_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_IV_Collector.java index 159b72c32..c7620a313 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_IV_Collector.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportPA_IV_Collector.java @@ -1,7 +1,7 @@ package ru.spcex.clearing.reports.services.collector; import org.springframework.stereotype.Component; -import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; +import ru.clearing.classes.statics.data.company.ClearingMemberCategory; import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets; import ru.clearing.platform.dictionary.ClearingStatusDictionary; import ru.spcex.clearing.imdg.IMDGDistributedNames; 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 6ddba6e78..ebb948fd2 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 @@ -126,6 +126,14 @@ public final class IMDGDistributedNames { public static final String Map_ShareTypeDictionary = "Map_ShareTypeDictionary"; public static final String Map_BondTypeDictionary = "Map_BondTypeDictionary"; public static final String Map_CurrencyHistory = "Map_CurrencyHistory"; + public static final String Map_MoneyMarketSecurityHistory = "Map_MoneyMarketSecurityHistory"; + public static final String Map_CompanySymbolsHistory = "Map_CompanySymbolsHistory"; + public static final String Map_ProfileDocumentHistory = "Map_ProfileDocumentHistory"; + public static final String Map_ClearingMemberCategoryHistory = "Map_ClearingMemberCategoryHistory"; + public static final String Map_EquitySecurityHistory = "Map_EquitySecurityHistory"; + public static final String Map_FixedIncomeSecurityHistory = "Map_FixedIncomeSecurityHistory"; + public static final String Map_FixedIncomeCashFlowHistory = "Map_FixedIncomeCashFlowHistory"; + public static final String Map_CouponPeriodHistory = "Map_CouponPeriodHistory"; public static final String Map_EquitySecurity = "Map_EquitySecurity"; public static final String Map_FixedIncomeSecurity = "Map_FixedIncomeSecurity"; public static final String Map_FixedIncomeCashFlow = "Map_FixedIncomeCashFlow";