From b3244aa00f7152fb5328914847360a4ae17ddf4e Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.20>
Date: 星期四, 15 十一月 2018 09:06:18 +0800
Subject: [PATCH] 电池组单体实时数据和电池组历史数据查询<----------跨域访问------------>
---
gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java | 2 +-
gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java | 12 ++++++++++++
gx_tieta/src/com/fgkj/actions/BatttestdataAction.java | 14 ++++++++++++++
3 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java b/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java
index 7bc9597..4552b44 100644
--- a/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java
@@ -27,7 +27,7 @@
return SUCCESS;
}
- //璺ㄥ煙璁块棶鏌ヨ鐢垫睜缁勭殑鍗曚綋鏁版嵁
+ //璺ㄥ煙璁块棶鏌ヨ鐢垫睜缁勭殑鍗曚綋鏁版嵁 < ! ---- ---- 璺ㄥ煙璁块棶 ------------>
public String serchByCondition_ky(){
ActionUtil.isAllowHeaders();
Batt_rtdata rtdata=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Batt_rtdata.class);
diff --git a/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java b/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
index ab48698..f0ae854 100644
--- a/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
@@ -33,6 +33,20 @@
//System.out.println("*************************");
return SUCCESS;
}
+
+ /**
+ * 鍘嗗彶鏁版嵁鏌ヨ <!------------- 璺ㄥ煙璁块棶 -------------------->
+ * @return
+ */
+ public String findhistory_ky(){
+ ActionUtil.isAllowHeaders();
+ Batttestdata btd = ActionUtil.getGson().fromJson(json, Batttestdata.class);
+ //System.out.println(btd);
+ ServiceModel model = service.serchByCondition_ky(btd);
+ result = ActionUtil.tojson(model);
+ //System.out.println("*************************");
+ return SUCCESS;
+ }
public void setBtd(Batttestdata btd) {
diff --git a/gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java b/gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java
index 754884e..1f594b2 100644
--- a/gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java
@@ -88,6 +88,18 @@
return SUCCESS;
}
+
+ /**
+ * 鏍规嵁鐢垫睜缁刬d鏌ヨ鐢垫睜缁勭殑inf琛ㄤ腑鐨勬斁鐢典俊鎭� <!------ 璺ㄥ煙璁块棶 --------->
+ */
+ public String searchBattTestInfDataById_ky(){
+ ActionUtil.isAllowHeaders();
+ Batttestdata_inf bti = ActionUtil.getGson().fromJson(json, Batttestdata_inf.class);
+ model=service.serchByCondition_ky(bti);
+ result=ActionUtil.tojson(model);
+ return SUCCESS;
+ }
+
public void setBti(Batttestdata_inf bti) {
this.bti = bti;
}
--
Gitblit v1.9.1