From fa00382db413a8489d07983b66f0869305b51a9a Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 11 一月 2019 11:35:54 +0800
Subject: [PATCH] 批量读取系统参数

---
 gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

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 b212df0..606738a 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
@@ -4,6 +4,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import com.fgkj.dao.BaseDAO;
 import com.fgkj.dao.CallBack;
@@ -450,6 +451,7 @@
 						fstate.setBatt_online_state(rs.getInt("batt_online_state"));
 						fstate.setDev_commcount(rs.getInt("dev_commcount"));
 						fstate.setDev_errcommcount(rs.getInt("dev_errcommcount"));
+						fstate.setNote(DAOHelper.sdf.format(new Date()));
 						list.add(fstate);
 					}
 				} catch (SQLException e) {
@@ -907,10 +909,10 @@
     			+ " and db_user.tb_user_battgroup_baojigroup_usr.uId=?  "
     			+ " and db_battinf.tb_battinf.MonVolStd=? ";
     	//鏉′欢
-		String sql0=" and stationid=? "; //鍏蜂綋鏈烘埧
-		String sql1=" and stationname1=? ";//鐪�
-		String sql2=" and stationname2=? ";//甯�
-		String sql5=" and stationname5=? ";//鍖哄幙
+		String sql0=" and db_battinf.tb_battinf.stationid=? "; //鍏蜂綋鏈烘埧
+		String sql1=" and db_battinf.tb_battinf.stationname1=? ";//鐪�
+		String sql2=" and db_battinf.tb_battinf.stationname2=? ";//甯�
+		String sql5=" and db_battinf.tb_battinf.stationname5=? ";//鍖哄幙
 		switch (binf.getNum()) {
 		case 0:
 			sql+=sql0;
@@ -988,7 +990,7 @@
 			       " ,dev_captest_onlinevol,dev_captest_groupvol,dev_captest_curr,dev_captest_cap,dev_captest_timelong,dev_commcount" +
 			       " ,dev_conresist,dev_concurr,dev_condvoldp,dev_condcurr,dev_61850alarms,dev_last_captest_stop_type  " +
 			       " ,db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.StationName1,db_battinf.tb_battinf.StationName2,db_battinf.tb_battinf.StationName3,db_battinf.tb_battinf.StationName5,db_battinf.tb_battinf.FbsDeviceName   " +
-			       " ,db_ram_db.tb_batt_rtstate.batt_test_tlong  " +//,db_ram_db.tb_batt_rtstate.group_curr,db_ram_db.tb_batt_rtstate.group_vol 
+			       " ,db_ram_db.tb_batt_rtstate.batt_test_tlong,db_ram_db.tb_batt_rtstate.online_vol,db_ram_db.tb_batt_rtstate.group_curr,db_ram_db.tb_batt_rtstate.group_vol,db_ram_db.tb_batt_rtstate.batt_test_cap " +
 			       " from db_ram_db.tb_fbs9100_state,db_battinf.tb_battinf  ,db_ram_db.tb_batt_rtstate"+
 			       " where  db_battinf.tb_battinf.battgroupid=? "+
 			       " and db_battinf.tb_battinf.fbsdeviceId=db_ram_db.tb_fbs9100_state.dev_id  " +
@@ -1018,12 +1020,13 @@
 							fstate.setNote(ContactorState);
 							fstate.setDev_workstate(rs.getInt("dev_workstate"));
 							fstate.setDev_id(rs.getInt("dev_id"));
-							
-							fstate.setDev_captest_onlinevol(rs.getFloat("dev_captest_onlinevol"));
-							fstate.setDev_captest_groupvol(rs.getFloat("dev_captest_groupvol"));
-							fstate.setDev_captest_curr(rs.getFloat("dev_captest_curr"));
-							fstate.setDev_captest_cap(rs.getFloat("dev_captest_cap"));
+							//杩欎簲涓弬鏁伴兘鏄痓att_rtstate涓殑鏁版嵁
+							fstate.setDev_captest_onlinevol(rs.getFloat("online_vol"));
+							fstate.setDev_captest_groupvol(rs.getFloat("group_vol"));
+							fstate.setDev_captest_curr(rs.getFloat("group_curr"));
+							fstate.setDev_captest_cap(rs.getFloat("batt_test_cap"));
 							fstate.setDev_captest_timelong(rs.getInt("batt_test_tlong"));//瀹為檯鏀剧數鏃跺父
+							
 							fstate.setDev_commcount(rs.getInt("dev_commcount"));
 							fstate.setDev_conresist(rs.getFloat("dev_conresist"));
 							fstate.setDev_concurr(rs.getFloat("dev_concurr"));

--
Gitblit v1.9.1