treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactoring CompanyInfo and dependent classes

Browse source
This commit is contained in:
psemenkov 2022-09-30 17:25:01 +03:00
parent da0e319e95
commit 177607167a
4 changed files with 48 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/Company.java
View file

@ -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;

30
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/AdmittedDeal.java Normal file
View file

@ -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;
/**
* Счета
* <p>
* 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;
}

4
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/BusinessObjectMapStore.java
View file

@ -27,8 +27,8 @@ public abstract class BusinessObjectMapStore<T extends BusinessObject> 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));
}

30
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/CompanyMapStore.java
View file

@ -14,6 +14,9 @@ import java.util.*;
@Component
public class CompanyMapStore extends BusinessObjectMapStore<Company> {
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<Company> {
};
}
protected final String insertStatement = makeInsertSql(getTableName(), getFields(), "id");
protected final String insertCompanyInfoStatement = makeInsertSql("COMPANY_INFO", getFieldsForCompanyInfo(), "id");
@Override
public Collection<Company> load(Collection<Long> keys) {
Map<String, Collection<Long>> paramMap = Collections.singletonMap("ids", keys);
@ -101,18 +101,18 @@ public class CompanyMapStore extends BusinessObjectMapStore<Company> {
(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));