From a7adbf6bf46de9ec3753d4b6cc6c8b5cc83cdcf9 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 26 十一月 2018 16:03:32 +0800
Subject: [PATCH] 修改实时和历史机历卡为基站机历卡
---
gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java b/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java
index cf21a3d..902fcfd 100644
--- a/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java
@@ -42,11 +42,10 @@
return SUCCESS;
}
- //0.5鏌ヨ瀹炴椂鍛婅鏁�
+ //0.5鏌ヨ瀹炴椂鍛婅鏁�(鐢垫睜鍛婅鐜�)
public String serchAlm(){
User_inf uinf=(User_inf) ActionUtil.getUser();
- bmd.setUinf(uinf);
- ServiceModel model=service.serchAlm(bmd);
+ ServiceModel model=service.serchAlm(uinf);
result=ActionUtil.tojson(model);
return SUCCESS;
}
@@ -136,7 +135,13 @@
result=ActionUtil.tojson(model);
return SUCCESS;
}
-
+ //鍛婅鍙戝０(30绉掍箣鍐呯殑鍛婅)
+ public String serchIn30(){
+ User_inf uinf=(User_inf) ActionUtil.getUser();
+ ServiceModel model=service.serchIn30(uinf);
+ result=ActionUtil.tojson(model);
+ return SUCCESS;
+ }
//鐐瑰嚮椤圭洰涓嬫柟鐨勬粴鍔紝鏌ヨ璇ユ潯鍛婅鐨勫疄鏃朵俊鎭�
public String serchBatt_alarm(){
Battalarm_data adata=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Battalarm_data.class);
--
Gitblit v1.9.1