From 01fb6edeac37edb76dade2a2f92201a9bbdc69db Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.23>
Date: 星期一, 12 十一月 2018 14:11:38 +0800
Subject: [PATCH] 拓扑图显示dcdc16进制
---
gx_tieta/src/com/fgkj/dto/ram/Fbs9100s_dcdc_state.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/ram/Fbs9100s_dcdc_state.java b/gx_tieta/src/com/fgkj/dto/ram/Fbs9100s_dcdc_state.java
index f553b5e..773e659 100644
--- a/gx_tieta/src/com/fgkj/dto/ram/Fbs9100s_dcdc_state.java
+++ b/gx_tieta/src/com/fgkj/dto/ram/Fbs9100s_dcdc_state.java
@@ -13,7 +13,9 @@
private Float dcdc_Tmp_Dis;
private Float dcdc_Tmp_Chr;
private Integer dcdc_SMR_Alarm1;
+ private String dcdc_SMR_Alarm1_16;//dcdc_SMR_Alarm1杞�16杩涘埗
private Integer dcdc_SMR_Alarm2;
+ private String dcdc_SMR_Alarm2_16;//dcdc_SMR_Alarm2杞�16杩涘埗
private Integer dcdc_version;
private Integer dcdc_ModeSetComm;
private Integer dcdc_RunSetComm;
@@ -140,6 +142,18 @@
public void setDcdc_CommRxCnt(Integer dcdc_CommRxCnt) {
this.dcdc_CommRxCnt = dcdc_CommRxCnt;
}
+ public String getDcdc_SMR_Alarm1_16() {
+ return dcdc_SMR_Alarm1_16;
+ }
+ public void setDcdc_SMR_Alarm1_16(String dcdc_SMR_Alarm1_16) {
+ this.dcdc_SMR_Alarm1_16 = dcdc_SMR_Alarm1_16;
+ }
+ public String getDcdc_SMR_Alarm2_16() {
+ return dcdc_SMR_Alarm2_16;
+ }
+ public void setDcdc_SMR_Alarm2_16(String dcdc_SMR_Alarm2_16) {
+ this.dcdc_SMR_Alarm2_16 = dcdc_SMR_Alarm2_16;
+ }
@Override
public String toString() {
return "Fbs9100s_dcdc_state [num=" + num + ", dev_id=" + dev_id
@@ -147,15 +161,18 @@
+ ", dcdc_Vbat=" + dcdc_Vbat + ", dcdc_Iout=" + dcdc_Iout
+ ", dcdc_Ibuck=" + dcdc_Ibuck + ", dcdc_Tmp_Dis="
+ dcdc_Tmp_Dis + ", dcdc_Tmp_Chr=" + dcdc_Tmp_Chr
- + ", dcdc_SMR_Alarm1=" + dcdc_SMR_Alarm1 + ", dcdc_SMR_Alarm2="
- + dcdc_SMR_Alarm2 + ", dcdc_version=" + dcdc_version
- + ", dcdc_ModeSetComm=" + dcdc_ModeSetComm
- + ", dcdc_RunSetComm=" + dcdc_RunSetComm + ", dcdc_BuckISet="
- + dcdc_BuckISet + ", dcdc_DisVolSet=" + dcdc_DisVolSet
- + ", dcdc_DisCurrSet=" + dcdc_DisCurrSet + ", dcdc_CommTxCnt="
- + dcdc_CommTxCnt + ", dcdc_CommRxCnt=" + dcdc_CommRxCnt + "]";
+ + ", dcdc_SMR_Alarm1=" + dcdc_SMR_Alarm1
+ + ", dcdc_SMR_Alarm1_16=" + dcdc_SMR_Alarm1_16
+ + ", dcdc_SMR_Alarm2=" + dcdc_SMR_Alarm2
+ + ", dcdc_SMR_Alarm2_16=" + dcdc_SMR_Alarm2_16
+ + ", dcdc_version=" + dcdc_version + ", dcdc_ModeSetComm="
+ + dcdc_ModeSetComm + ", dcdc_RunSetComm=" + dcdc_RunSetComm
+ + ", dcdc_BuckISet=" + dcdc_BuckISet + ", dcdc_DisVolSet="
+ + dcdc_DisVolSet + ", dcdc_DisCurrSet=" + dcdc_DisCurrSet
+ + ", dcdc_CommTxCnt=" + dcdc_CommTxCnt + ", dcdc_CommRxCnt="
+ + dcdc_CommRxCnt + "]";
}
-
+
}
--
Gitblit v1.9.1