From cea36d9bcd04524f2e31fe4c35beabcbf5459ca7 Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@192.168.10.11>
Date: 星期一, 26 十一月 2018 15:25:52 +0800
Subject: [PATCH] 手机 机房历史事件查询（未包括详情及详情按钮）
---
gx_tieta/src/com/fgkj/actions/BattInfAction.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/BattInfAction.java b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
index 5cf8ab1..c7a3da5 100644
--- a/gx_tieta/src/com/fgkj/actions/BattInfAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
@@ -59,6 +59,13 @@
result = tojson(model);
return SUCCESS;
}
+ //璁剧疆鐢垫睜缁勫厖鐢电數娴侀槇鍊�
+ public String update_charge() {
+ BattInf binf= getGson("yyyy-MM-dd").fromJson(json, BattInf.class);
+ ServiceModel model = service.update_charge(binf);
+ result = tojson(model);
+ return SUCCESS;
+ }
//鍒犻櫎鐢垫睜缁�
public String delete() {
List<BattInf> list= getGson("yyyy-MM-dd").fromJson(json, new TypeToken<List<BattInf>>(){}.getType());
@@ -379,12 +386,16 @@
//璺ㄥ煙璁块棶鑾峰彇鎵�鏈夌數姹犵粍鐨勪俊鎭�<-------璺ㄥ煙----------->
public String searchInform_ky(){
- HttpServletResponse res = ActionUtil.getResponse();
- res.setHeader("Access-Control-Allow-Origin", "*"); //鍏佽璺ㄥ煙璁块棶
- res.setHeader("Access-Control-Allow-Headers", "X-Requested-With,content-type,token");
- res.setHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, PATCH");
- ServiceModel model;
- model = service.searchInform_ky();
+ isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
+ ServiceModel model = new ServiceModel();
+ model = service.searchInform_ky();
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
+ //棣栭〉涓婃樉绀哄凡瀹夎鏁板拰鍏ㄩ儴鍩虹珯鏁�
+ public String serchDevice(){
+ User_inf uinf=(User_inf) getUser();
+ ServiceModel model = service.serchDevice(uinf);
result = ActionUtil.tojson(model);
return SUCCESS;
}
--
Gitblit v1.9.1