From f6bfafc3a6cd50f11fbf498ecf21498bd9112ff4 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期二, 08 一月 2019 17:37:51 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dto/BattInf.java | 109 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 66 insertions(+), 43 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/BattInf.java b/gx_tieta/src/com/fgkj/dto/BattInf.java
index 643d9ee..f017289 100644
--- a/gx_tieta/src/com/fgkj/dto/BattInf.java
+++ b/gx_tieta/src/com/fgkj/dto/BattInf.java
@@ -55,7 +55,15 @@
private String DeviceId;
private String DeviceName;
private Integer MonCount;
+
private Float MonCapStd; //鏍囧瓨瀹归噺
+ private String moncapstds;
+ private float real_cap_group1;
+ private float real_cap_group2;
+ private float real_cap_group3;
+ private float real_cap_group4;
+
+
private Float MonResStd;
private Float MonSerStd;
private Float MonTmpStd;
@@ -79,7 +87,7 @@
private Integer Size;
private Page page;
private Object obj;
- private String station_phone;
+ private String station_phone;
private String install_user; //瀹夎浜�
@@ -568,51 +576,66 @@
public void setCharge_curr_max(float charge_curr_max) {
this.charge_curr_max = charge_curr_max;
}
+ public String getMoncapstds() {
+ return moncapstds;
+ }
+ public void setMoncapstds(String moncapstds) {
+ this.moncapstds = moncapstds;
+ }
+ public float getReal_cap_group2() {
+ return real_cap_group2;
+ }
+ public void setReal_cap_group2(float real_cap_group2) {
+ this.real_cap_group2 = real_cap_group2;
+ }
+ public float getReal_cap_group3() {
+ return real_cap_group3;
+ }
+ public void setReal_cap_group3(float real_cap_group3) {
+ this.real_cap_group3 = real_cap_group3;
+ }
+ public float getReal_cap_group4() {
+ return real_cap_group4;
+ }
+ public void setReal_cap_group4(float real_cap_group4) {
+ this.real_cap_group4 = real_cap_group4;
+ }
+ public float getReal_cap_group1() {
+ return real_cap_group1;
+ }
+ public void setReal_cap_group1(float real_cap_group1) {
+ this.real_cap_group1 = real_cap_group1;
+ }
@Override
public String toString() {
- return "BattInf [num=" + num + ", StationId=" + StationId
- + ", StationId_ex=" + StationId_ex + ", StationName="
- + StationName + ", StationName1=" + StationName1
- + ", StationName2=" + StationName2 + ", StationName3="
- + StationName3 + ", StationName4=" + StationName4
- + ", StationName5=" + StationName5 + ", StationName6="
- + StationName6 + ", StationName7=" + StationName7
- + ", StationName8=" + StationName8 + ", StationName9="
- + StationName9 + ", StationIp=" + StationIp + ", FBSDeviceId="
- + FBSDeviceId + ", FbsDeviceIp=" + FbsDeviceIp
- + ", FbsDeviceIp_YM=" + FbsDeviceIp_YM + ", FbsDeviceIp_WG="
- + FbsDeviceIp_WG + ", FbsDeviceIp_old=" + FbsDeviceIp_old
- + ", FbsDeviceIp_YM_old=" + FbsDeviceIp_YM_old
- + ", FbsDeviceIp_WG_old=" + FbsDeviceIp_WG_old
- + ", FBSDeviceName=" + FBSDeviceName
- + ", GroupIndexInFBSDevice=" + GroupIndexInFBSDevice
- + ", BattModel=" + BattModel + ", BattGroupId=" + BattGroupId
- + ", BattGroupNum=" + BattGroupNum + ", BattGroupName="
- + BattGroupName + ", BattGroupName1=" + BattGroupName1
- + ", BattGroupName2=" + BattGroupName2 + ", BattGroupName3="
- + BattGroupName3 + ", BattGroupName4=" + BattGroupName4
- + ", BattGroupName5=" + BattGroupName5 + ", BattGroupName6="
- + BattGroupName6 + ", FloatVolLevel=" + FloatVolLevel
- + ", OfflineVolLevel=" + OfflineVolLevel
- + ", BattFloatCurrent=" + BattFloatCurrent + ", DeviceId="
- + DeviceId + ", DeviceName=" + DeviceName + ", MonCount="
- + MonCount + ", MonCapStd=" + MonCapStd + ", MonResStd="
- + MonResStd + ", MonSerStd=" + MonSerStd + ", MonTmpStd="
- + MonTmpStd + ", MonVolStd=" + MonVolStd + ", MonVolLowToAvg="
- + MonVolLowToAvg + ", MonNum=" + MonNum + ", BattProducer="
- + BattProducer + ", BattProductDate=" + BattProductDate
- + ", BattProductDate1=" + BattProductDate1 + ", BattInUseDate="
- + BattInUseDate + ", BattInUseDate1=" + BattInUseDate1
- + ", BattGuarantDayCount=" + BattGuarantDayCount
- + ", SignalId=" + SignalId + ", CInterFaceId=" + CInterFaceId
- + ", Load_curr=" + Load_curr + ", DisCurrMax=" + DisCurrMax
- + ", SignalName=" + SignalName + ", StartNum=" + StartNum
- + ", Station_install=" + Station_install + ", Size=" + Size
- + ", page=" + page + ", obj=" + obj + ", station_phone="
- + station_phone + ", install_user=" + install_user
- + ", binf_ex=" + binf_ex + ", charge_curr_max="
- + charge_curr_max + ", VideoOrImage=" + VideoOrImage + "]";
+ return "BattInf [num=" + num + ", StationId=" + StationId + ", StationId_ex=" + StationId_ex + ", StationName="
+ + StationName + ", StationName1=" + StationName1 + ", StationName2=" + StationName2 + ", StationName3="
+ + StationName3 + ", StationName4=" + StationName4 + ", StationName5=" + StationName5 + ", StationName6="
+ + StationName6 + ", StationName7=" + StationName7 + ", StationName8=" + StationName8 + ", StationName9="
+ + StationName9 + ", StationIp=" + StationIp + ", FBSDeviceId=" + FBSDeviceId + ", FbsDeviceIp="
+ + FbsDeviceIp + ", FbsDeviceIp_YM=" + FbsDeviceIp_YM + ", FbsDeviceIp_WG=" + FbsDeviceIp_WG
+ + ", FbsDeviceIp_old=" + FbsDeviceIp_old + ", FbsDeviceIp_YM_old=" + FbsDeviceIp_YM_old
+ + ", FbsDeviceIp_WG_old=" + FbsDeviceIp_WG_old + ", FBSDeviceName=" + FBSDeviceName
+ + ", GroupIndexInFBSDevice=" + GroupIndexInFBSDevice + ", BattModel=" + BattModel + ", BattGroupId="
+ + BattGroupId + ", BattGroupNum=" + BattGroupNum + ", BattGroupName=" + BattGroupName
+ + ", BattGroupName1=" + BattGroupName1 + ", BattGroupName2=" + BattGroupName2 + ", BattGroupName3="
+ + BattGroupName3 + ", BattGroupName4=" + BattGroupName4 + ", BattGroupName5=" + BattGroupName5
+ + ", BattGroupName6=" + BattGroupName6 + ", FloatVolLevel=" + FloatVolLevel + ", OfflineVolLevel="
+ + OfflineVolLevel + ", BattFloatCurrent=" + BattFloatCurrent + ", DeviceId=" + DeviceId
+ + ", DeviceName=" + DeviceName + ", MonCount=" + MonCount + ", MonCapStd=" + MonCapStd + ", moncapstds="
+ + moncapstds + ", real_cap_group1=" + real_cap_group1 + ", real_cap_group2=" + real_cap_group2
+ + ", real_cap_group3=" + real_cap_group3 + ", real_cap_group4=" + real_cap_group4 + ", MonResStd="
+ + MonResStd + ", MonSerStd=" + MonSerStd + ", MonTmpStd=" + MonTmpStd + ", MonVolStd=" + MonVolStd
+ + ", MonVolLowToAvg=" + MonVolLowToAvg + ", MonNum=" + MonNum + ", BattProducer=" + BattProducer
+ + ", BattProductDate=" + BattProductDate + ", BattProductDate1=" + BattProductDate1 + ", BattInUseDate="
+ + BattInUseDate + ", BattInUseDate1=" + BattInUseDate1 + ", BattGuarantDayCount=" + BattGuarantDayCount
+ + ", SignalId=" + SignalId + ", CInterFaceId=" + CInterFaceId + ", Load_curr=" + Load_curr
+ + ", DisCurrMax=" + DisCurrMax + ", SignalName=" + SignalName + ", StartNum=" + StartNum
+ + ", Station_install=" + Station_install + ", Size=" + Size + ", page=" + page + ", obj=" + obj
+ + ", station_phone=" + station_phone + ", install_user=" + install_user + ", binf_ex=" + binf_ex
+ + ", charge_curr_max=" + charge_curr_max + ", VideoOrImage=" + VideoOrImage + "]";
}
+
}
--
Gitblit v1.9.1