From 24222aa218513fd969c77df5feb386c9fccd4161 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期二, 15 一月 2019 16:01:47 +0800
Subject: [PATCH] 手机端上传加水印

---
 gx_tieta/src/com/fgkj/dto/BattInf.java |  180 ++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 139 insertions(+), 41 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dto/BattInf.java b/gx_tieta/src/com/fgkj/dto/BattInf.java
index 7e5ced5..7737fc4 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;
@@ -54,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;
@@ -70,11 +79,25 @@
 	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 String install_user;     //瀹夎浜�
+	
+	private Battinf_ex binf_ex;
+	
+	private float charge_curr_max;//鍏呯數鐢垫祦闃堝��
+	
+	private String VideoOrImage ;//涓婁紶鏂囦欢鐨勬牸寮�
+	
+	private BattMap_information binfmation;//鏈烘埧缁忕含搴︿俊鎭�
 	public BattInf() {
 		super();
 	}
@@ -503,50 +526,125 @@
 	public void setPage(Page page) {
 		this.page = page;
 	}
-	@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
-				+ ", 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 + ", SignalName=" + SignalName
-				+ ", StartNum=" + StartNum + ", Size=" + Size + ", page="
-				+ page + ", obj=" + obj + "]";
+	
+	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;
+	}
 	
+	public String getInstall_user() {
+		return install_user;
+	}
+	public void setInstall_user(String install_user) {
+		this.install_user = install_user;
+	}
 	
-
+	public String getVideoOrImage() {
+		return VideoOrImage;
+	}
+	public void setVideoOrImage(String videoOrImage) {
+		VideoOrImage = videoOrImage;
+	}
+	public float getCharge_curr_max() {
+		return charge_curr_max;
+	}
+	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;
+	}
+	public BattMap_information getBinfmation() {
+		return binfmation;
+	}
+	public void setBinfmation(BattMap_information binfmation) {
+		this.binfmation = binfmation;
+	}
+	@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 + ", 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 + ", binfmation="
+				+ binfmation + "]";
+	}
+	
 	
 	
 }

--
Gitblit v1.9.1