81041
2018-12-05 01f4050c3529f85ec05673fea9273f35c6e5e934
gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
@@ -27,6 +27,7 @@
import com.fgkj.dto.Batttestdata_inf;
import com.fgkj.dto.Page;
import com.fgkj.dto.ServiceModel;
import com.fgkj.dto.User;
import com.fgkj.dto.User_inf;
import com.fgkj.dto.User_log;
@@ -175,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;
   }    
@@ -224,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);//容量告警告警数
@@ -238,11 +253,10 @@
      adata.setAlm_cleared_type(0);//单体内阻告警数
      adata.setUsr_Id(0);//连接条阻抗告警数
      adata.setAlm_value(0f);//容量更换告警
      bmd.setAdata(adata);
        adata.setRecord_Id(0l);//在线电压告警数
      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){
@@ -279,6 +293,9 @@
            }
            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){
               adata.setRecord_Id((long)list.get(i).getNum());//在线电压告警数
               numZ+=list.get(i).getNum();
            }
@@ -566,20 +583,21 @@
      tdata.setRecord_time(ActionUtil.getSimpDate(date1));
      tdata.setRecord_time1(ActionUtil.getSimpDate(date2));
      
      User_inf uinf=new User_inf();
      uinf.setUId(1002);
      Batt_Maint_Dealarm bmd = new Batt_Maint_Dealarm();
      bmd.setPage(p);
      bmd.setAdata(adata);
      bmd.setMainf(mainf);
      bmd.setBinf(binf);
      bmd.setTdata(tdata);
      bmd.setUinf(uinf);
      //System.out.println(bmd);
      //bs.serchByCondition(bmd);
      //bs.serchByInfo(bmd);
      //.serchAlm(bmd);
      bs.serchAlm(uinf);
      //bs.serchGood();
      User_inf uinf=new User_inf();
      uinf.setUId(1038);
      bs.serchTopAlmTen(uinf);
      //bs.serchTopAlmTen(uinf);
   }
}