From cf5e6f2c542e102e0d39e7e0c5ac2f7c8cf61cbe Mon Sep 17 00:00:00 2001 From: AKurakin Date: Tue, 6 Sep 2022 15:44:30 +0300 Subject: [PATCH] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-33=20http:/?= =?UTF-8?q?/jira.mfd.msk:8088/browse/CLS-34=20http://jira.mfd.msk:8088/bro?= =?UTF-8?q?wse/CLS-39=20http://jira.mfd.msk:8088/browse/CLS-40=20=D1=80?= =?UTF-8?q?=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D0=BD=D0=B3=20?= =?UTF-8?q?=D0=B8=D0=BC=D1=91=D0=BD=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=BE?= =?UTF-8?q?=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clearing/account/service/BankAccountService.java | 2 +- .../Account => statics/data/account}/Account.java | 2 +- .../data/account}/AccountHistory.java | 2 +- .../data/account}/AccountRouting.java | 2 +- .../data/account}/AccountRoutingHistory.java | 2 +- .../Account => statics/data/account}/BankAccount.java | 2 +- .../data/account}/BankAccountHistory.java | 2 +- .../data/account}/ClearingAccount.java | 2 +- .../data/account}/ClearingAccountHistory.java | 2 +- .../data/account}/InformationAccount.java | 2 +- .../data/account}/InformationAccountHistory.java | 2 +- .../data/company/relation}/Relation.java | 2 +- .../data/company/relation}/RelationHistory.java | 2 +- .../data}/generated/ClearingMemberCategory.java | 2 +- .../company/service/ClearingMemberCategoryService.java | 2 +- .../imdg/businessevent/AccountHistoryMapStore.java | 5 ++--- .../businessevent/AccountRoutingHistoryMapStore.java | 10 ++-------- .../imdg/businessevent/BankAccountHistoryMapStore.java | 6 ++---- .../businessevent/ClearingAccountHistoryMapStore.java | 10 ++-------- .../InformationAccountUpdateMapStore.java | 10 ++-------- .../imdg/businessevent/RelationHistoryMapStore.java | 5 ++--- .../clearing/imdg/businessobject/AccountMapStore.java | 4 +--- .../clearing/imdg/businessobject/RelationMapStore.java | 4 +--- .../clearing/imdg/object/AccountRoutingMapStore.java | 5 +---- .../clearing/imdg/object/BankAccountMapStore.java | 5 +---- .../clearing/imdg/object/ClearingAccountMapStore.java | 5 +---- .../imdg/object/ClearingMemberCategoryMapStore.java | 2 +- .../imdg/object/InformationAccountMapStore.java | 5 +---- 28 files changed, 34 insertions(+), 72 deletions(-) rename clearing-parent/classes/src/main/java/ru/clearing/classes/{StaticData/Account => statics/data/account}/Account.java (91%) rename clearing-parent/classes/src/main/java/ru/clearing/classes/{StaticData/Account => statics/data/account}/AccountHistory.java (92%) rename clearing-parent/classes/src/main/java/ru/clearing/classes/{StaticData/Account => statics/data/account}/AccountRouting.java (90%) rename clearing-parent/classes/src/main/java/ru/clearing/classes/{StaticData/Account => statics/data/account}/AccountRoutingHistory.java (92%) rename clearing-parent/classes/src/main/java/ru/clearing/classes/{StaticData/Account => statics/data/account}/BankAccount.java (94%) rename clearing-parent/classes/src/main/java/ru/clearing/classes/{StaticData/Account => statics/data/account}/BankAccountHistory.java (93%) rename clearing-parent/classes/src/main/java/ru/clearing/classes/{StaticData/Account => statics/data/account}/ClearingAccount.java (89%) rename clearing-parent/classes/src/main/java/ru/clearing/classes/{StaticData/Account => statics/data/account}/ClearingAccountHistory.java (92%) rename clearing-parent/classes/src/main/java/ru/clearing/classes/{StaticData/Account => statics/data/account}/InformationAccount.java (94%) rename clearing-parent/classes/src/main/java/ru/clearing/classes/{StaticData/Account => statics/data/account}/InformationAccountHistory.java (93%) rename clearing-parent/classes/src/main/java/ru/clearing/classes/{StaticData/Company/Relation => statics/data/company/relation}/Relation.java (92%) rename clearing-parent/classes/src/main/java/ru/clearing/classes/{StaticData/Company/Relation => statics/data/company/relation}/RelationHistory.java (91%) rename clearing-parent/classes/src/main/java/ru/clearing/classes/{StaticData => statics/data}/generated/ClearingMemberCategory.java (90%) diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/BankAccountService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/BankAccountService.java index 57db13a20..de7e3c561 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/BankAccountService.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/BankAccountService.java @@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import ru.clearing.classes.StaticData.Account.BankAccount; +import ru.clearing.classes.statics.data.account.BankAccount; 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/classes/src/main/java/ru/clearing/classes/StaticData/Account/Account.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/Account.java similarity index 91% rename from clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/Account.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/Account.java index b7b6d8595..3f9703b33 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/Account.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/Account.java @@ -1,4 +1,4 @@ -package ru.clearing.classes.StaticData.Account; +package ru.clearing.classes.statics.data.account; import ru.clearing.classes.ConstSerializable; import ru.clearing.classes.objects.BusinessObject; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/AccountHistory.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/AccountHistory.java similarity index 92% rename from clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/AccountHistory.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/AccountHistory.java index b4c390b0b..fd3d6595c 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/AccountHistory.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/AccountHistory.java @@ -1,4 +1,4 @@ -package ru.clearing.classes.StaticData.Account; +package ru.clearing.classes.statics.data.account; import ru.clearing.classes.ConstSerializable; import ru.clearing.classes.objects.BusinessEvent; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/AccountRouting.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/AccountRouting.java similarity index 90% rename from clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/AccountRouting.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/AccountRouting.java index bfd8bdd20..ae3f67e66 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/AccountRouting.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/AccountRouting.java @@ -1,4 +1,4 @@ -package ru.clearing.classes.StaticData.Account; +package ru.clearing.classes.statics.data.account; import ru.clearing.classes.ConstSerializable; import ru.spcex.platform.classes.base.SpcexObjectBase; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/AccountRoutingHistory.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/AccountRoutingHistory.java similarity index 92% rename from clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/AccountRoutingHistory.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/AccountRoutingHistory.java index 1c4dc5c8e..f2212cd15 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/AccountRoutingHistory.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/AccountRoutingHistory.java @@ -1,4 +1,4 @@ -package ru.clearing.classes.StaticData.Account; +package ru.clearing.classes.statics.data.account; import ru.clearing.classes.ConstSerializable; import ru.clearing.classes.objects.BusinessEvent; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/BankAccount.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/BankAccount.java similarity index 94% rename from clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/BankAccount.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/BankAccount.java index 8592a0c8f..fc29e5d2b 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/BankAccount.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/BankAccount.java @@ -1,4 +1,4 @@ -package ru.clearing.classes.StaticData.Account; +package ru.clearing.classes.statics.data.account; import ru.clearing.classes.ConstSerializable; import ru.spcex.platform.classes.base.SpcexObjectBase; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/BankAccountHistory.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/BankAccountHistory.java similarity index 93% rename from clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/BankAccountHistory.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/BankAccountHistory.java index 35cc0adbf..6fcc3e750 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/BankAccountHistory.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/BankAccountHistory.java @@ -1,4 +1,4 @@ -package ru.clearing.classes.StaticData.Account; +package ru.clearing.classes.statics.data.account; import ru.clearing.classes.ConstSerializable; import ru.clearing.classes.objects.BusinessEvent; import java.io.Serial; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/ClearingAccount.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/ClearingAccount.java similarity index 89% rename from clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/ClearingAccount.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/ClearingAccount.java index b4267fb4c..1157575b4 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/ClearingAccount.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/ClearingAccount.java @@ -1,4 +1,4 @@ -package ru.clearing.classes.StaticData.Account; +package ru.clearing.classes.statics.data.account; import ru.clearing.classes.ConstSerializable; import ru.spcex.platform.classes.base.SpcexObjectBase; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/ClearingAccountHistory.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/ClearingAccountHistory.java similarity index 92% rename from clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/ClearingAccountHistory.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/ClearingAccountHistory.java index 70a8f92a8..93c1128cc 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/ClearingAccountHistory.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/ClearingAccountHistory.java @@ -1,4 +1,4 @@ -package ru.clearing.classes.StaticData.Account; +package ru.clearing.classes.statics.data.account; import ru.clearing.classes.ConstSerializable; import ru.clearing.classes.objects.BusinessEvent; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/InformationAccount.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/InformationAccount.java similarity index 94% rename from clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/InformationAccount.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/InformationAccount.java index 46ba06ce7..94c5bbd86 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/InformationAccount.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/InformationAccount.java @@ -1,4 +1,4 @@ -package ru.clearing.classes.StaticData.Account; +package ru.clearing.classes.statics.data.account; import ru.clearing.classes.ConstSerializable; import ru.spcex.platform.classes.base.SpcexObjectBase; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/InformationAccountHistory.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/InformationAccountHistory.java similarity index 93% rename from clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/InformationAccountHistory.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/InformationAccountHistory.java index fa79beb75..24cd21878 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Account/InformationAccountHistory.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/InformationAccountHistory.java @@ -1,4 +1,4 @@ -package ru.clearing.classes.StaticData.Account; +package ru.clearing.classes.statics.data.account; import ru.clearing.classes.ConstSerializable; import ru.clearing.classes.objects.BusinessEvent; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/Relation/Relation.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/relation/Relation.java similarity index 92% rename from clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/Relation/Relation.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/relation/Relation.java index 820d3cb97..546faec69 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/Relation/Relation.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/relation/Relation.java @@ -1,4 +1,4 @@ -package ru.clearing.classes.StaticData.Company.Relation; +package ru.clearing.classes.statics.data.company.relation; import ru.clearing.classes.ConstSerializable; import ru.clearing.classes.objects.BusinessObject; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/Relation/RelationHistory.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/relation/RelationHistory.java similarity index 91% rename from clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/Relation/RelationHistory.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/relation/RelationHistory.java index ce26ddd15..5d7023e47 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/Relation/RelationHistory.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/relation/RelationHistory.java @@ -1,4 +1,4 @@ -package ru.clearing.classes.StaticData.Company.Relation; +package ru.clearing.classes.statics.data.company.relation; import ru.clearing.classes.ConstSerializable; import ru.clearing.classes.objects.BusinessEvent; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/generated/ClearingMemberCategory.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/generated/ClearingMemberCategory.java similarity index 90% rename from clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/generated/ClearingMemberCategory.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/generated/ClearingMemberCategory.java index 720c73cfa..a9c962512 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/generated/ClearingMemberCategory.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/generated/ClearingMemberCategory.java @@ -1,4 +1,4 @@ -package ru.clearing.classes.StaticData.generated; +package ru.clearing.classes.statics.data.generated; import ru.clearing.classes.ConstSerializable; import ru.spcex.platform.classes.base.SpcexObjectBase; 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 235c1ddec..dfb2ef84c 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 @@ -5,7 +5,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; -import ru.clearing.classes.StaticData.generated.ClearingMemberCategory; +import ru.clearing.classes.statics.data.generated.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/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/AccountHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/AccountHistoryMapStore.java index 10dd8e600..b81c750ee 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/AccountHistoryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/AccountHistoryMapStore.java @@ -2,11 +2,10 @@ package ru.spcex.clearing.imdg.businessevent; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; -import ru.clearing.classes.StaticData.Account.Account; -import ru.clearing.classes.StaticData.Account.AccountHistory; +import ru.clearing.classes.statics.data.account.Account; +import ru.clearing.classes.statics.data.account.AccountHistory; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.base.TemplateEventMapStore; -import ru.spcex.clearing.imdg.utils.DbUtilsHelper; import ru.spcex.clearing.imdg.utils.TimeUtil; @Component diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/AccountRoutingHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/AccountRoutingHistoryMapStore.java index 9312cdd89..29b6ab964 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/AccountRoutingHistoryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/AccountRoutingHistoryMapStore.java @@ -2,16 +2,10 @@ package ru.spcex.clearing.imdg.businessevent; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; -import ru.clearing.classes.StaticData.Account.AccountRouting; -import ru.clearing.classes.StaticData.Account.AccountRoutingHistory; +import ru.clearing.classes.statics.data.account.AccountRouting; +import ru.clearing.classes.statics.data.account.AccountRoutingHistory; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.base.TemplateEventMapStore; -import ru.spcex.clearing.imdg.utils.DbUtilsHelper; -import ru.spcex.clearing.imdg.utils.TimeUtil; - -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.*; @Component public class AccountRoutingHistoryMapStore extends TemplateEventMapStore { diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/BankAccountHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/BankAccountHistoryMapStore.java index 930f7d095..b908a26a2 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/BankAccountHistoryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/BankAccountHistoryMapStore.java @@ -2,12 +2,10 @@ package ru.spcex.clearing.imdg.businessevent; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; -import ru.clearing.classes.StaticData.Account.BankAccount; -import ru.clearing.classes.StaticData.Account.BankAccountHistory; +import ru.clearing.classes.statics.data.account.BankAccount; +import ru.clearing.classes.statics.data.account.BankAccountHistory; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.base.TemplateEventMapStore; -import ru.spcex.clearing.imdg.utils.DbUtilsHelper; -import ru.spcex.clearing.imdg.utils.TimeUtil; @Component public class BankAccountHistoryMapStore extends TemplateEventMapStore { diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/ClearingAccountHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/ClearingAccountHistoryMapStore.java index 1e84f7d55..25583166b 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/ClearingAccountHistoryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/ClearingAccountHistoryMapStore.java @@ -2,16 +2,10 @@ package ru.spcex.clearing.imdg.businessevent; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; -import ru.clearing.classes.StaticData.Account.ClearingAccount; -import ru.clearing.classes.StaticData.Account.ClearingAccountHistory; +import ru.clearing.classes.statics.data.account.ClearingAccount; +import ru.clearing.classes.statics.data.account.ClearingAccountHistory; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.base.TemplateEventMapStore; -import ru.spcex.clearing.imdg.utils.DbUtilsHelper; -import ru.spcex.clearing.imdg.utils.TimeUtil; - -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.*; @Component public class ClearingAccountHistoryMapStore extends TemplateEventMapStore { diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/InformationAccountUpdateMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/InformationAccountUpdateMapStore.java index 5df25ffb8..cc128e52b 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/InformationAccountUpdateMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/InformationAccountUpdateMapStore.java @@ -2,16 +2,10 @@ package ru.spcex.clearing.imdg.businessevent; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; -import ru.clearing.classes.StaticData.Account.InformationAccount; -import ru.clearing.classes.StaticData.Account.InformationAccountHistory; +import ru.clearing.classes.statics.data.account.InformationAccount; +import ru.clearing.classes.statics.data.account.InformationAccountHistory; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.base.TemplateEventMapStore; -import ru.spcex.clearing.imdg.utils.DbUtilsHelper; -import ru.spcex.clearing.imdg.utils.TimeUtil; - -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.*; @Component public class InformationAccountUpdateMapStore extends TemplateEventMapStore { diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/RelationHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/RelationHistoryMapStore.java index 4b55e1db7..222103160 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/RelationHistoryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/RelationHistoryMapStore.java @@ -2,11 +2,10 @@ package ru.spcex.clearing.imdg.businessevent; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; -import ru.clearing.classes.StaticData.Company.Relation.Relation; -import ru.clearing.classes.StaticData.Company.Relation.RelationHistory; +import ru.clearing.classes.statics.data.company.relation.Relation; +import ru.clearing.classes.statics.data.company.relation.RelationHistory; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.base.TemplateEventMapStore; -import ru.spcex.clearing.imdg.utils.DbUtilsHelper; import ru.spcex.clearing.imdg.utils.TimeUtil; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/AccountMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/AccountMapStore.java index b7784b9d8..d0431cbbb 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/AccountMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/AccountMapStore.java @@ -2,15 +2,13 @@ package ru.spcex.clearing.imdg.businessobject; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; -import ru.clearing.classes.StaticData.Account.Account; +import ru.clearing.classes.statics.data.account.Account; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.base.TemplateMapStore; -import ru.spcex.clearing.imdg.utils.DbUtilsHelper; import ru.spcex.clearing.imdg.utils.TimeUtil; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.*; @Component public class AccountMapStore extends TemplateMapStore { diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/RelationMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/RelationMapStore.java index 222f4128d..8f0ffa210 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/RelationMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/RelationMapStore.java @@ -2,15 +2,13 @@ package ru.spcex.clearing.imdg.businessobject; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; -import ru.clearing.classes.StaticData.Company.Relation.Relation; +import ru.clearing.classes.statics.data.company.relation.Relation; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.base.TemplateMapStore; -import ru.spcex.clearing.imdg.utils.DbUtilsHelper; import ru.spcex.clearing.imdg.utils.TimeUtil; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.*; @Component public class RelationMapStore extends TemplateMapStore { diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/AccountRoutingMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/AccountRoutingMapStore.java index f4250d264..aad8c68be 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/AccountRoutingMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/AccountRoutingMapStore.java @@ -2,15 +2,12 @@ package ru.spcex.clearing.imdg.object; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; -import ru.clearing.classes.StaticData.Account.AccountRouting; +import ru.clearing.classes.statics.data.account.AccountRouting; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.base.TemplateMapStore; -import ru.spcex.clearing.imdg.utils.DbUtilsHelper; -import ru.spcex.clearing.imdg.utils.TimeUtil; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.*; @Component public class AccountRoutingMapStore extends TemplateMapStore { diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/BankAccountMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/BankAccountMapStore.java index b21900047..0b16b0e15 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/BankAccountMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/BankAccountMapStore.java @@ -2,15 +2,12 @@ package ru.spcex.clearing.imdg.object; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; -import ru.clearing.classes.StaticData.Account.BankAccount; +import ru.clearing.classes.statics.data.account.BankAccount; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.base.TemplateMapStore; -import ru.spcex.clearing.imdg.utils.DbUtilsHelper; -import ru.spcex.clearing.imdg.utils.TimeUtil; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.*; @Component public class BankAccountMapStore extends TemplateMapStore { diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ClearingAccountMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ClearingAccountMapStore.java index 870ee19b2..d6abde60b 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ClearingAccountMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ClearingAccountMapStore.java @@ -2,15 +2,12 @@ package ru.spcex.clearing.imdg.object; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; -import ru.clearing.classes.StaticData.Account.ClearingAccount; +import ru.clearing.classes.statics.data.account.ClearingAccount; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.base.TemplateMapStore; -import ru.spcex.clearing.imdg.utils.DbUtilsHelper; -import ru.spcex.clearing.imdg.utils.TimeUtil; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.*; @Component public class ClearingAccountMapStore extends TemplateMapStore { diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ClearingMemberCategoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ClearingMemberCategoryMapStore.java index 881d614fe..d6523de54 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ClearingMemberCategoryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ClearingMemberCategoryMapStore.java @@ -2,7 +2,7 @@ package ru.spcex.clearing.imdg.object; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; -import ru.clearing.classes.StaticData.generated.ClearingMemberCategory; +import ru.clearing.classes.statics.data.generated.ClearingMemberCategory; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.base.TemplateMapStore; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/InformationAccountMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/InformationAccountMapStore.java index abcad351f..c3cfc74d8 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/InformationAccountMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/InformationAccountMapStore.java @@ -2,15 +2,12 @@ package ru.spcex.clearing.imdg.object; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; -import ru.clearing.classes.StaticData.Account.InformationAccount; +import ru.clearing.classes.statics.data.account.InformationAccount; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.base.TemplateMapStore; -import ru.spcex.clearing.imdg.utils.DbUtilsHelper; -import ru.spcex.clearing.imdg.utils.TimeUtil; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.*; @Component public class InformationAccountMapStore extends TemplateMapStore {