From acd46c13a2a74b00f933629887c8093fe419278b Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.25>
Date: 星期二, 25 九月 2018 10:34:43 +0800
Subject: [PATCH] 左侧导航4层提交

---
 gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java |  131 +++++++++++++++++++++++++------------------
 1 files changed, 77 insertions(+), 54 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index 96b9411..81d2fca 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -3244,83 +3244,106 @@
 		
 	}
 
-	//鏌ヨ鎵�鏈夌殑鏈烘埧
+	//鏌ヨ鎵�鏈夌殑鐪佷唤(宸︿晶瀵艰埅绗竴灞傦紝鏌ユ墍鏈夌殑鐪佷唤,num涓瓨鏀緐id)
 	public List serchAllStation(Object obj){
-		User_inf uinf=(User_inf) obj;
-		String sql="select DISTINCT stationid,StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationName6,StationName7,StationName8,StationName9,fBSDeviceId  " +
+		BattInf binf=(BattInf) obj;;
+		String sql="select DISTINCT StationName " +
 				" FROM db_battinf.tb_battinf " +
 				" where StationId in(" +
 				" select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id  and db_user.tb_user_battgroup_baojigroup_usr.uId=?" +
 				" )";
-		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()},new CallBack() {
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getNum()},new CallBack() {
 			
 			public List getResults(ResultSet rs) {
 				List list=new ArrayList();
-				String conStr="-";//杩炴帴鏈烘埧鍚嶇О鐨勭鍙�
-				try {
-					while(rs.next()){
-						BattInf batt = new BattInf();
-						String stationName="";
-						if(!rs.getString("StationName1").trim().equals("")){
-							stationName+=rs.getString("StationName1");
+					try {
+						while(rs.next()){
+							BattInf batt = new BattInf();
+							batt.setStationName1(rs.getString("stationName1"));
+							list.add(batt);
 						}
-						if(!rs.getString("StationName2").trim().equals("")){
-							stationName+=conStr;
-							stationName+=rs.getString("StationName2");
-						}
-						if(!rs.getString("StationName3").trim().equals("")){
-							stationName+=conStr;
-							stationName+=rs.getString("StationName3");
-						}
-						if(!rs.getString("StationName4").trim().equals("")){
-							stationName+=conStr;
-							stationName+=rs.getString("StationName4");
-						}
-						if(!rs.getString("StationName5").trim().equals("")){
-							stationName+=conStr;
-							stationName+=rs.getString("StationName5");
-						}
-						if(!rs.getString("StationName6").trim().equals("")){
-							stationName+=conStr;
-							stationName+=rs.getString("StationName6");
-						}
-						if(!rs.getString("StationName7").trim().equals("")){
-							stationName+=conStr;
-							stationName+=rs.getString("StationName7");
-						}
-						if(!rs.getString("StationName8").trim().equals("")){
-							stationName+=conStr;
-							stationName+=rs.getString("StationName8");
-						}
-						if(!rs.getString("StationName9").trim().equals("")){
-							stationName+=conStr;
-							stationName+=rs.getString("StationName9");
-						}
-						batt.setStationName(stationName);
-						batt.setStationId(rs.getString("StationId"));
-						batt.setFBSDeviceId(rs.getInt("fBSDeviceId"));
-						list.add(batt);
+					} catch (SQLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
 					}
-				} catch (SQLException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
 				return list;
 			}
 		} );
 		return list;
 	}
-	//鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�
+	//鏌ヨ绠$悊鐨勫競(宸︿晶瀵艰埅绗簩灞傦紝鏌ユ墍鏈夌殑甯�,num涓瓨鏀緐id)
+	
+	//鏌ヨ绠$悊鐨勫競(宸︿晶瀵艰埅绗簩灞傦紝鏌ユ墍鏈夌殑甯�,num涓瓨鏀緐id)
+	public List serchStationName2(Object obj){
+		BattInf binf=(BattInf) obj;
+		String sql="select DISTINCT StationName2  " +
+				" FROM db_battinf.tb_battinf " +
+				" where StationId in(" +
+				" select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id  and db_user.tb_user_battgroup_baojigroup_usr.uId=?" +
+				" ) and StationName1 like ?";
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getNum(),"%"+binf.getStationName1()+"%"},new CallBack() {
+			
+			public List getResults(ResultSet rs) {
+				List list=new ArrayList();
+					try {
+						while(rs.next()){
+							BattInf batt = new BattInf();
+							batt.setStationName2(rs.getString("stationName2"));
+							list.add(batt);
+						}
+					} catch (SQLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				return list;
+			}
+		} );
+		return list;
+	}
+	//鏌ヨ绠$悊鐨勬満鎴�(宸︿晶瀵艰埅绗笁灞傦紝鏌ユ墍鏈夌殑鏈烘埧,num涓瓨鏀緐id)
+	public List serchStationName3(Object obj){
+		BattInf binf=(BattInf) obj;
+		String sql="select DISTINCT StationName3,stationid,fbsdeviceid  " +
+				" FROM db_battinf.tb_battinf " +
+				" where StationId in(" +
+				" select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id  and db_user.tb_user_battgroup_baojigroup_usr.uId=?" +
+				" ) and StationName1 like ? and StationName2 like ? ";
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getNum(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%"},new CallBack() {
+			
+			public List getResults(ResultSet rs) {
+				List list=new ArrayList();
+					try {
+						while(rs.next()){
+							BattInf batt = new BattInf();
+							batt.setStationName3(rs.getString("stationName3"));
+							batt.setStationId(rs.getString("stationId"));
+							batt.setFBSDeviceId(rs.getInt("fBSDeviceId"));
+							list.add(batt);
+						}
+					} catch (SQLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				return list;
+			}
+		} );
+		return list;
+	}
+   
+	
+	//鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�(宸︿晶瀵艰埅绗洓灞�,鏍规嵁鏈烘埧鏌ヨ涓嬮潰鐨勭數姹犵粍,num涓瓨鏀緐id)
 	public List serchBattByStation(Object obj){
 		BattInf binf=(BattInf) obj;
 		String sql="select DISTINCT StationName,StationId,StationIP,FBSDeviceId,BattGroupName,BattGroupName1,BattGroupName2,MonCount,battgroupId,MonCapStd,MonVolStd,MonResStd,MonSerStd,BattProducer,BattInUseDate,GroupIndexInFBSDevice " +
 				"from db_battinf.tb_battinf  where stationid=? " +
+				"and StationId in(" +
+				" select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id  and db_user.tb_user_battgroup_baojigroup_usr.uId=?" +
+				" ) " +
 				"ORDER BY StationName1,battgroupId ";
-		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),new Object[]{binf.getStationId()},new CallBack() {
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),new Object[]{binf.getNum(),binf.getStationId()},new CallBack() {
 			
 			public List getResults(ResultSet rs) {
 				List list = new ArrayList();
-				String conStr="-";//杩炴帴鏈烘埧鍚嶇О鐨勭鍙�
 				try {
 					while (rs.next()) {
 						BattInf batt = new BattInf();

--
Gitblit v1.9.1