81041
2020-01-06 dc4e90ff7d720a78dba3aa72d868b89f69eafff7
Device_Manage/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java
@@ -79,14 +79,16 @@
   }
   //查询所有的历史告警(分页)
   public List serchByInfo(Object obj) {
      Page page=(Page) obj;
      BattInf binf=(BattInf) obj;
      Page page=binf.getPage();
      String sql="select  distinct(db_alarm.tb_battalarm_data_history.BattGroupId),db_alarm.tb_battalarm_data_history.num,alm_signal_id,db_alarm.tb_battalarm_data_history.monnum,alm_value,alm_level,alm_is_confirmed,alm_confirmed_time,alm_start_time,alm_end_time "
            + " ,FBSDeviceId,BattGroupName  "
            + " from db_alarm.tb_battalarm_data_history,db_battinf.tb_battinf"
            + " where db_alarm.tb_battalarm_data_history.battGroupId=db_battinf.tb_battinf.battGroupId  "
            + " and db_battinf.tb_battinf.FBSDeviceId=? "
            + " order by db_alarm.tb_battalarm_data_history.BattGroupId asc,alm_start_time desc "
            + " limit ?,? ";
      List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),  new Object[]{(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
      List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),  new Object[]{binf.getFBSDeviceId(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
         
         @Override
         public List getResults(ResultSet rs) {