Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git i...

didiyu

2018-12-11 b8f449dca8e53bbd5c0e424befe07c8207c10032

 gx_tieta/src/com/fgkj/services/BattInfServices.java

@@ -986,14 +986,44 @@
   }

   //首页上显示已安装数和全部基站数

    public ServiceModel serchDevice(Object obj){

      int devNum=(new BattInfImpl()).serchByDeviceId(obj);      //总设备数(已安装)

      int allNum=(new BattInfImpl()).serchByDeviceId_all(obj);      //总设备数(全部)

      model.setSum(allNum);

      model.setNewsum(devNum);

      //int devNum=(new BattInfImpl()).serchByDeviceId(obj);      //总设备数(已安装)

      List list=(new BattInfImpl()).serchByDeviceId_all(obj);      //总设备数(全部)

      if (list != null && list.size() > 0) {

         model.setCode(1);

         model.setData(list);

         model.setMsg("查询成功!");

      }else{

         model.setCode(0);

         model.setMsg("查询失败!");

      }

      //System.out.println(model.getData());

      return model;

    }



   public static void main(String[] args) {

    //头部查出已安装的所有机房

    public ServiceModel serchByDeviceId(Object obj){

      int devNum=(new BattInfImpl()).serchByDeviceId(obj);      //总设备数(已安装)

      model.setCode(1);

      model.setSum(devNum);

      model.setMsg("查询成功!");

      return model;

    }

    //头部查出已安装的电池单体

    public ServiceModel serchByInstall_count(Object obj){

      int devNum=(new BattInfImpl()).serchByInstall_count(obj);      //总设备数(已安装)

      model.setCode(1);

      model.setSum(devNum);

      model.setMsg("查询成功!");

      return model;

    }

	
    //添加操作时查询出设备id

    public ServiceModel searchmaxdev_id(){

       int dev_id=BattinfGroupFactory.searchmaxdev_id();

       model.setData(dev_id);

       return model;

    }

    
    public static void main(String[] args) {

      //new BattInfServices().findMenu();

      BattInf b=new BattInf();

      //b.setBattGroupId(1000005);