From 253879d0d562db0290a67160d30d3f15e8e7bf09 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期二, 15 一月 2019 17:12:32 +0800
Subject: [PATCH] 修改

---
 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$4.class  |    0 
 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$7.class  |    0 
 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$10.class |    0 
 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.class    |    0 
 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$11.class |    0 
 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$5.class  |    0 
 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$12.class |    0 
 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$9.class  |    0 
 gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java                         |    3 ++-
 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$13.class |    0 
 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$8.class  |    0 
 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$6.class  |    0 
 12 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$10.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$10.class
index b8cec8a..3d80f41 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$10.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$10.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$11.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$11.class
index 8bba838..1399f14 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$11.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$11.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$12.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$12.class
index 7822ff7..8540b5d 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$12.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$12.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$13.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$13.class
index 2e8a2e3..e80b534 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$13.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$13.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$4.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$4.class
index eb56940..aa66d3c 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$4.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$4.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$5.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$5.class
index 16bd78d..d583235 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$5.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$5.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$6.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$6.class
index b164d31..1dc4099 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$6.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$6.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$7.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$7.class
index 6c55889..9e73285 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$7.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$7.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$8.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$8.class
index d999caf..0b2701a 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$8.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$8.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$9.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$9.class
index cdc1049..9d653b1 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$9.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl$9.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.class
index 9131098..934a8ef 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.class
Binary files differ
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java
index 606738a..cfae510 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java
@@ -414,7 +414,7 @@
     //瀹炴椂鐩戞祴鐣岄潰鏍规嵁dev_alarmstate鐘舵�佸垽鏂帴瑙﹀櫒鐘舵��
 	public List serchContactorState(Object obj) {
 		Fbs9100_state fs=(Fbs9100_state) obj;
-		String sql="select dev_id,dev_alarmstate,dev_workstate,record_datetime,dev_temp,dev_res_test_state,dev_testtype,dev_testgroupnum,dev_conresist,dev_concurr,dev_condvoldp,dev_condcurr,dev_61850alarms,dev_last_captest_stop_type,batt_online_state,dev_commcount,dev_errcommcount  from db_ram_db.tb_fbs9100_state where dev_id=? limit 1";
+		String sql="select dev_id,dev_version,dev_alarmstate,dev_workstate,record_datetime,dev_temp,dev_res_test_state,dev_testtype,dev_testgroupnum,dev_conresist,dev_concurr,dev_condvoldp,dev_condcurr,dev_61850alarms,dev_last_captest_stop_type,batt_online_state,dev_commcount,dev_errcommcount  from db_ram_db.tb_fbs9100_state where dev_id=? limit 1";
 		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{fs.getDev_id()},new CallBack() {
 			
 			public List getResults(ResultSet rs) {
@@ -433,6 +433,7 @@
 						}else{
 							ContactorState="寮�鍏抽棴鍚�";
 						}
+						fstate.setDev_version(rs.getString("dev_version"));
 						fstate.setRecord_datetime(rs.getString("record_datetime"));
 						fstate.setDev_testgroupnum(rs.getInt("dev_testgroupnum"));			//琚祴鐢垫睜缁勫彿
 						fstate.setDev_alarmstate(rs.getInt("dev_alarmstate"));

--
Gitblit v1.9.1