From d7049dae792f0a6d2ee4246acf4b42bf0b36635c Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@USER-20180117QL>
Date: 星期二, 25 十二月 2018 11:11:02 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/BattInfAction.java | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/BattInfAction.java b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
index 105f209..518df5e 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());
@@ -86,7 +93,20 @@
//System.out.println(result);
return SUCCESS;
}
-
+
+ //娣诲姞鎿嶄綔鏃舵煡璇㈠嚭璁惧id
+ public String searchmaxdev_id(){
+ model = service.searchmaxdev_id();
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
+
+ //娣诲姞鎿嶄綔鏃舵煡璇㈠嚭鐢垫睜缁刬d
+ public String searchMaxBattgroupId(){
+ model = service.searchMaxBattgroupId();
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
public String searchAll() {
model = service.searchAll();
result = ActionUtil.tojson(model);
@@ -379,13 +399,33 @@
//璺ㄥ煙璁块棶鑾峰彇鎵�鏈夌數姹犵粍鐨勪俊鎭�<-------璺ㄥ煙----------->
public String searchInform_ky(){
- isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
+ //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 String serchByDeviceId(){
+ User_inf uinf=(User_inf) getUser();
+ ServiceModel model = service.serchByDeviceId(uinf);
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
+ //澶撮儴鏌ュ嚭宸插畨瑁呯殑鐢垫睜鍗曚綋
+ public String serchByInstall_count(){
+ User_inf uinf=(User_inf) getUser();
+ ServiceModel model = service.serchByInstall_count(uinf);
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
public BattInf getBif() {
return bif;
}
--
Gitblit v1.9.1