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

didiyu

2018-12-11 b8f449dca8e53bbd5c0e424befe07c8207c10032

 gx_tieta/src/com/fgkj/actions/BattInfAction.java

@@ -59,6 +59,13 @@
      result = tojson(model);

      return SUCCESS;

   }

   //设置电池组充电电流阈值

   public String update_charge() {

      BattInf binf= getGson("yyyy-MM-dd").fromJson(json, BattInf.class);

      ServiceModel model = service.update_charge(binf);

      result = tojson(model);

      return SUCCESS;

   }

   //删除电池组

   public String delete() {

      List<BattInf> list= getGson("yyyy-MM-dd").fromJson(json, new TypeToken<List<BattInf>>(){}.getType());

@@ -86,7 +93,15 @@
      //System.out.println(result);

      return SUCCESS;

   }



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

    public String searchmaxdev_id(){

       model = service.searchmaxdev_id();

      result = ActionUtil.tojson(model);

      return SUCCESS;

    }

    
    
   public String searchAll() {

      model = service.searchAll();

      result = ActionUtil.tojson(model);

@@ -379,16 +394,33 @@
   

   //跨域访问获取所有电池组的信息<-------跨域----------->

   public String searchInform_ky(){

      HttpServletResponse res = ActionUtil.getResponse();

      res.setHeader("Access-Control-Allow-Origin", "*");            //允许跨域访问

      res.setHeader("Access-Control-Allow-Headers", "X-Requested-With,content-type,token");

      res.setHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, PATCH");

      ServiceModel model;

      model = service.searchInform_ky();

      //isAllowHeaders();                     //允许跨域访问

      ServiceModel model = new ServiceModel();

      model = service.searchInform_ky();		
      result = ActionUtil.tojson(model);

      return SUCCESS;

   }

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

   public String serchDevice(){

      User_inf uinf=(User_inf) getUser();

      ServiceModel model = service.serchDevice(uinf);

      result = ActionUtil.tojson(model);

      return SUCCESS;

   }

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

   public String serchByDeviceId(){

      User_inf uinf=(User_inf) getUser();

      ServiceModel model = service.serchByDeviceId(uinf);

      result = ActionUtil.tojson(model);

      return SUCCESS;

   }

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

   public String serchByInstall_count(){

      User_inf uinf=(User_inf) getUser();

      ServiceModel model = service.serchByInstall_count(uinf);

      result = ActionUtil.tojson(model);

      return SUCCESS;

   }

   public BattInf getBif() {

      return bif;

   }