81041
2018-11-12 c64cbbe5f5b692c21380396312bd2029cd5f3c6f
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_stateImpl.java
@@ -345,7 +345,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  from db_ram_db.tb_fbs9100_state where dev_id=? limit 1";
      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";
      List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{fs.getDev_id()},new CallBack() {
         
         public List getResults(ResultSet rs) {
@@ -380,6 +380,8 @@
                  fstate.setDev_last_captest_stop_type(rs.getInt("dev_last_captest_stop_type"));
                  fstate.setDev_temp(rs.getFloat("dev_temp"));
                  fstate.setBatt_online_state(rs.getInt("batt_online_state"));
                  fstate.setDev_commcount(rs.getInt("dev_commcount"));
                  fstate.setDev_errcommcount(rs.getInt("dev_errcommcount"));
                  list.add(fstate);
               }
            } catch (SQLException e) {
@@ -750,14 +752,15 @@
                " ,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_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  " +
                //" ,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+"  "+
                " and db_battinf.tb_battinf.fbsdeviceId=db_ram_db.tb_fbs9100_state.dev_id  " +
                " and db_battinf.tb_battinf.battgroupid=db_ram_db.tb_batt_rtstate.battgroupid " +
                //" and db_battinf.tb_battinf.battgroupid=db_ram_db.tb_batt_rtstate.battgroupid " +
                " and db_battinf.tb_battinf.fbsdeviceId in(select distinct db_battinf.tb_battinf.fbsdeviceId  from db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf    where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId    and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id   and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid   " +
                " and db_user.tb_user_inf.uid=? )  " +
                " " ;
      //System.err.println(sql);
      List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
         
         public List getResults(ResultSet rs) {
@@ -802,7 +805,7 @@
                  /*fstate.setOnline_vols(((Float)rs.getFloat("online_vol")).toString());
                  fstate.setGroup_vols(((Float)rs.getFloat("group_vol")).toString());
                  fstate.setGroup_currs(((Float)rs.getFloat("group_curr")).toString());*/
                  fstate.setNum(rs.getInt("batt_test_tlong"));
                  //fstate.setNum(rs.getInt("batt_test_tlong"));
                  list.add(fstate);
               }
            } catch (SQLException e) {