From 99285fcc7d30e62f1e84e1c96d29d0ffcd9ccdbc Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.30>
Date: 星期三, 14 十一月 2018 17:33:27 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java | 10 ++++++++++
gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java | 14 ++++++++++++++
gx_tieta/src/com/fgkj/actions/ActionUtil.java | 10 ++++++++++
3 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/ActionUtil.java b/gx_tieta/src/com/fgkj/actions/ActionUtil.java
index b9bface..a68083d 100644
--- a/gx_tieta/src/com/fgkj/actions/ActionUtil.java
+++ b/gx_tieta/src/com/fgkj/actions/ActionUtil.java
@@ -475,4 +475,14 @@
return b;
}
+
+ /**
+ * 鍏佽璺ㄥ煙璇锋眰
+ */
+ public static void isAllowHeaders(){
+ HttpServletResponse res = 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");
+ }
}
diff --git a/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java b/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java
index 87e3eec..7bc9597 100644
--- a/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java
@@ -26,6 +26,16 @@
result=tojson(model);
return SUCCESS;
}
+
+ //璺ㄥ煙璁块棶鏌ヨ鐢垫睜缁勭殑鍗曚綋鏁版嵁
+ 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);
+ result=ActionUtil.tojson(model);
+ return SUCCESS;
+ }
+
public String getResult() {
return result;
}
diff --git a/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java b/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java
index 514cd0b..23bb17f 100644
--- a/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java
@@ -2,9 +2,12 @@
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;
@@ -84,6 +87,17 @@
result = ActionUtil.tojson(model);
return SUCCESS;
}
+
+ //瀹炴椂鐩戞祴涓殑鏌ヨ瀹炴椂缁勭淇℃伅 <!-- 璺ㄥ煙璁块棶 --->
+ public String serchByCondition_ky(){
+ ActionUtil.isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
+ //System.out.println("寮�濮嬫煡璇tstate");
+ rtstate = ActionUtil.getGson().fromJson(json, Batt_rtstate.class);
+ model=service.serchByCondition_ky(rtstate);
+ //System.out.println(model);
+ result = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").toJson(model);
+ return SUCCESS;
+ }
public ServiceModel getModel() {
return model;
--
Gitblit v1.9.1