From 82c1e7ced425f43781b0cd01290fad298f51e623 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期六, 29 六月 2019 13:27:41 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of http://whyclj@118.89.139.230:10101/r/~whyclxw/sensor.git into dev_lxw
---
sensor/src/com/fgkj/actions/Sensor_hisdataAction.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/sensor/src/com/fgkj/actions/Sensor_hisdataAction.java b/sensor/src/com/fgkj/actions/Sensor_hisdataAction.java
index 01cf1c2..fb1eab8 100644
--- a/sensor/src/com/fgkj/actions/Sensor_hisdataAction.java
+++ b/sensor/src/com/fgkj/actions/Sensor_hisdataAction.java
@@ -11,12 +11,18 @@
//鏍规嵁璁惧id鏌ヨ鍘嗗彶璁板綍
public String serchByCondition() {
- Sensor_hisdata sdata=getGson().fromJson(json, Sensor_hisdata.class);
+ Sensor_hisdata sdata=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Sensor_hisdata.class);
ServiceModel model=service.serchByCondition(sdata);
result=tojson(model);
- return json;
+ return SUCCESS;
}
-
+ //瀹炴椂椤甸潰鏈�鏂扮殑鐨�10绗旀暟鎹�
+ public String serchByInfo() {
+ Sensor_hisdata sdata=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Sensor_hisdata.class);
+ ServiceModel model=service.serchByInfo(sdata);
+ result=tojson(model);
+ return SUCCESS;
+ }
--
Gitblit v1.9.1