81041
2018-11-23 c07be7fabadfa7a9cae03601477f98a2bbe085ea
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());