From eaf2374e6212aaab4db0767d1c7ca184d189821b Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 16 十一月 2018 08:52:24 +0800
Subject: [PATCH] 实时监测内容

---
 gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java b/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java
index 4552b44..304eac1 100644
--- a/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java
@@ -30,8 +30,14 @@
 	//璺ㄥ煙璁块棶鏌ヨ鐢垫睜缁勭殑鍗曚綋鏁版嵁			< ! ---- ----  璺ㄥ煙璁块棶  ------------>
 	public String serchByCondition_ky(){
 		ActionUtil.isAllowHeaders();
-		Batt_rtdata rtdata=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Batt_rtdata.class);
-		ServiceModel model=service.serchByCondition_ky(rtdata);
+		ServiceModel model = new ServiceModel();
+		if(key != null && CROSS_DOMAIN_KEY.equals(key)){			
+			Batt_rtdata rtdata=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Batt_rtdata.class);
+			model=service.serchByCondition_ky(rtdata);			
+		}else{
+			model.setCode(0);
+			model.setMsg("璇嗗埆鐮侀敊璇�");
+		}
 		result=ActionUtil.tojson(model);
 		return SUCCESS;
 	}

--
Gitblit v1.9.1