From a6b4c1e19b3b3fdcf80d7f69f20fe406205fcf8f Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.20>
Date: 星期一, 26 十一月 2018 11:54:39 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/BattInfAction.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/BattInfAction.java b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
index 40b145a..c7a3da5 100644
--- a/gx_tieta/src/com/fgkj/actions/BattInfAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
@@ -2,6 +2,8 @@
import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
import com.fgkj.dao.impl.BattInfImpl;
import com.fgkj.dto.BattInf;
import com.fgkj.dto.Batt_Maint_Dealarm;
@@ -54,6 +56,13 @@
BattInf binf= getGson("yyyy-MM-dd").fromJson(json, BattInf.class);
//System.out.println(binf);
ServiceModel model = service.updateIp(binf);
+ 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;
}
@@ -367,6 +376,30 @@
result = ActionUtil.tojson(model);
return SUCCESS;
}
+ //棣栭〉涓婃牴鎹畇tationid鏌ヨ鐢垫睜缁勭殑鏈哄巻鍗�
+ public String serchBattAllInfoByStationId(){
+ BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
+ ServiceModel model = service.serchBattAllInfoByStationId(binf);
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
+
+ //璺ㄥ煙璁块棶鑾峰彇鎵�鏈夌數姹犵粍鐨勪俊鎭�<-------璺ㄥ煙----------->
+ public String 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;
+ }
+
public BattInf getBif() {
return bif;
}
--
Gitblit v1.9.1