From aa890874f3f6ee7e88134493dc29705bc6fd89a3 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.25>
Date: 星期一, 22 十月 2018 16:24:27 +0800
Subject: [PATCH] 修改

---
 gx_tieta/src/com/fgkj/dto/BattInf.java |   59 +++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dto/BattInf.java b/gx_tieta/src/com/fgkj/dto/BattInf.java
index b407550..29e00ba 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,13 @@
 	private String SignalId;
 	private Integer CInterFaceId;
 	private Float Load_curr;// 璐熻浇鐢垫祦
+	private Float DisCurrMax;//鏈�澶ф牳瀹圭數娴�
 	private String SignalName;
 	private Integer StartNum; 			
 	private Integer Size; 				
 	private Page page;
 	private Object obj;
+	private String station_phone;
 	public BattInf() {
 		super();
 	}
@@ -503,22 +506,43 @@
 	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;
+	}
 	@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,12 +563,15 @@
 				+ 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
+				+ ", Size=" + Size + ", page=" + page + ", obj=" + obj
+				+ ", station_phone=" + station_phone + "]";
 	}
 	
 	
+	
+	
 
 	
 	

--
Gitblit v1.9.1