From 512733908ae4f3a851f40f0551724d2186ce56ec Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.26>
Date: 星期四, 13 十二月 2018 11:20:11 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/BattInfAction.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/BattInfAction.java b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
index 8520b5f..833b60f 100644
--- a/gx_tieta/src/com/fgkj/actions/BattInfAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
@@ -93,7 +93,15 @@
//System.out.println(result);
return SUCCESS;
}
-
+
+ //娣诲姞鎿嶄綔鏃舵煡璇㈠嚭璁惧id
+ public String searchmaxdev_id(){
+ model = service.searchmaxdev_id();
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
+
+
public String searchAll() {
model = service.searchAll();
result = ActionUtil.tojson(model);
@@ -399,7 +407,20 @@
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