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

81041

2018-11-14 99285fcc7d30e62f1e84e1c96d29d0ffcd9ccdbc

 gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java

@@ -2,6 +2,8 @@


import java.util.List;



import javax.servlet.http.HttpServletResponse;



import com.fgkj.actions.ActionUtil;

import com.fgkj.dto.BattInf;

import com.fgkj.dto.ServiceModel;

@@ -93,13 +95,33 @@
      result = tojson(model);

      return SUCCESS;   

     }

   //导航上实时查询61850设备的处于核容测试的数据

    //导航上实时查询61850设备的处于核容测试的数据

     public String seach6185Nuclear_cap(){

      User_inf uinf=(User_inf) getUser();

        ServiceModel model = service.seach6185Nuclear_cap(uinf);

      result = tojson(model);

      return SUCCESS;   

     }

  //导航上实时查询bts处于放电测试的数据的设备

     public String seachNuclear_cap(){

      User_inf uinf=(User_inf) getUser();

        ServiceModel model = service.seachNuclear_cap(uinf);

      result = tojson(model);

      return SUCCESS;	
     }

  	  
   //11.1FBS9100设备通信状态查询             <--     跨域    -->

     public String serchByCondition_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 = service.serchByCondition_ky();

        result = tojson(model);

        return SUCCESS;	
     }

  	
  	
   public String getResult() {

      return result;

   }