81041
2018-10-24 1b0f42c11f7573e56cc85551b762367f3d5da9cc
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  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  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) {
@@ -379,6 +379,7 @@
                  fstate.setDev_61850alarms(rs.getString("dev_61850alarms"));
                  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"));
                  list.add(fstate);
               }
            } catch (SQLException e) {
@@ -394,7 +395,7 @@
   public List serchByInfo(Object obj) {
      BattInf binf=(BattInf) obj;
      String sql="select fbs_rt.BattGroupId,fbs_rt.group_curr,fbs_rt.group_vol,fbs_rt.online_vol,fbs_rt.batt_state,fbs_rt.batt_test_type" +
            ",dev_id,dev_workstate,dev_alarmstate,dev_temp,dev_res_test_state,dev_testgroupnum,dev_conresist,dev_concurr,dev_condvoldp,dev_condcurr,dev_61850alarms,dev_last_captest_stop_type  " +
            ",dev_id,dev_workstate,dev_alarmstate,dev_temp,dev_res_test_state,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," +
            "(select distinct db_ram_db.tb_batt_rtstate.BattGroupId,group_curr,group_vol,online_vol,batt_state,batt_test_type,db_battinf.tb_battinf.FBSDeviceId from db_ram_db.tb_batt_rtstate,db_battinf.tb_battinf " +
            "where  db_battinf.tb_battinf.BattGroupId=db_ram_db.tb_batt_rtstate.BattGroupId " +
@@ -439,6 +440,7 @@
                  fstate.setDev_61850alarms(rs.getString("dev_61850alarms"));
                  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"));
                  list.add(fstate);
               }
            } catch (SQLException e) {