From 99285fcc7d30e62f1e84e1c96d29d0ffcd9ccdbc Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.30>
Date: 星期三, 14 十一月 2018 17:33:27 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dto/BattInf.java | 81 ++++++++++++++++++++++++++++++----------
1 files changed, 60 insertions(+), 21 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/BattInf.java b/gx_tieta/src/com/fgkj/dto/BattInf.java
index b407550..0c80ec4 100644
--- a/gx_tieta/src/com/fgkj/dto/BattInf.java
+++ b/gx_tieta/src/com/fgkj/dto/BattInf.java
@@ -16,6 +16,7 @@
public class BattInf implements Serializable{
private Integer num;
private String StationId;
+ private String StationId_ex;
private String StationName;
private String StationName1;
private String StationName2;
@@ -70,11 +71,18 @@
private String SignalId;
private Integer CInterFaceId;
private Float Load_curr;// 璐熻浇鐢垫祦
+ private Float DisCurrMax;//鏈�澶ф牳瀹圭數娴�
private String SignalName;
- private Integer StartNum;
+ private Integer StartNum;
+ private Integer Station_install; //鏈烘埧璁惧鏄惁瀹夎
+
private Integer Size;
private Page page;
private Object obj;
+ private String station_phone;
+
+ private Battinf_ex binf_ex;
+
public BattInf() {
super();
}
@@ -503,22 +511,55 @@
public void setPage(Page page) {
this.page = page;
}
+
+ public String getStation_phone() {
+ return station_phone;
+ }
+ public void setStation_phone(String station_phone) {
+ this.station_phone = station_phone;
+ }
+ public Float getDisCurrMax() {
+ return DisCurrMax;
+ }
+ public void setDisCurrMax(Float disCurrMax) {
+ DisCurrMax = disCurrMax;
+ }
+
+ public String getStationId_ex() {
+ return StationId_ex;
+ }
+ public void setStationId_ex(String stationId_ex) {
+ StationId_ex = stationId_ex;
+ }
+ public Integer getStation_install() {
+ return Station_install;
+ }
+ public void setStation_install(Integer station_install) {
+ Station_install = station_install;
+ }
+ public Battinf_ex getBinf_ex() {
+ return binf_ex;
+ }
+ public void setBinf_ex(Battinf_ex binf_ex) {
+ this.binf_ex = binf_ex;
+ }
@Override
public String toString() {
return "BattInf [num=" + num + ", StationId=" + StationId
- + ", 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
+ + ", 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="
@@ -539,13 +580,11 @@
+ BattInUseDate + ", BattInUseDate1=" + BattInUseDate1
+ ", BattGuarantDayCount=" + BattGuarantDayCount
+ ", SignalId=" + SignalId + ", CInterFaceId=" + CInterFaceId
- + ", Load_curr=" + Load_curr + ", SignalName=" + SignalName
- + ", StartNum=" + StartNum + ", Size=" + Size + ", obj=" + obj
- + "]";
+ + ", Load_curr=" + Load_curr + ", DisCurrMax=" + DisCurrMax
+ + ", SignalName=" + SignalName + ", StartNum=" + StartNum
+ + ", Station_install=" + Station_install + ", Size=" + Size
+ + ", page=" + page + ", obj=" + obj + ", station_phone="
+ + station_phone + ", binf_ex=" + binf_ex + "]";
}
-
-
-
-
}
--
Gitblit v1.9.1