From 35fefed0792c40cb99b8d15fa5811bbb5992bff9 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期一, 21 一月 2019 10:42:24 +0800
Subject: [PATCH] 修改

---
 gx_tieta/src/com/fgkj/dto/ram/Fbs9100_state.java |   79 ++++++++++++++++++++++++---------------
 1 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dto/ram/Fbs9100_state.java b/gx_tieta/src/com/fgkj/dto/ram/Fbs9100_state.java
index 0234b7d..0ee9889 100644
--- a/gx_tieta/src/com/fgkj/dto/ram/Fbs9100_state.java
+++ b/gx_tieta/src/com/fgkj/dto/ram/Fbs9100_state.java
@@ -41,6 +41,10 @@
 	private String stationName3;
 	private String stationName5;
 	private String deviceName;//璁惧鍚嶇О
+	private int  monvolstd;
+	private int  battgroupid;
+	private int  moncount;
+	private int  moncapstd;
 	private String note;
 	private Page page;//鍒嗛〉
 	
@@ -319,39 +323,50 @@
 	public void setStationName5(String stationName5) {
 		this.stationName5 = stationName5;
 	}
+	public int getMonvolstd() {
+		return monvolstd;
+	}
+	public void setMonvolstd(int monvolstd) {
+		this.monvolstd = monvolstd;
+	}
+	public int getBattgroupid() {
+		return battgroupid;
+	}
+	public void setBattgroupid(int battgroupid) {
+		this.battgroupid = battgroupid;
+	}
+	public int getMoncount() {
+		return moncount;
+	}
+	public void setMoncount(int moncount) {
+		this.moncount = moncount;
+	}
+	public int getMoncapstd() {
+		return moncapstd;
+	}
+	public void setMoncapstd(int moncapstd) {
+		this.moncapstd = moncapstd;
+	}
 	@Override
 	public String toString() {
-		return "Fbs9100_state [num=" + num + ", dev_ip=" + dev_ip
-				+ ", dev_version=" + dev_version + ", dev_id=" + dev_id
-				+ ", op_cmd=" + op_cmd + ", record_datetime=" + record_datetime
-				+ ", dev_datetime=" + dev_datetime + ", dev_testtype="
-				+ dev_testtype + ", dev_testgroupnum=" + dev_testgroupnum
-				+ ", dev_workstate=" + dev_workstate + ", dev_alarmstate="
-				+ dev_alarmstate + ", dev_temp=" + dev_temp
-				+ ", dev_res_test_state=" + dev_res_test_state
-				+ ", dev_onlinevollow=" + dev_onlinevollow
-				+ ", dev_eachgroup_battsum=" + dev_eachgroup_battsum
-				+ ", dev_captest_onlinevol=" + dev_captest_onlinevol
-				+ ", dev_captest_groupvol=" + dev_captest_groupvol
-				+ ", dev_captest_curr=" + dev_captest_curr
-				+ ", dev_captest_cap=" + dev_captest_cap
-				+ ", dev_captest_timelong=" + dev_captest_timelong
-				+ ", dev_restest_moncount=" + dev_restest_moncount
-				+ ", dev_restest_monindex=" + dev_restest_monindex
-				+ ", dev_commcount=" + dev_commcount + ", dev_errcommcount="
-				+ dev_errcommcount + ", dev_rxnullerrcount="
-				+ dev_rxnullerrcount + ", batt_online_state="
-				+ batt_online_state + ", online_vols=" + online_vols
-				+ ", group_vols=" + group_vols + ", group_currs=" + group_currs
-				+ ", stationName=" + stationName + ", stationName1="
-				+ stationName1 + ", stationName2=" + stationName2
-				+ ", stationName3=" + stationName3 + ", stationName5="
-				+ stationName5 + ", deviceName=" + deviceName + ", note="
-				+ note + ", page=" + page + ", dev_conresist=" + dev_conresist
-				+ ", dev_concurr=" + dev_concurr + ", dev_condvoldp="
-				+ dev_condvoldp + ", dev_condcurr=" + dev_condcurr
-				+ ", dev_61850alarms=" + dev_61850alarms
-				+ ", dev_last_captest_stop_type=" + dev_last_captest_stop_type
+		return "Fbs9100_state [num=" + num + ", dev_ip=" + dev_ip + ", dev_version=" + dev_version + ", dev_id="
+				+ dev_id + ", op_cmd=" + op_cmd + ", record_datetime=" + record_datetime + ", dev_datetime="
+				+ dev_datetime + ", dev_testtype=" + dev_testtype + ", dev_testgroupnum=" + dev_testgroupnum
+				+ ", dev_workstate=" + dev_workstate + ", dev_alarmstate=" + dev_alarmstate + ", dev_temp=" + dev_temp
+				+ ", dev_res_test_state=" + dev_res_test_state + ", dev_onlinevollow=" + dev_onlinevollow
+				+ ", dev_eachgroup_battsum=" + dev_eachgroup_battsum + ", dev_captest_onlinevol="
+				+ dev_captest_onlinevol + ", dev_captest_groupvol=" + dev_captest_groupvol + ", dev_captest_curr="
+				+ dev_captest_curr + ", dev_captest_cap=" + dev_captest_cap + ", dev_captest_timelong="
+				+ dev_captest_timelong + ", dev_restest_moncount=" + dev_restest_moncount + ", dev_restest_monindex="
+				+ dev_restest_monindex + ", dev_commcount=" + dev_commcount + ", dev_errcommcount=" + dev_errcommcount
+				+ ", dev_rxnullerrcount=" + dev_rxnullerrcount + ", batt_online_state=" + batt_online_state
+				+ ", online_vols=" + online_vols + ", group_vols=" + group_vols + ", group_currs=" + group_currs
+				+ ", stationName=" + stationName + ", stationName1=" + stationName1 + ", stationName2=" + stationName2
+				+ ", stationName3=" + stationName3 + ", stationName5=" + stationName5 + ", deviceName=" + deviceName
+				+ ", monvolstd=" + monvolstd + ", battgroupid=" + battgroupid + ", moncount=" + moncount
+				+ ", moncapstd=" + moncapstd + ", note=" + note + ", page=" + page + ", dev_conresist=" + dev_conresist
+				+ ", dev_concurr=" + dev_concurr + ", dev_condvoldp=" + dev_condvoldp + ", dev_condcurr=" + dev_condcurr
+				+ ", dev_61850alarms=" + dev_61850alarms + ", dev_last_captest_stop_type=" + dev_last_captest_stop_type
 				+ "]";
 	}
 	
@@ -359,4 +374,6 @@
 	
 	
 	
+	
+	
 }

--
Gitblit v1.9.1