From 5c313a0bf62887f20d1f01754b1b07d983905d66 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期六, 29 十二月 2018 14:42:37 +0800
Subject: [PATCH] bug

---
 gx_tieta/src/com/fgkj/dto/Batt_endurance.java |  104 +++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 87 insertions(+), 17 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dto/Batt_endurance.java b/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
index 93a37d8..8fcc25a 100644
--- a/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
+++ b/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
@@ -6,11 +6,20 @@
 	private int num;
 	private int deviceId;
 	private String stationid;
-	private int endurance_state;
 	private float real_cap;
 	private float moncapstd;
 	private float real_curr;
-	private int endurance_timelong;
+	private float endurance_theory_timelong;//鐞嗚
+	private float endurance_actual_timelong;//瀹為檯
+	private float endurance_actual_timelong_max;//瀹為檯鏈�澶�
+	private float endurance_actual_timelong_min;//瀹為檯鏈�灏�
+	private int is_out_stand;
+	private String note;
+	private String stationName;
+	private String stationName1;//鐪佺骇
+	private String stationName2;//甯傜骇
+	private String stationName5;//鍖哄幙
+	private Page page;//鍒嗛〉
 	public int getNum() {
 		return num;
 	}
@@ -28,12 +37,6 @@
 	}
 	public void setStationid(String stationid) {
 		this.stationid = stationid;
-	}
-	public int getEndurance_state() {
-		return endurance_state;
-	}
-	public void setEndurance_state(int endurance_state) {
-		this.endurance_state = endurance_state;
 	}
 	public float getReal_cap() {
 		return real_cap;
@@ -53,21 +56,88 @@
 	public void setReal_curr(float real_curr) {
 		this.real_curr = real_curr;
 	}
-	public int getEndurance_timelong() {
-		return endurance_timelong;
+	public float getEndurance_theory_timelong() {
+		return endurance_theory_timelong;
 	}
-	public void setEndurance_timelong(int endurance_timelong) {
-		this.endurance_timelong = endurance_timelong;
+	public void setEndurance_theory_timelong(float endurance_theory_timelong) {
+		this.endurance_theory_timelong = endurance_theory_timelong;
+	}
+	public float getEndurance_actual_timelong() {
+		return endurance_actual_timelong;
+	}
+	public void setEndurance_actual_timelong(float endurance_actual_timelong) {
+		this.endurance_actual_timelong = endurance_actual_timelong;
+	}
+	public float getEndurance_actual_timelong_max() {
+		return endurance_actual_timelong_max;
+	}
+	public void setEndurance_actual_timelong_max(float endurance_actual_timelong_max) {
+		this.endurance_actual_timelong_max = endurance_actual_timelong_max;
+	}
+	public float getEndurance_actual_timelong_min() {
+		return endurance_actual_timelong_min;
+	}
+	public void setEndurance_actual_timelong_min(float endurance_actual_timelong_min) {
+		this.endurance_actual_timelong_min = endurance_actual_timelong_min;
+	}
+	public int getIs_out_stand() {
+		return is_out_stand;
+	}
+	public void setIs_out_stand(int is_out_stand) {
+		this.is_out_stand = is_out_stand;
+	}
+	public String getNote() {
+		return note;
+	}
+	public void setNote(String note) {
+		this.note = note;
+	}
+	public String getStationName() {
+		return stationName;
+	}
+	public void setStationName(String stationName) {
+		this.stationName = stationName;
+	}
+	public String getStationName1() {
+		return stationName1;
+	}
+	public void setStationName1(String stationName1) {
+		this.stationName1 = stationName1;
+	}
+	public String getStationName2() {
+		return stationName2;
+	}
+	public void setStationName2(String stationName2) {
+		this.stationName2 = stationName2;
+	}
+	public String getStationName5() {
+		return stationName5;
+	}
+	public void setStationName5(String stationName5) {
+		this.stationName5 = stationName5;
+	}
+	public Page getPage() {
+		return page;
+	}
+	public void setPage(Page page) {
+		this.page = page;
 	}
 	@Override
 	public String toString() {
 		return "Batt_endurance [num=" + num + ", deviceId=" + deviceId
-				+ ", stationid=" + stationid + ", endurance_state="
-				+ endurance_state + ", real_cap=" + real_cap + ", moncapstd="
-				+ moncapstd + ", real_curr=" + real_curr
-				+ ", endurance_timelong=" + endurance_timelong + "]";
+				+ ", stationid=" + stationid + ", real_cap=" + real_cap
+				+ ", moncapstd=" + moncapstd + ", real_curr=" + real_curr
+				+ ", endurance_theory_timelong=" + endurance_theory_timelong
+				+ ", endurance_actual_timelong=" + endurance_actual_timelong
+				+ ", endurance_actual_timelong_max="
+				+ endurance_actual_timelong_max
+				+ ", endurance_actual_timelong_min="
+				+ endurance_actual_timelong_min + ", is_out_stand="
+				+ is_out_stand + ", note=" + note + ", stationName="
+				+ stationName + ", stationName1=" + stationName1
+				+ ", stationName2=" + stationName2 + ", stationName5="
+				+ stationName5 + ", page=" + page + "]";
 	}
-	
 	
 
 }

--
Gitblit v1.9.1