From a0b185043d5a2a710d976acb8c59d3445a836320 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.20>
Date: 星期五, 23 十一月 2018 16:31: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 | 6 +++++-
1 files changed, 5 insertions(+), 1 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 72ca0a6..85977ab 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
@@ -818,7 +818,7 @@
String sql="select distinct dev_id,dev_alarmstate,dev_workstate,dev_temp,dev_res_test_state,dev_testtype,dev_testgroupnum " +
" ,dev_captest_onlinevol,dev_captest_groupvol,dev_captest_curr,dev_captest_cap,dev_captest_timelong" +
" ,dev_conresist,dev_concurr,dev_condvoldp,dev_condcurr,dev_61850alarms,dev_last_captest_stop_type " +
- " ,db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.FbsDeviceName " +
+ " ,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 " +
" from db_ram_db.tb_fbs9100_state,db_battinf.tb_battinf " +//,db_ram_db.tb_batt_rtstate
" where dev_workstate="+FBS9100_ComBase.DISCHARGE+" "+
@@ -868,6 +868,10 @@
fstate.setDev_last_captest_stop_type(rs.getInt("dev_last_captest_stop_type"));
fstate.setDev_temp(rs.getFloat("dev_temp"));
fstate.setStationName(rs.getString("stationName"));
+ fstate.setStationName1(rs.getString("stationName1"));
+ fstate.setStationName2(rs.getString("stationName2"));
+ fstate.setStationName3(rs.getString("stationName3"));
+ fstate.setStationName5(rs.getString("stationName5"));
fstate.setDeviceName(rs.getString("FbsDeviceName"));
/*fstate.setOnline_vols(((Float)rs.getFloat("online_vol")).toString());
fstate.setGroup_vols(((Float)rs.getFloat("group_vol")).toString());
--
Gitblit v1.9.1