From 177607167ad47009b8afb7e91f2bcc183f5314ea Mon Sep 17 00:00:00 2001 From: psemenkov Date: Fri, 30 Sep 2022 17:25:01 +0300 Subject: [PATCH] Refactoring CompanyInfo and dependent classes --- .../classes/statics/data/company/Company.java | 2 +- .../statics/data/misc/AdmittedDeal.java | 30 +++++++++++++++++++ .../imdg/base/BusinessObjectMapStore.java | 4 +-- .../imdg/businessobject/CompanyMapStore.java | 30 +++++++++---------- 4 files changed, 48 insertions(+), 18 deletions(-) create mode 100644 clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/AdmittedDeal.java diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/Company.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/Company.java index 4e82c1bb6..9bbc2ee44 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/Company.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/Company.java @@ -1,8 +1,8 @@ package ru.clearing.classes.statics.data.company; import ru.clearing.classes.ConstSerializable; -import ru.clearing.classes.statics.data.profile.CompanyInfo; import ru.clearing.classes.objects.BusinessObject; +import ru.clearing.classes.statics.data.profile.CompanyInfo; import java.io.Serial; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/AdmittedDeal.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/AdmittedDeal.java new file mode 100644 index 000000000..b83f356d8 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/AdmittedDeal.java @@ -0,0 +1,30 @@ +package ru.clearing.classes.statics.data.misc; + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessObject; + +import java.math.BigDecimal; +import java.time.Instant; +import java.time.LocalTime; + +/** + * Счета + *

+ * DB table: ADMITTED_DEAL + **/ +public class AdmittedDeal extends BusinessObject { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private String companyFullName; + private Instant executionDepositRegisterTradingDate; + private String exchangeExecutionId; + private LocalTime exchangeExecutionTime; + private Long securityShortName; + private String sellerFullName; + private String sellerClearingCode; + private String sellerAccount; + private String buyerFullName; + private String buyerClearingCode; + private String buyerAccount; + private BigDecimal executionDepositRegisterAmount; +} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/BusinessObjectMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/BusinessObjectMapStore.java index 3a7c7e706..32b4b047a 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/BusinessObjectMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/BusinessObjectMapStore.java @@ -27,8 +27,8 @@ public abstract class BusinessObjectMapStore extends O } protected void fillBusinessObjectFields(BusinessObject businessObject, ResultSet rs, String idName) throws SQLException { - businessObject.setUpdated(getInstantFromTimestamp(rs, "updated")); - businessObject.setCreated(getInstantFromTimestamp(rs, "created")); + businessObject.setUpdated(getInstantFromTimestamp(rs, "updated_at")); + businessObject.setCreated(getInstantFromTimestamp(rs, "created_at")); businessObject.setId(getLong(rs, idName)); } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/CompanyMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/CompanyMapStore.java index ee93d4b49..c16c1a2d0 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/CompanyMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/CompanyMapStore.java @@ -14,6 +14,9 @@ import java.util.*; @Component public class CompanyMapStore extends BusinessObjectMapStore { + protected final String insertStatement = makeInsertSql(getTableName(), getFields(), "id"); + protected final String insertCompanyInfoStatement = makeInsertSql("COMPANY_INFO", getFieldsForCompanyInfo(), "id"); + public CompanyMapStore(JdbcTemplate jdbcTemplate) { super(jdbcTemplate); } @@ -38,9 +41,6 @@ public class CompanyMapStore extends BusinessObjectMapStore { }; } - protected final String insertStatement = makeInsertSql(getTableName(), getFields(), "id"); - protected final String insertCompanyInfoStatement = makeInsertSql("COMPANY_INFO", getFieldsForCompanyInfo(), "id"); - @Override public Collection load(Collection keys) { Map> paramMap = Collections.singletonMap("ids", keys); @@ -101,18 +101,18 @@ public class CompanyMapStore extends BusinessObjectMapStore { (rs, rowNum) -> { CompanyInfo companyInfo = new CompanyInfo(); companyInfo.setId(rs.getObject("Id", Long.class)); - companyInfo.setCompanyId(rs.getObject("CompanyId", Long.class)); - companyInfo.setCorporationSoleType(rs.getString("CorporationSoleType")); - companyInfo.setCountryCode(rs.getString("CountryCode")); - companyInfo.setDescription(rs.getString("Description")); - companyInfo.setProfessionalSign(rs.getString("ProfessionalSign")); - companyInfo.setLegalKind(rs.getString("LegalKind")); - companyInfo.setOrganizationType(rs.getString("OrganizationType")); - companyInfo.setResidence(rs.getString("Residence")); - companyInfo.setShortName(rs.getString("ShortName")); - companyInfo.setFullName(rs.getString("FullName")); - companyInfo.setShortNameEng(rs.getString("ShortNameEng")); - companyInfo.setFullNameEng(rs.getString("FullNameEng")); + companyInfo.setCompanyId(rs.getObject("COMPANY_ID", Long.class)); + companyInfo.setCorporationSoleType(rs.getString("CORPORATION_SOLE_TYPE")); + companyInfo.setCountryCode(rs.getString("COUNTRY_CODE")); + companyInfo.setDescription(rs.getString("DESCRIPTION")); + companyInfo.setProfessionalSign(rs.getString("PROFESSIONAL_SIGN")); + companyInfo.setLegalKind(rs.getString("LEGAL_KIND")); + companyInfo.setOrganizationType(rs.getString("ORGANIZATION_TYPE")); + companyInfo.setResidence(rs.getString("RESIDENCE")); + companyInfo.setShortName(rs.getString("SHORT_NAME")); + companyInfo.setFullName(rs.getString("FULL_NAME")); + companyInfo.setShortNameEng(rs.getString("SHORT_NAME_ENG")); + companyInfo.setFullNameEng(rs.getString("FULL_NAME_ENG")); companyInfo.setTradingCode(rs.getObject("TRADING_CODE", String.class)); companyInfo.setClearingCode(rs.getObject("CLEARING_CODE", String.class)); companyInfo.setRegistrationCode(rs.getObject("REGISTRATION_CODE", String.class));