From 1dce4eec8df821d243cfcb6a056b195967c2f06a Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.14>
Date: 星期二, 11 十二月 2018 17:25:23 +0800
Subject: [PATCH] web端设备实时告警和设备历史告警页面中添加设备高温告警显示功能
---
gx_tieta/src/com/fgkj/actions/BatttestdataAction.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java b/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
index f0ae854..ac4e031 100644
--- a/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
@@ -6,7 +6,7 @@
import com.fgkj.services.Batttestdata_infService;
import com.opensymphony.xwork2.ActionSupport;
-public class BatttestdataAction extends ActionSupport {
+public class BatttestdataAction extends ActionUtil{
private BatttestdataService service = new BatttestdataService();
private String result;
private Batttestdata btd;
@@ -39,12 +39,11 @@
* @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);
+ //isAllowHeaders();
+ ServiceModel model = new ServiceModel();
+ btd = ActionUtil.getGson().fromJson(json, Batttestdata.class);
+ model = service.serchByCondition_ky(btd);
result = ActionUtil.tojson(model);
- //System.out.println("*************************");
return SUCCESS;
}
--
Gitblit v1.9.1