From 855f1c0c81c4325a2162c55005979ad488e41821 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Mon, 30 Jan 2023 14:13:09 +0300 Subject: [PATCH] =?UTF-8?q?imdg=20CLS-188=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B0=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=BB=D0=B5=D0=B9=20=D0=B2=20STrade?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../classes/statics/data/misc/STrade.java | 130 +++++++++--------- .../clearing/imdg/object/STradeMapStore.java | 52 +++---- 2 files changed, 91 insertions(+), 91 deletions(-) diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/STrade.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/STrade.java index 74e2f821d..f49c7b224 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/STrade.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/STrade.java @@ -15,56 +15,56 @@ import java.time.LocalDate; public class STrade extends SpcexObjectBase { private static final long serialVersionUID = ConstSerializable.serialVersionUID; - private Long trade_num; - private String sec_code; - private Instant trade_date_time; - private LocalDate settle_date; + private Long tradeNum; + private String secCode; + private Instant tradeDateTime; + private LocalDate settleDate; private BigDecimal price; private BigDecimal value; private BigDecimal qty; private BigDecimal accruedint; - private String firm_id; - private String client_code; - private BigDecimal exchange_commission; - private String class_code; + private String firmId; + private String clientCode; + private BigDecimal exchangeCommission; + private String classCode; private String operation; - private String issue_account; - private String money_account; - private String trade_type; - private Long days_to_mat_date; + private String issueAccount; + private String moneyAccount; + private String tradeType; + private Long daysToMatDate; private String collateral; - private String settle_code; + private String settleCode; - public Long getTrade_num() { - return trade_num; + public Long getTradeNum() { + return tradeNum; } - public void setTrade_num(Long value) { - this.trade_num = value; + public void setTradeNum(Long value) { + this.tradeNum = value; } - public String getSec_code() { - return sec_code; + public String getSecCode() { + return secCode; } - public void setSec_code(String value) { - this.sec_code = value; + public void setSecCode(String value) { + this.secCode = value; } - public Instant getTrade_date_time() { - return trade_date_time; + public Instant getTradeDateTime() { + return tradeDateTime; } - public void setTrade_date_time(Instant value) { - this.trade_date_time = value; + public void setTradeDateTime(Instant value) { + this.tradeDateTime = value; } - public LocalDate getSettle_date() { - return settle_date; + public LocalDate getSettleDate() { + return settleDate; } - public void setSettle_date(LocalDate value) { - this.settle_date = value; + public void setSettleDate(LocalDate value) { + this.settleDate = value; } public BigDecimal getPrice() { @@ -99,36 +99,36 @@ public class STrade extends SpcexObjectBase { this.accruedint = value; } - public String getFirm_id() { - return firm_id; + public String getFirmId() { + return firmId; } - public void setFirm_id(String value) { - this.firm_id = value; + public void setFirmId(String value) { + this.firmId = value; } - public String getClient_code() { - return client_code; + public String getClientCode() { + return clientCode; } - public void setClient_code(String value) { - this.client_code = value; + public void setClientCode(String value) { + this.clientCode = value; } - public BigDecimal getExchange_commission() { - return exchange_commission; + public BigDecimal getExchangeCommission() { + return exchangeCommission; } - public void setExchange_commission(BigDecimal value) { - this.exchange_commission = value; + public void setExchangeCommission(BigDecimal value) { + this.exchangeCommission = value; } - public String getClass_code() { - return class_code; + public String getClassCode() { + return classCode; } - public void setClass_code(String value) { - this.class_code = value; + public void setClassCode(String value) { + this.classCode = value; } public String getOperation() { @@ -139,36 +139,36 @@ public class STrade extends SpcexObjectBase { this.operation = value; } - public String getIssue_account() { - return issue_account; + public String getIssueAccount() { + return issueAccount; } - public void setIssue_account(String value) { - this.issue_account = value; + public void setIssueAccount(String value) { + this.issueAccount = value; } - public String getMoney_account() { - return money_account; + public String getMoneyAccount() { + return moneyAccount; } - public void setMoney_account(String value) { - this.money_account = value; + public void setMoneyAccount(String value) { + this.moneyAccount = value; } - public String getTrade_type() { - return trade_type; + public String getTradeType() { + return tradeType; } - public void setTrade_type(String value) { - this.trade_type = value; + public void setTradeType(String value) { + this.tradeType = value; } - public Long getDays_to_mat_date() { - return days_to_mat_date; + public Long getDaysToMatDate() { + return daysToMatDate; } - public void setDays_to_mat_date(Long value) { - this.days_to_mat_date = value; + public void setDaysToMatDate(Long value) { + this.daysToMatDate = value; } public String getCollateral() { @@ -179,11 +179,11 @@ public class STrade extends SpcexObjectBase { this.collateral = value; } - public String getSettle_code() { - return settle_code; + public String getSettleCode() { + return settleCode; } - public void setSettle_code(String value) { - this.settle_code = value; + public void setSettleCode(String value) { + this.settleCode = value; } } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/STradeMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/STradeMapStore.java index fcdc90465..a906773e5 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/STradeMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/STradeMapStore.java @@ -42,25 +42,25 @@ public class STradeMapStore extends TemplateMapStore { public STrade objectReader(ResultSet resultSet) throws SQLException { STrade object = new STrade(); object.setId(resultSet.getObject("ID", Long.class)); - object.setTrade_num(resultSet.getObject("TRADE_NUM", Long.class)); - object.setSec_code(resultSet.getObject("SEC_CODE", String.class)); - object.setTrade_date_time(getInstantFromTimestamp(resultSet, "TRADE_DATE_TIME")); - object.setSettle_date(resultSet.getObject("SETTLE_DATE", LocalDate.class)); + object.setTradeNum(resultSet.getObject("TRADE_NUM", Long.class)); + object.setSecCode(resultSet.getObject("SEC_CODE", String.class)); + object.setTradeDateTime(getInstantFromTimestamp(resultSet, "TRADE_DATE_TIME")); + object.setSettleDate(resultSet.getObject("SETTLE_DATE", LocalDate.class)); object.setPrice(resultSet.getObject("PRICE", BigDecimal.class)); object.setValue(resultSet.getObject("VALUE", BigDecimal.class)); object.setQty(resultSet.getObject("QTY", BigDecimal.class)); object.setAccruedint(resultSet.getObject("ACCRUEDINT", BigDecimal.class)); - object.setFirm_id(resultSet.getObject("FIRM_ID", String.class)); - object.setClient_code(resultSet.getObject("CLIENT_CODE", String.class)); - object.setExchange_commission(resultSet.getObject("EXCHANGE_COMMISSION", BigDecimal.class)); - object.setClass_code(resultSet.getObject("CLASS_CODE", String.class)); + object.setFirmId(resultSet.getObject("FIRM_ID", String.class)); + object.setClientCode(resultSet.getObject("CLIENT_CODE", String.class)); + object.setExchangeCommission(resultSet.getObject("EXCHANGE_COMMISSION", BigDecimal.class)); + object.setClassCode(resultSet.getObject("CLASS_CODE", String.class)); object.setOperation(resultSet.getObject("OPERATION", String.class)); - object.setIssue_account(resultSet.getObject("ISSUE_ACCOUNT", String.class)); - object.setMoney_account(resultSet.getObject("MONEY_ACCOUNT", String.class)); - object.setTrade_type(resultSet.getObject("TRADE_TYPE", String.class)); - object.setDays_to_mat_date(resultSet.getObject("DAYS_TO_MAT_DATE", Long.class)); + object.setIssueAccount(resultSet.getObject("ISSUE_ACCOUNT", String.class)); + object.setMoneyAccount(resultSet.getObject("MONEY_ACCOUNT", String.class)); + object.setTradeType(resultSet.getObject("TRADE_TYPE", String.class)); + object.setDaysToMatDate(resultSet.getObject("DAYS_TO_MAT_DATE", Long.class)); object.setCollateral(resultSet.getObject("COLLATERAL", String.class)); - object.setSettle_code(resultSet.getObject("SETTLE_CODE", String.class)); + object.setSettleCode(resultSet.getObject("SETTLE_CODE", String.class)); return object; } @@ -68,25 +68,25 @@ public class STradeMapStore extends TemplateMapStore { public Object[] objectToField(STrade object) { Object[] args = new Object[]{ object.getId(), - object.getTrade_num(), - object.getSec_code(), - TimeUtil.toDateFromInstant(object.getTrade_date_time()), - object.getSettle_date(), + object.getTradeNum(), + object.getSecCode(), + TimeUtil.toDateFromInstant(object.getTradeDateTime()), + object.getSettleDate(), object.getPrice(), object.getValue(), object.getQty(), object.getAccruedint(), - object.getFirm_id(), - object.getClient_code(), - object.getExchange_commission(), - object.getClass_code(), + object.getFirmId(), + object.getClientCode(), + object.getExchangeCommission(), + object.getClassCode(), object.getOperation(), - object.getIssue_account(), - object.getMoney_account(), - object.getTrade_type(), - object.getDays_to_mat_date(), + object.getIssueAccount(), + object.getMoneyAccount(), + object.getTradeType(), + object.getDaysToMatDate(), object.getCollateral(), - object.getSettle_code() + object.getSettleCode() }; return args; }