From a4f1d4cd325f9ae6a2879dd5e53ac189fe6d1677 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期六, 29 九月 2018 17:44:29 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dto/Batt_endurance.java | 76 ++++++++++++++++++++++++++++---------
1 files changed, 57 insertions(+), 19 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/Batt_endurance.java b/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
index cbd384e..17179ac 100644
--- a/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
+++ b/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
@@ -6,12 +6,18 @@
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 int endurance_theory_timelong;//鐞嗚
+ private int endurance_actual_timelong;//瀹為檯
+ private int is_out_stand;
private String note;
+ private String stationName;
+ private String stationName1;//鐪佺骇
+ private String stationName2;//甯傜骇
+
+ private Page page;//鍒嗛〉
public int getNum() {
return num;
}
@@ -29,12 +35,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;
@@ -54,11 +54,24 @@
public void setReal_curr(float real_curr) {
this.real_curr = real_curr;
}
- public int getEndurance_timelong() {
- return endurance_timelong;
+
+ public int getEndurance_theory_timelong() {
+ return endurance_theory_timelong;
}
- public void setEndurance_timelong(int endurance_timelong) {
- this.endurance_timelong = endurance_timelong;
+ public void setEndurance_theory_timelong(int endurance_theory_timelong) {
+ this.endurance_theory_timelong = endurance_theory_timelong;
+ }
+ public int getEndurance_actual_timelong() {
+ return endurance_actual_timelong;
+ }
+ public void setEndurance_actual_timelong(int endurance_actual_timelong) {
+ this.endurance_actual_timelong = endurance_actual_timelong;
+ }
+ 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;
@@ -66,17 +79,42 @@
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 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 + ", note="
- + note + "]";
+ + ", stationid=" + stationid + ", real_cap=" + real_cap
+ + ", moncapstd=" + moncapstd + ", real_curr=" + real_curr
+ + ", endurance_theory_timelong=" + endurance_theory_timelong
+ + ", endurance_actual_timelong=" + endurance_actual_timelong
+ + ", is_out_stand=" + is_out_stand + ", note=" + note
+ + ", stationName=" + stationName + ", stationName1="
+ + stationName1 + ", stationName2=" + stationName2 + ", page="
+ + page + "]";
}
-
-
}
--
Gitblit v1.9.1