From dbc820a1c5fc1d4b124674858cb0cae270828dac Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期五, 21 十二月 2018 09:13:06 +0800
Subject: [PATCH] 手机端的设备实时告警和设备历史告警页面添加设备高温告警选项
---
gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java b/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java
index b24e635..3aceee1 100644
--- a/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java
@@ -54,8 +54,8 @@
}
//鏌ヨ鍑烘墍鏈夐渶瑕佺‘璁ょ殑鐢宠
public String serchByCondition(){
- Page page=ActionUtil.getGson().fromJson(json, Page.class);
- ServiceModel model=service.serchByCondition(page);
+ Battinf_apply bapply=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Battinf_apply.class);
+ ServiceModel model=service.serchByCondition(bapply);
result=tojson(model);
return SUCCESS;
}
--
Gitblit v1.9.1