From b3460365bca5a645e3e37d69dd606ae8bea8cbb0 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期一, 07 一月 2019 16:11:00 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java b/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java
index 87e3eec..ecff064 100644
--- a/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java
@@ -26,6 +26,17 @@
result=tojson(model);
return SUCCESS;
}
+
+ //璺ㄥ煙璁块棶鏌ヨ鐢垫睜缁勭殑鍗曚綋鏁版嵁 < ! ---- ---- 璺ㄥ煙璁块棶 ------------>
+ public String serchByCondition_ky(){
+ //ActionUtil.isAllowHeaders();
+ ServiceModel model = new ServiceModel();
+ Batt_rtdata rtdata=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Batt_rtdata.class);
+ model=service.serchByCondition_ky(rtdata);
+ result=ActionUtil.tojson(model);
+ return SUCCESS;
+ }
+
public String getResult() {
return result;
}
--
Gitblit v1.9.1