81041
2018-11-12 9e278f7c68d6e229901ed150963e9660c5f280db
gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
@@ -458,7 +458,31 @@
      }
      return model;
   }
   //告警发声(30秒之内的告警)
   public ServiceModel serchIn30(Object obj){
      List<Battalarm_data> lista=((Battalarm_dataDAOImpl)dao).serchIn30(obj);
      List<Batt_devalarm_data> listd=(new Batt_devalarm_dataImpl()).serchIn30(obj);
      if(listd!=null&&listd.size()>0){
         for (Batt_devalarm_data ddata : listd) {
            Battalarm_data data=new Battalarm_data();
            data.setAlm_id(ddata.getDev_id());
            data.setNote(ddata.getNote());
            data.setNum(ddata.getNum());//1表示设备告警
            data.setAlm_start_time(ddata.getAlm_start_time());
            data.setAlm_signal_id(ddata.getAlm_type());
            lista.add(data);
         }
      }
      if(lista!=null&&lista.size()>0){
         model.setCode(1);
         model.setData(lista);
         model.setMsg("查询成功!");
      }else{
         model.setCode(0);
         model.setMsg("查询失败!");
      }
      return model;
   }
   //点击项目下方的滚动,查询该条告警的实时信息
   public ServiceModel  serchBatt_alarm(Object obj){
      List list=((Battalarm_dataDAOImpl)dao).serchBatt_alarm(obj);