From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:30:50 +0800
Subject: [PATCH] 未审批可更改
---
gx_tieta/src/com/fgkj/dto/Batt_endurance.java | 53 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/Batt_endurance.java b/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
index 83c04bc..8fcc25a 100644
--- a/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
+++ b/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
@@ -9,13 +9,17 @@
private float real_cap;
private float moncapstd;
private float real_curr;
- private int endurance_theory_timelong;//鐞嗚
- private int endurance_actual_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;
}
@@ -52,18 +56,29 @@
public void setReal_curr(float real_curr) {
this.real_curr = real_curr;
}
-
- public int getEndurance_theory_timelong() {
+ public float getEndurance_theory_timelong() {
return endurance_theory_timelong;
}
- public void setEndurance_theory_timelong(int endurance_theory_timelong) {
+ public void setEndurance_theory_timelong(float endurance_theory_timelong) {
this.endurance_theory_timelong = endurance_theory_timelong;
}
- public int getEndurance_actual_timelong() {
+ public float getEndurance_actual_timelong() {
return endurance_actual_timelong;
}
- public void setEndurance_actual_timelong(int 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;
@@ -95,6 +110,18 @@
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
@@ -102,11 +129,15 @@
+ ", 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 + "]";
+ + ", 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