81041
2018-11-20 680fa8d2c3fd3d509fa2832a983afab8d2b4cd25
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;
@@ -238,7 +239,7 @@
      adata.setAlm_cleared_type(0);//单体内阻告警数
      adata.setUsr_Id(0);//连接条阻抗告警数
      adata.setAlm_value(0f);//容量更换告警
        adata.setRecord_Id(0l);//在线电压告警数
      bmd.setAdata(adata);
      int numZ=0;//告警总数
      //求八种类型告警的数量  
@@ -280,6 +281,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();
            }
         }
@@ -287,7 +291,7 @@
      adata.setNum(numZ);//实时告警总数
      model.setCode(1);
      model.setData(adata);
      //System.out.println(model.getData());
      System.out.println(model.getData());
      return model;   
   }
@@ -566,20 +570,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(bmd);
      //bs.serchGood();
      User_inf uinf=new User_inf();
      uinf.setUId(1038);
      bs.serchTopAlmTen(uinf);
      //bs.serchTopAlmTen(uinf);
   }
}