From 0edab78d73d975663da8ce2596a0a00c1b6a6db1 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 12 十一月 2018 08:51:53 +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/BattInf.java | 132 ++++++++++++++++++++++++++++++--------------
1 files changed, 90 insertions(+), 42 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/BattInf.java b/gx_tieta/src/com/fgkj/dto/BattInf.java
index 2b61ba0..59b57ef 100644
--- a/gx_tieta/src/com/fgkj/dto/BattInf.java
+++ b/gx_tieta/src/com/fgkj/dto/BattInf.java
@@ -3,7 +3,11 @@
import java.io.Serializable;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
+
+import com.mysql.fabric.xmlrpc.base.Array;
/**
* @author 鏄熶紵
@@ -12,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;
@@ -66,15 +71,18 @@
private String SignalId;
private Integer CInterFaceId;
private Float Load_curr;// 璐熻浇鐢垫祦
+ private Float DisCurrMax;//鏈�澶ф牳瀹圭數娴�
private String SignalName;
- private Integer StartNum;
- private Integer Size;
+ private Integer StartNum;
+ private Integer Station_install; //鏈烘埧璁惧鏄惁瀹夎
+ private Integer Size;
+ private Page page;
+ private Object obj;
+ private String station_phone;
public BattInf() {
super();
- // TODO Auto-generated constructor stub
}
-
public Integer getNum() {
return num;
}
@@ -486,47 +494,87 @@
public void setBattGuarantDayCount(Integer battGuarantDayCount) {
BattGuarantDayCount = battGuarantDayCount;
}
-
+
+ public Object getObj() {
+ return obj;
+ }
+ public void setObj(Object obj) {
+ this.obj = obj;
+ }
+
+ public Page getPage() {
+ return page;
+ }
+ 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;
+ }
+ public Integer getStation_install() {
+ return Station_install;
+ }
+ public void setStation_install(Integer station_install) {
+ Station_install = station_install;
+ }
@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 + ", 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
+ + ", 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 + ", 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
- + ", Size=" + Size + "]";
+ + ", Station_install=" + Station_install + ", Size=" + Size
+ + ", page=" + page + ", obj=" + obj + ", station_phone="
+ + station_phone + "]";
}
-
-
-
-
-
}
--
Gitblit v1.9.1