From 2f10da83d8087ed1b47b8edc9ff29ca5248f504d Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.26>
Date: 星期一, 15 十月 2018 14:31:52 +0800
Subject: [PATCH] 基站统计

---
 gx_tieta/src/com/fgkj/actions/BattInfAction.java |   92 ++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 76 insertions(+), 16 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/actions/BattInfAction.java b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
index e1558df..af20d32 100644
--- a/gx_tieta/src/com/fgkj/actions/BattInfAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
@@ -242,15 +242,6 @@
 		result = ActionUtil.tojson(model);
 		return SUCCESS;
 	}
-	
-	//鏌ヨ鎵�鏈夌殑鏈烘埧
-	public String serchAllStation(){
-		User_inf u = (User_inf)getUser();
-		ServiceModel model = service.serchAllStation(u);
-		result = ActionUtil.tojson(model);
-		return SUCCESS;
-	}
-	
 	//鎼滅储鏈烘埧鎴栫數姹犵粍
 	public String serchStationOrBattgroup(){
 		BattInf binf = ActionUtil.getGson().fromJson(json, BattInf.class);
@@ -258,10 +249,71 @@
 		result = ActionUtil.tojson(model);
 		return SUCCESS;
 	}
-	//鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�
+	//鏌ヨ鎵�鏈夌殑鐪佷唤(宸︿晶瀵艰埅绗竴灞傦紝鏌ユ墍鏈夌殑鐪佷唤,num涓瓨鏀緐id)
+	public String serchAllStation(){
+		User_inf u = (User_inf)getUser();
+		BattInf binf=new BattInf();
+		binf.setNum(u.getUId());
+		ServiceModel model = service.serchAllStation(binf);
+		result = ActionUtil.tojson(model);
+		return SUCCESS;
+	}
+	//鏌ヨ鎵�鏈夌殑鐪佷唤(宸︿晶瀵艰埅绗竴灞傦紝鏌ユ墍鏈夌殑鐪佷唤)
+	public String serchAllStation_all(){
+		User_inf u = (User_inf)getUser();
+		BattInf binf=new BattInf();
+		binf.setNum(u.getUId());
+		ServiceModel model = service.serchAllStation_all(binf);
+		result = ActionUtil.tojson(model);
+		return SUCCESS;
+	}
+	//鏌ヨ绠$悊鐨勫競(宸︿晶瀵艰埅绗簩灞傦紝鏌ユ墍鏈夌殑甯�,num涓瓨鏀緐id)
+	public String serchStationName2(){
+		User_inf u = (User_inf)getUser();
+		BattInf binf = ActionUtil.getGson().fromJson(json, BattInf.class);
+		binf.setNum(u.getUId());
+		ServiceModel model = service.serchStationName2(binf);
+		result = ActionUtil.tojson(model);
+		return SUCCESS;
+	}
+	//鏌ヨ绠$悊鐨勫競(宸︿晶瀵艰埅绗簩灞傦紝鏌ユ墍鏈夌殑甯�)
+	public String serchStationName2_all(){
+		BattInf binf = ActionUtil.getGson().fromJson(json, BattInf.class);
+		ServiceModel model = service.serchStationName2_all(binf);
+		result = ActionUtil.tojson(model);
+		return SUCCESS;
+	}
+	//鏌ヨ绠$悊鐨勬満鎴�(宸︿晶瀵艰埅绗笁灞傦紝鏌ユ墍鏈夌殑鏈烘埧,num涓瓨鏀緐id)
+	public String serchStationName3(){
+		User_inf u = (User_inf)getUser();
+		BattInf binf = ActionUtil.getGson().fromJson(json, BattInf.class);
+		binf.setNum(u.getUId());
+		ServiceModel model = service.serchStationName3(binf);
+		result = ActionUtil.tojson(model);
+		return SUCCESS;
+	}
+	//鏌ヨ绠$悊鐨勬満鎴�(宸︿晶瀵艰埅绗笁灞傦紝鏌ユ墍鏈夌殑鏈烘埧)
+	public String serchStationName3_all(){
+		BattInf binf = ActionUtil.getGson().fromJson(json, BattInf.class);
+		ServiceModel model = service.serchStationName3_all(binf);
+		result = ActionUtil.tojson(model);
+		return SUCCESS;
+	}
+	//鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�(宸︿晶瀵艰埅绗洓灞�,鏍规嵁鏈烘埧鏌ヨ涓嬮潰鐨勭數姹犵粍,num涓瓨鏀緐id)
 	public String serchBattByStation(){
 		BattInf binf = ActionUtil.getGson().fromJson(json, BattInf.class);
+		User_inf u = (User_inf)getUser();
+		binf.setNum(u.getUId());
+		//System.out.println(binf);
 		ServiceModel model = service.serchBattByStation(binf);
+		result = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").toJson(model);
+		return SUCCESS;
+	}
+	//鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�(宸︿晶瀵艰埅绗洓灞�,鏍规嵁鏈烘埧鏌ヨ涓嬮潰鐨勭數姹犵粍)
+	public String serchBattByStation_all(){
+		BattInf binf = ActionUtil.getGson().fromJson(json, BattInf.class);
+		//System.out.println(binf);
+		ServiceModel model = service.serchBattByStation_all(binf);
 		result = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").toJson(model);
 		return SUCCESS;
 	}
@@ -274,6 +326,20 @@
 		return SUCCESS;
 	}
 	
+	//鐢垫睜閰嶇粍绠$悊(閲嶈)
+	public String serchMakeGroup(){
+		BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
+		ServiceModel model = service.serchMakeGroup(binf);
+		result = ActionUtil.tojson(model);
+		return SUCCESS;
+	}
+	//鐢垫睜閰嶇粍绠$悊(閲嶈)
+	public String serchGroupByInfor(){
+		BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
+		ServiceModel model = service.serchGroupByInfor(binf);
+		result = ActionUtil.tojson(model);
+		return SUCCESS;
+	}
 	public BattInf getBif() {
 		return bif;
 	}
@@ -307,12 +373,6 @@
 		this.btdif = btdif;
 	}
 	
-	
-
-//	public ServiceModel getModel() {
-//		return model;
-//	}
-
     
 	public void setJson(String json) {
 		this.json = json;

--
Gitblit v1.9.1