81041
2018-12-05 01f4050c3529f85ec05673fea9273f35c6e5e934
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;
   }    
@@ -225,9 +240,8 @@
      
   }
   
   //0.5查询实时告警数
   //0.5查询实时告警数(电池告警率)
   public ServiceModel serchAlm(Object obj){
      Batt_Maint_Dealarm bmd=(Batt_Maint_Dealarm) obj;
      Battalarm_data adata=new Battalarm_data();
      adata.setNum(0);//实时告警总数
      adata.setBattGroupId(0);//容量告警告警数
@@ -240,10 +254,9 @@
      adata.setUsr_Id(0);//连接条阻抗告警数
      adata.setAlm_value(0f);//容量更换告警
        adata.setRecord_Id(0l);//在线电压告警数
      bmd.setAdata(adata);
      int numZ=0;//告警总数
      //求八种类型告警的数量  
      List<Battalarm_data> list=((Battalarm_dataDAOImpl)dao).serchAlm(bmd);
      List<Battalarm_data> list=((Battalarm_dataDAOImpl)dao).serchAlm(obj);
      if(list!=null&&list.size()>0){
         for(int i=0;i<list.size();i++){
            if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_CapAlarm){
@@ -291,7 +304,7 @@
      adata.setNum(numZ);//实时告警总数
      model.setCode(1);
      model.setData(adata);
      System.out.println(model.getData());
      //System.out.println(model.getData());
      return model;   
   }
@@ -582,7 +595,7 @@
      //System.out.println(bmd);
      //bs.serchByCondition(bmd);
      //bs.serchByInfo(bmd);
      bs.serchAlm(bmd);
      bs.serchAlm(uinf);
      //bs.serchGood();
      //bs.serchTopAlmTen(uinf);
   }