From e247fa318a67e953a13252dc82ecadca614b8268 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.24>
Date: 星期三, 14 十一月 2018 16:30:34 +0800
Subject: [PATCH] 查询所有的电池组信息和查询所有的设备连接状态

---
 gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
index 0a55545..6a2e01d 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
+++ b/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;
@@ -107,6 +109,19 @@
 		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;
 	}

--
Gitblit v1.9.1