From a852102b1b3f30a420b02c0aca96f13d0886af8e Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期三, 09 一月 2019 10:04:29 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 8554514..d51b0dd 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
@@ -988,7 +988,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 +1018,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