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

hdw

2018-11-15 7d174fc58bcc9c136548c789fbdf350a3c6fe52b

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

@@ -2,16 +2,19 @@


import java.util.List;



import javax.servlet.http.HttpServletResponse;



import com.fgkj.dao.impl.Batt_rtstateDAOImpl;

import com.fgkj.dto.BattInf;

import com.fgkj.dto.Batt_Maint_Dealarm;

import com.fgkj.dto.Batt_rtdata;

import com.fgkj.dto.Batt_rtstate;

import com.fgkj.dto.ServiceModel;

import com.fgkj.dto.User_inf;

import com.fgkj.services.Batt_rtstateService;

import com.opensymphony.xwork2.ActionSupport;



public class Batt_rtstateAction extends ActionSupport{

public class Batt_rtstateAction extends ActionUtil{

   private Batt_rtstateService service=new Batt_rtstateService();

   private ServiceModel model;

   private Batt_rtstate rtstate;

@@ -84,6 +87,23 @@
      result = ActionUtil.tojson(model);

      return SUCCESS;

   }

	
   //实时监测中的查询实时组端信息      <!--   跨域访问 --->

   public String serchByCondition_ky(){	
      ActionUtil.isAllowHeaders();            //允许跨域访问

      model = new ServiceModel();

      if(key != null && CROSS_DOMAIN_KEY.equals(key)){

         //System.out.println("开始查询rtstate");

         rtstate = ActionUtil.getGson().fromJson(json, Batt_rtstate.class);

         model=service.serchByCondition_ky(rtstate);			
      }else{

         model.setCode(0);

         model.setMsg("识别码错误");

      }

      //System.out.println(model);

      result = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").toJson(model);

      return SUCCESS;

   }



   public ServiceModel getModel() {

      return model;