81041
2019-01-11 fa00382db413a8489d07983b66f0869305b51a9a
gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
@@ -176,13 +176,28 @@
   //3.1电池告警实时查询
   public ServiceModel serchByCondition(Object obj){
      model=new ServiceModel();
      List<Batt_Maint_Dealarm> list=dao.serchByCondition(obj);
      List list=dao.serchByCondition(obj);
      if(list!=null && list.size()>1){
         model.setCode(1);
         model.setData(list);
      }else {
         model.setCode(0);
         model.setData(list);
      }
      return model;
   }
   //3.1电池告警实时查询<***********跨域专用**************>
   public ServiceModel serchByCondition_ky(Object obj){
      model=new ServiceModel();
      List list=((Battalarm_dataDAOImpl)dao).serchByCondition_ky(obj);
      if(list!=null && list.size()>1){
         model.setCode(1);
         model.setData(list);
         model.setMsg("查询成功!");
      }else {
         model.setCode(0);
         model.setData(list);
         model.setMsg("查询失败!");
      }   
      return model;
   }    
@@ -289,7 +304,7 @@
      adata.setNum(numZ);//实时告警总数
      model.setCode(1);
      model.setData(adata);
      System.out.println(model.getData());
      //System.out.println(model.getData());
      return model;   
   }