81041
2018-11-23 fe0566b75eb4cd447eaaf4b042e600b413698a99
gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
@@ -225,12 +225,12 @@
      
   }
   
   //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);//容量告警告警数
      //adata.setBattGroupId(0);//容量告警告警数
      adata.setMonNum(0);//组端电压告警数
      adata.setAlm_id(0);//充电电流告警数
      adata.setAlm_signal_id(0);//放电电流告警数
@@ -238,7 +238,7 @@
      adata.setAlm_is_confirmed(0);//单体温度告警数
      adata.setAlm_cleared_type(0);//单体内阻告警数
      adata.setUsr_Id(0);//连接条阻抗告警数
      adata.setAlm_value(0f);//容量更换告警
      //adata.setAlm_value(0f);//容量更换告警
        adata.setRecord_Id(0l);//在线电压告警数
      bmd.setAdata(adata);
      int numZ=0;//告警总数
@@ -246,10 +246,10 @@
      List<Battalarm_data> list=((Battalarm_dataDAOImpl)dao).serchAlm(bmd);
      if(list!=null&&list.size()>0){
         for(int i=0;i<list.size();i++){
            if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_CapAlarm){
            /*if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_CapAlarm){
               adata.setBattGroupId(list.get(i).getNum());//容量告警告警数
               numZ+=list.get(i).getNum();
            }
            }*/
            if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_vol_Group){
               adata.setMonNum(list.get(i).getNum());//组端电压告警数
               numZ+=list.get(i).getNum();
@@ -278,10 +278,10 @@
               adata.setUsr_Id(list.get(i).getNum());//连接条阻抗告警数
               numZ+=list.get(i).getNum();
            }
            if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_CapChange){
            /*if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_CapChange){
               adata.setAlm_value((float)list.get(i).getNum());//容量更换告警数
               numZ+=list.get(i).getNum();
            }if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_vol_Online){
            }*/if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_vol_Online){
               adata.setRecord_Id((long)list.get(i).getNum());//在线电压告警数
               numZ+=list.get(i).getNum();
            }