From 4b309ae0a61b115e432b3aa9bc150feb9f5a16f9 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.14>
Date: 星期三, 28 十一月 2018 15:35:18 +0800
Subject: [PATCH] 头部查询出已安装设备数和已安装单体个数

---
 gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java |  632 +++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 498 insertions(+), 134 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index d160367..4b6c4c8 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -30,6 +30,7 @@
 import com.fgkj.dto.Batt_Maint_Dealarm;
 import com.fgkj.dto.Batt_maint_inf;
 import com.fgkj.dto.Batt_maintenance_inf;
+import com.fgkj.dto.Battinf_ex;
 import com.fgkj.dto.Batttestdata;
 import com.fgkj.dto.Batttestdata_inf;
 import com.fgkj.dto.Batttestdatastop;
@@ -41,6 +42,7 @@
 import com.fgkj.dto.User_log;
 import com.fgkj.dto.User_task_batt_template;
 import com.fgkj.services.User_logService;
+import com.sun.org.apache.bcel.internal.generic.LSTORE;
 
 public class BattInfImpl implements BaseDAO, CallBack {
 	//娣诲姞鏂扮殑鐢垫睜缁�(澶氫釜)
@@ -70,12 +72,12 @@
 				String sql = "insert into db_battinf.tb_battinf(" +
 						"StationId,StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,FbsDeviceIp,FbsDeviceIp_YM,FbsDeviceIp_WG,"
 						+ "FBSDeviceName,GroupIndexInFBSDevice,battgroupId,BattGroupNum,BattGroupName,FloatVolLevel,OfflineVolLevel,BattFloatCurrent" +
-						",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate,Load_curr,DisCurrMax,station_phone" +
+						",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate,Load_curr,install_user,DisCurrMax,station_phone" +
 						") values('"+binf.getStationId()+"','"+binf.getStationName()+"','"+binf.getStationName1()+"','"+binf.getStationName2()+"','"+binf.getStationName3()+"','"+binf.getStationName4()+"','"+binf.getStationName5()+
 						"','"+binf.getStationIp()+"',"+binf.getFBSDeviceId()+",'"+binf.getFbsDeviceIp()+"','"+binf.getFbsDeviceIp_YM()+"','"+binf.getFbsDeviceIp_WG()+"','"+binf.getFBSDeviceName()+"',"+binf.getGroupIndexInFBSDevice()+
 						","+binf.getBattGroupId()+","+binf.getBattGroupNum()+",'"+binf.getBattGroupName()+"',"+binf.getFloatVolLevel()+","+binf.getOfflineVolLevel()+","+binf.getBattFloatCurrent()+
 						","+binf.getMonCount()+","+binf.getMonCapStd()+","+binf.getMonVolStd()+","+binf.getMonResStd()+","+binf.getMonSerStd()+","+binf.getMonVolLowToAvg()+
-						",'"+binf.getBattProducer()+"','"+binf.getBattModel()+"','"+DAOHelper.sdf.format(binf.getBattProductDate())+"','"+DAOHelper.sdf.format(binf.getBattInUseDate())+"',"+binf.getLoad_curr()+","+binf.getDisCurrMax()+",'"+binf.getStation_phone()+"')";
+						",'"+binf.getBattProducer()+"','"+binf.getBattModel()+"','"+DAOHelper.sdf.format(binf.getBattProductDate())+"','"+DAOHelper.sdf.format(binf.getBattInUseDate())+"',"+binf.getLoad_curr()+",'"+binf.getInstall_user()+"',"+binf.getDisCurrMax()+",'"+binf.getStation_phone()+"')";
 				
 				if(binf.getStationId().equals(maxs)){
 					maxs++;
@@ -117,7 +119,7 @@
 				String sql = "update db_battinf.tb_battinf set StationId='"+binf.getStationId()+"',StationName='"+binf.getStationName()+"',StationName1='"+binf.getStationName1()+"',StationName2='"+binf.getStationName2()+"',StationName3='"+binf.getStationName3()+"',StationName4='"+binf.getStationName4()+"',StationName5='"+binf.getStationName5()+"',StationIp='"+binf.getStationIp()+"',FBSDeviceId="+binf.getFBSDeviceId()+",FbsDeviceIp='"+binf.getFbsDeviceIp()+"',"
 						+ "FBSDeviceName='"+binf.getFBSDeviceName()+"',GroupIndexInFBSDevice="+binf.getGroupIndexInFBSDevice()+",BattGroupNum="+binf.getBattGroupNum()+",BattGroupName='"+binf.getBattGroupName()+"',FloatVolLevel="+binf.getFloatVolLevel()+",OfflineVolLevel="+binf.getOfflineVolLevel()+",BattFloatCurrent="+binf.getBattFloatCurrent()+"," +
 						  "MonCount="+binf.getMonCount()+",MonCapStd="+binf.getMonCapStd()+",monVolStd="+binf.getMonVolStd()+",monResStd="+binf.getMonResStd()+",MonSerStd="+binf.getMonSerStd()+",MonVolLowToAvg="+binf.getMonVolLowToAvg()+",BattProducer='"+binf.getBattProducer()+"',BattModel='"+binf.getBattModel()+"',BattProductDate='"+DAOHelper.sdf.format(binf.getBattProductDate())+"',BattInUseDate='"+DAOHelper.sdf.format(binf.getBattInUseDate())+"', "
-						 +" Load_curr="+binf.getLoad_curr()+",DisCurrMax="+binf.getDisCurrMax()+",station_phone='"+binf.getStation_phone()+"'  where battgroupId="+binf.getBattGroupId();
+						 +" Load_curr="+binf.getLoad_curr()+",install_user='"+binf.getInstall_user()+"',DisCurrMax="+binf.getDisCurrMax()+",station_phone='"+binf.getStation_phone()+"'  where battgroupId="+binf.getBattGroupId();
 				sql_str.add(sql);
 				{
 					String msg="淇敼"+binf.getStationName()+"鏈烘埧"+binf.getBattGroupId()+"鐢垫睜缁勭殑淇℃伅";
@@ -137,7 +139,13 @@
 		boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, null);
 		return bl;
 	}
-	
+	//璁剧疆鐢垫睜缁勫厖鐢电數娴侀槇鍊�
+	public boolean update_charge(Object obj){
+		BattInf binf=(BattInf) obj;
+		String sql = "update db_battinf.tb_battinf set  charge_curr_max=? where BattGroupId=?";
+		boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{binf.getCharge_curr_max(),binf.getBattGroupId()});
+		return bl;
+	}
 	//鍒犻櫎鐢垫睜缁�(澶氫釜)
 	public boolean del(Object obj) {
 		List<BattInf> list=(List<BattInf>) obj;
@@ -168,7 +176,7 @@
 		String numberSql=" SELECT FOUND_ROWS() number";
 		String sql="select SQL_CALC_FOUND_ROWS distinct(StationId),StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,FbsDeviceIp_YM,FbsDeviceIp_WG,FbsDeviceIp,"
 				+ "FBSDeviceName,GroupIndexInFBSDevice,battgroupId,BattGroupNum,BattGroupName,FloatVolLevel,OfflineVolLevel,BattFloatCurrent" +
-				 ",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate,Load_curr,DisCurrMax,station_phone  " +
+				 ",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate,Load_curr,install_user,DisCurrMax,station_phone  " +
 				 " From db_battinf.tb_battinf " +
 				 " Where StationName like ? and StationName1 like ? and StationName2 like ?  and StationName5 like ? " +
 				 " order by StationId  " +
@@ -213,6 +221,7 @@
 						binf.setBattProductDate(rs.getDate("battProductDate"));
 						binf.setBattInUseDate(rs.getDate("battInUseDate"));
 						binf.setLoad_curr(rs.getFloat("load_curr"));
+						binf.setInstall_user(rs.getString("install_user"));
                         binf.setDisCurrMax(rs.getFloat("disCurrMax"));
                         binf.setStation_phone(rs.getString("station_phone"));
 						list.add(binf);
@@ -231,6 +240,76 @@
 		}
 		return list;
 	}
+	//鏍规嵁缁存姢鍖哄拰鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁勪俊鎭�(鐢垫睜缁勪俊鎭厤缃�)<-------璺ㄥ煙----------->
+	public List searchInform_ky(){
+		String sql="select  distinct(StationId),StationId_ex,StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,FbsDeviceIp_YM,FbsDeviceIp_WG,FbsDeviceIp,"
+				+ "FBSDeviceName,GroupIndexInFBSDevice,battgroupId,BattGroupNum,BattGroupName,FloatVolLevel,OfflineVolLevel,BattFloatCurrent" +
+				 ",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate,battGuarantDayCount,SignalId,CInterFaceId,Load_curr,install_user,DisCurrMax,SignalName,Station_install,station_phone  " +
+				 " From db_battinf.tb_battinf " +
+				 " order by StationId  ";
+		List<BattInf> list=DAOHelper.executeQueryLimit(sql,DBUtil.getConn(), null,new CallBack() {
+			
+			public List getResults(ResultSet rs) {
+				List list = new ArrayList<BattInf>();
+				int id=0;
+				
+				try {
+					while (rs.next()) {
+						BattInf binf = new BattInf();
+						binf.setStationId(rs.getString("stationId"));
+						binf.setStationId_ex(rs.getString("stationId_ex"));
+						binf.setStationName(rs.getString("stationName"));
+						binf.setStationName1(rs.getString("stationName1"));
+						binf.setStationName2(rs.getString("stationName2"));
+						binf.setStationName3(rs.getString("stationName3"));
+						binf.setStationName4(rs.getString("stationName4"));
+						binf.setStationName5(rs.getString("stationName5"));
+						binf.setStationIp(rs.getString("stationIp"));
+						binf.setFBSDeviceId(rs.getInt("fBSDeviceId"));
+						
+						binf.setFbsDeviceIp(rs.getString("fbsDeviceIp"));
+						
+						binf.setFbsDeviceIp_YM(rs.getString("fbsDeviceIp_YM"));
+						
+						binf.setFbsDeviceIp_WG(rs.getString("fbsDeviceIp_WG"));
+						
+						binf.setFBSDeviceName(rs.getString("fBSDeviceName"));
+						binf.setGroupIndexInFBSDevice(rs.getInt("groupIndexInFBSDevice"));
+						binf.setBattGroupId(rs.getInt("battGroupId"));
+						binf.setBattGroupNum(rs.getInt("battGroupNum"));
+						binf.setBattGroupName(rs.getString("battGroupName"));
+						binf.setFloatVolLevel(rs.getFloat("floatVolLevel"));
+						binf.setOfflineVolLevel(rs.getFloat("offlineVolLevel"));
+						binf.setBattFloatCurrent(rs.getFloat("battFloatCurrent"));
+						binf.setMonCount(rs.getInt("monCount"));
+						binf.setMonCapStd(rs.getFloat("monCapStd"));
+						binf.setMonVolStd(rs.getFloat("monVolStd"));
+						binf.setMonResStd(rs.getFloat("monResStd"));
+						binf.setMonSerStd(rs.getFloat("monSerStd"));
+						binf.setMonVolLowToAvg(rs.getFloat("monVolLowToAvg"));
+						binf.setBattProducer(rs.getString("battProducer"));
+						binf.setBattModel(rs.getString("battModel"));
+						binf.setBattProductDate(rs.getDate("battProductDate"));
+						binf.setBattInUseDate(rs.getDate("battInUseDate"));
+						binf.setBattGuarantDayCount(rs.getInt("battGuarantDayCount"));
+						binf.setSignalId(rs.getString("signalId"));
+						binf.setCInterFaceId(rs.getInt("cInterFaceId"));
+						binf.setStation_install(rs.getInt("station_install"));
+						binf.setLoad_curr(rs.getFloat("load_curr"));
+						binf.setInstall_user(rs.getString("install_user"));
+                        binf.setDisCurrMax(rs.getFloat("disCurrMax"));
+                        binf.setStation_phone(rs.getString("station_phone"));
+						list.add(binf);
+
+					}
+				} catch (SQLException e) {
+					e.printStackTrace();
+				}		
+				return list;
+			}
+		});
+		return list;
+	}
 	//鏍规嵁缁存姢鍖哄拰鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁勪俊鎭�(鐢垫睜缁勪俊鎭厤缃�)
 	public List searchInform1(Object obj){
 		Batt_Maint_Dealarm bmd=(Batt_Maint_Dealarm) obj;
@@ -238,7 +317,7 @@
 		Page page=bmd.getPage();
 		Connection conn= DBUtil.getConn();
 		String numberSql=" SELECT FOUND_ROWS() number";
-		String sql="select SQL_CALC_FOUND_ROWS distinct(StationId),StationId_ex,StationName1,StationName2,StationName3,StationName,FBSDeviceId  " +
+		String sql="select SQL_CALC_FOUND_ROWS distinct(StationId),StationId_ex,StationName1,StationName2,StationName3,StationName5,StationName,FBSDeviceId  " +
 				 " From db_battinf.tb_battinf " +
 				 " limit ?,?";
 		List<BattInf> list=DAOHelper.executeQueryLimit(sql,conn, new Object[]{(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()},new CallBack() {
@@ -254,6 +333,7 @@
 						binf.setStationName1(rs.getString("stationName1"));
 						binf.setStationName2(rs.getString("stationName2"));
 						binf.setStationName3(rs.getString("stationName3"));
+						binf.setStationName5(rs.getString("stationName5"));
 						binf.setFBSDeviceId(rs.getInt("fBSDeviceId"));
 						binf.setStationName(rs.getString("stationName"));
 						binf.setStationId_ex(rs.getString("stationId_ex"));
@@ -387,11 +467,11 @@
 		return list;
 	}
 	
-	//5.3娣诲姞閫夊彇鐢垫睜缁勬垨鑰呮満鎴挎垨鑰呯淮鎶ゅ尯
+	//5.3娣诲姞閫夊彇鐢垫睜缁勬垨鑰呮満鎴挎垨鑰呯淮鎶ゅ尯鎴栬�呭叏鍖哄幙
 	public List serchBatt(Object obj) {
 		BattInf binf=(BattInf) obj;
 		String sql="";
-		String baseSql="select distinct(battgroupid),stationid,stationname,stationname1,battgroupname from db_battinf.tb_battinf " +
+		String baseSql="select distinct(battgroupid),stationid,stationname,stationname1,stationname2,stationname5,battgroupname from db_battinf.tb_battinf " +
 				"where ";
 		 //鐢ㄤ簬缁存姢鍖�
 		String station1SqlT=" stationname1!=? ";//鍏ㄩ儴
@@ -408,6 +488,14 @@
 			baseSql+=station2SqlT;
 		}else{
 			baseSql+=station2SqlF;
+		}
+		//鐢ㄤ簬鍖哄幙
+		String station5SqlT=" and stationname5!=? ";//鍏ㄩ儴
+		String station5SqlF=" and stationname5=? ";
+		if(binf.getStationName5().equals("")){
+			baseSql+=station5SqlT;
+		}else{
+			baseSql+=station5SqlF;
 		}
 		//鐢ㄤ簬鏈烘埧绔欑偣
 		String stationSqlT=" and stationname!=? ";//鍏ㄩ儴
@@ -428,7 +516,7 @@
 		String endSql=" order by stationid ";
 		sql=baseSql+endSql;
 		//System.out.println(sql);
-		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getStationName1(),binf.getStationName2(),binf.getStationName(),binf.getBattGroupId()}, new CallBack() {
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getStationName1(),binf.getStationName2(),binf.getStationName5(),binf.getStationName(),binf.getBattGroupId()}, new CallBack() {
 			
 			public List getResults(ResultSet rs) {
 				List list=new ArrayList();
@@ -439,6 +527,8 @@
 					binf.setStationId(rs.getString("StationId"));
 					binf.setStationName(rs.getString("stationName"));
 					binf.setStationName1(rs.getString("stationName1"));
+					binf.setStationName2(rs.getString("stationName2"));
+					binf.setStationName5(rs.getString("stationName5"));
 					binf.setBattGroupName(rs.getString("battGroupName"));
 					list.add(binf);
 					}
@@ -963,7 +1053,7 @@
 		return list;
 	}
 
-	//鏌ヨ澶囨�绘暟
+	//鏌ヨ澶囨�绘暟(宸茬粡瀹夎)
 	/*public int serchByDeviceId(){
 		String sql=" SELECT COUNT(DISTINCT fbsdeviceid) number FROM db_battinf.tb_battinf  limit 1";
 		List<BattInf> list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{}, new CallBack() {
@@ -993,11 +1083,11 @@
 	public int serchByDeviceId(Object obj){
 		User_inf uinf=(User_inf) obj;
 		String sql=" SELECT COUNT(DISTINCT fbsdeviceid) number FROM db_battinf.tb_battinf  " +
-				    " left outer join db_user.tb_user_battgroup_baojigroup_battgroup on db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId " +
-					" left outer join db_user.tb_user_battgroup_baojigroup_usr on db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
-					" left outer join db_user.tb_user_inf on tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
-					" where db_user.tb_user_inf.uid=? " +
-				    " limit 1";
+				   " 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 db_battinf.tb_battinf.station_install=1";
 		List<BattInf> list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
 			
 			public List getResults(ResultSet rs) {
@@ -1021,6 +1111,93 @@
 			number=list.get(list.size()-1).getNum();
 		}
 		return number;
+	}
+	//鏌ュ崟浣撴�绘暟(宸插畨瑁呯殑鍗曚綋)
+	public int serchByInstall_count(Object obj){
+		User_inf uinf=(User_inf) obj;
+		String sql=" SELECT sum(moncount) as nums 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 db_battinf.tb_battinf.station_install=1";
+		//System.out.println(sql);
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
+			
+			public List getResults(ResultSet rs) {
+				List list=new ArrayList();
+				int nums=0;//鍗曚綋鎬绘暟
+				try {
+					while(rs.next()){
+						nums=rs.getInt("nums");
+						list.add(nums);
+					}
+				} catch (SQLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				return list;
+			}
+			
+		});
+		int number=0;//瀛樻斁鎬绘暟
+		if(list!=null&&list.size()>0){
+			number=(Integer) list.get(list.size()-1);
+		}
+		return number;
+	}
+	//鏌ヨ璁惧鎬绘暟(鍏ㄩ儴)
+	public List serchByDeviceId_all(Object obj){
+		User_inf uinf=(User_inf) obj;
+		String sql=" SELECT DISTINCT fbsdeviceid,station_install,monvolstd 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() {
+			
+			public List getResults(ResultSet rs) {
+				List list=new ArrayList();
+				int num_2_install=0;//2v宸插畨瑁�
+				int num_2=0;//2v鍏ㄩ儴
+				int num_12_install=0;//12v宸插畨瑁�
+				int num_12=0;//12v鍏ㄩ儴
+				int num_install=0;//宸插畨瑁�
+				int num=0;//鍏ㄩ儴
+				try {
+					while(rs.next()){
+						int insatll=rs.getInt("station_install");
+						float monvolstd=rs.getFloat("monvolstd");
+						if(insatll==1){
+							num_install+=1;
+							if(monvolstd==2.0){
+								num_2_install+=1;
+							}else{
+								num_12_install+=1;
+							}
+						}
+						if(monvolstd==2.0){
+							num_2+=1;
+						}else{
+							num_12+=1;
+						}
+						num+=1;
+					}
+				} catch (SQLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				list.add(num_2_install);
+				list.add(num_2);
+				list.add(num_12_install);
+				list.add(num_12);
+				list.add(num_install);
+				list.add(num);
+				return list;
+			}
+			
+		});
+		return list;
 	}
 	//-----------鏍规嵁钃勭數姹犵粍鏌ヤ笉閲嶅鐨凪onCount(monNum)锛堝崟浣撶紪鍙凤級
 	public List serchByMonNum(Object obj){
@@ -1049,7 +1226,7 @@
 		});
 		return list;
 	}
-	
+	//瀹炴椂鍘嗗彶鏈哄巻鍗�
 	public List serchByBattgroupId(Object obj){
 		BattInf binf=(BattInf)obj;
 		String sql="select * from db_battinf.tb_battinf where battgroupid=?";
@@ -1057,104 +1234,106 @@
 			
 			public List getResults(ResultSet rs) { List list = new ArrayList();
 			  try {
-				  while (rs.next()) { BattInf batt = new BattInf();
-				  
-				  batt.setNum(Integer.parseInt(rs.getString("num")));
-				  
-				  batt.setStationId((rs.getString("StationId")));
-				  
-				  batt.setStationName(rs.getString("StationName"));
-				  
-				  batt.setStationName1(rs.getString("StationName1"));
-				  
-				  batt.setStationName2(rs.getString("StationName2"));
-				  
-				  batt.setStationName3(rs.getString("StationName3"));
-				  
-				  batt.setStationName4(rs.getString("StationName4"));
-				  
-				  batt.setStationName5(rs.getString("StationName5"));
-				  
-				  batt.setStationName6(rs.getString("StationName6"));
-				  
-				  batt.setStationName7(rs.getString("StationName7"));
-				  
-				  batt.setStationName8(rs.getString("StationName8"));
-				  
-				  batt.setStationName9(rs.getString("StationName9"));
-				  
-				  batt.setStationIp(rs.getString("StationIp"));
-				  
-				  batt.setFBSDeviceId(Integer.parseInt(rs.getString("FBSDeviceId")));
-				  
-				  batt.setFbsDeviceIp(rs.getString("FbsDeviceIp"));
-				  
-				  batt.setFBSDeviceName(rs.getString("FBSDeviceName"));
-				  
-				  batt.setGroupIndexInFBSDevice(Integer.parseInt(rs.getString(
-				  "GroupIndexInFBSDevice")));
-				  
-				  batt.setBattModel(rs.getString("BattModel"));
-				  
-				  batt.setBattGroupId(Integer.parseInt(rs.getString("BattGroupId")));
-				  
-				  batt.setBattGroupNum(Integer.parseInt(rs.getString("BattGroupNum")));
-				  
-				  batt.setBattGroupName(rs.getString("BattGroupName"));
-				  
-				  batt.setBattGroupName1(rs.getString("BattGroupName1"));
-				 
-				  batt.setBattGroupName2(rs.getString("BattGroupName2"));
-				  
-				  batt.setBattGroupName3(rs.getString("BattGroupName3"));
-				  
-				  batt.setBattGroupName4(rs.getString("BattGroupName4"));
-				  
-				  batt.setBattGroupName5(rs.getString("BattGroupName5"));
-				  
-				  batt.setBattGroupName6(rs.getString("BattGroupName6"));
-				  
-				  batt.setFloatVolLevel(Float.parseFloat(rs.getString("FloatVolLevel")));
-				  
-				  batt.setOfflineVolLevel(Float.parseFloat(rs.getString("OfflineVolLevel"))) ;
-				 
-				  batt.setBattFloatCurrent(Float.parseFloat(rs.getString("BattFloatCurrent")));
-				  
-				  batt.setDeviceId(rs.getString("DeviceId"));
-				  
-				  batt.setDeviceName(rs.getString("DeviceName"));
-				  
-				  batt.setMonCount(Integer.parseInt(rs.getString("MonCount")));
-				  
-				  batt.setMonCapStd(Float.parseFloat(rs.getString("MonCapStd")));
-				  
-				  batt.setMonResStd(Float.parseFloat(rs.getString("MonResStd")));
-				 
-				  batt.setMonSerStd(Float.parseFloat(rs.getString("MonSerStd")));
-				  
-				  batt.setMonTmpStd(Float.parseFloat(rs.getString("MonTmpStd")));
-				  
-				  batt.setMonVolStd(Float.parseFloat(rs.getString("MonVolStd")));
-				  
-				  batt.setMonVolLowToAvg(Float.parseFloat(rs.getString("MonVolLowToAvg")));
-				  
-				  batt.setMonNum(Integer.parseInt(rs.getString("MonNum")));
-				  
-				  batt.setBattProducer(rs.getString("BattProducer"));
-				  
-				  batt.setBattProductDate((Date) rs.getObject("BattProductDate"));
-				  
-				  batt.setBattInUseDate((Date) rs.getObject("BattInUseDate"));
-				  
-				  batt.setSignalId(rs.getString("SignalId"));
-				  
-				  batt.setCInterFaceId(Integer.parseInt(rs.getString("CInterFaceId")));
-				  
-				  batt.setSignalName(rs.getString("SignalName"));
-				  int BattGuarantDayCount=rs.getInt("BattGuarantDayCount")-ActionUtil.daysBetween(rs.getDate("BattInUseDate"), new Date());//鍓╀綑淇濅慨澶╂暟
-				  batt.setBattGuarantDayCount(BattGuarantDayCount);
-					
-				  list.add(batt); } } catch (SQLException e) { e.printStackTrace(); }
+				  while (rs.next()) { 
+					  BattInf batt = new BattInf();
+					  
+					  batt.setNum(Integer.parseInt(rs.getString("num")));
+					  
+					  batt.setStationId((rs.getString("StationId")));
+					  
+					  batt.setStationName(rs.getString("StationName"));
+					  
+					  batt.setStationName1(rs.getString("StationName1"));
+					  
+					  batt.setStationName2(rs.getString("StationName2"));
+					  
+					  batt.setStationName3(rs.getString("StationName3"));
+					  
+					  batt.setStationName4(rs.getString("StationName4"));
+					  
+					  batt.setStationName5(rs.getString("StationName5"));
+					  
+					  batt.setStationName6(rs.getString("StationName6"));
+					  
+					  batt.setStationName7(rs.getString("StationName7"));
+					  
+					  batt.setStationName8(rs.getString("StationName8"));
+					  
+					  batt.setStationName9(rs.getString("StationName9"));
+					  
+					  batt.setStationIp(rs.getString("StationIp"));
+					  
+					  batt.setFBSDeviceId(Integer.parseInt(rs.getString("FBSDeviceId")));
+					  
+					  batt.setFbsDeviceIp(rs.getString("FbsDeviceIp"));
+					  
+					  batt.setFBSDeviceName(rs.getString("FBSDeviceName"));
+					  
+					  batt.setGroupIndexInFBSDevice(Integer.parseInt(rs.getString(
+					  "GroupIndexInFBSDevice")));
+					  
+					  batt.setBattModel(rs.getString("BattModel"));
+					  
+					  batt.setBattGroupId(Integer.parseInt(rs.getString("BattGroupId")));
+					  
+					  batt.setBattGroupNum(Integer.parseInt(rs.getString("BattGroupNum")));
+					  
+					  batt.setBattGroupName(rs.getString("BattGroupName"));
+					  
+					  batt.setBattGroupName1(rs.getString("BattGroupName1"));
+					 
+					  batt.setBattGroupName2(rs.getString("BattGroupName2"));
+					  
+					  batt.setBattGroupName3(rs.getString("BattGroupName3"));
+					  
+					  batt.setBattGroupName4(rs.getString("BattGroupName4"));
+					  
+					  batt.setBattGroupName5(rs.getString("BattGroupName5"));
+					  
+					  batt.setBattGroupName6(rs.getString("BattGroupName6"));
+					  
+					  batt.setFloatVolLevel(Float.parseFloat(rs.getString("FloatVolLevel")));
+					  
+					  batt.setOfflineVolLevel(Float.parseFloat(rs.getString("OfflineVolLevel"))) ;
+					 
+					  batt.setBattFloatCurrent(Float.parseFloat(rs.getString("BattFloatCurrent")));
+					  
+					  batt.setDeviceId(rs.getString("DeviceId"));
+					  
+					  batt.setDeviceName(rs.getString("DeviceName"));
+					  
+					  batt.setMonCount(Integer.parseInt(rs.getString("MonCount")));
+					  
+					  batt.setMonCapStd(Float.parseFloat(rs.getString("MonCapStd")));
+					  
+					  batt.setMonResStd(Float.parseFloat(rs.getString("MonResStd")));
+					 
+					  batt.setMonSerStd(Float.parseFloat(rs.getString("MonSerStd")));
+					  
+					  batt.setMonTmpStd(Float.parseFloat(rs.getString("MonTmpStd")));
+					  
+					  batt.setMonVolStd(Float.parseFloat(rs.getString("MonVolStd")));
+					  
+					  batt.setMonVolLowToAvg(Float.parseFloat(rs.getString("MonVolLowToAvg")));
+					  
+					  batt.setMonNum(Integer.parseInt(rs.getString("MonNum")));
+					  
+					  batt.setBattProducer(rs.getString("BattProducer"));
+					  
+					  batt.setBattProductDate((Date) rs.getObject("BattProductDate"));
+					  
+					  batt.setBattInUseDate((Date) rs.getObject("BattInUseDate"));
+					  
+					  batt.setSignalId(rs.getString("SignalId"));
+					  
+					  batt.setCInterFaceId(Integer.parseInt(rs.getString("CInterFaceId")));
+					  batt.setInstall_user(rs.getString("install_user"));
+					  batt.setSignalName(rs.getString("SignalName"));
+					  int BattGuarantDayCount=rs.getInt("BattGuarantDayCount")-ActionUtil.daysBetween(rs.getDate("BattInUseDate"), new Date());//鍓╀綑淇濅慨澶╂暟
+					  batt.setBattGuarantDayCount(BattGuarantDayCount);
+						
+					  list.add(batt); 
+				  } } catch (SQLException e) { e.printStackTrace(); }
 				  return list; }
 
 		});
@@ -1668,7 +1847,7 @@
 		Connection conn=DBUtil.getConn();
 		String numberSql=" SELECT FOUND_ROWS() number";
 		String sql="";
-		String baseSql=" select SQL_CALC_FOUND_ROWS distinct(db_battinf.tb_battinf.BattgroupId),db_battinf.tb_battinf.stationid,StationName1,StationName,stationip,BattGroupName,BattGroupName1,moncount,moncapstd,monvolstd,battproducer,battproductdate,battinusedate " +
+		String baseSql=" select SQL_CALC_FOUND_ROWS distinct(db_battinf.tb_battinf.BattgroupId),db_battinf.tb_battinf.stationid,StationName1,StationName2,StationName5,StationName,stationip,BattGroupName,BattGroupName1,moncount,moncapstd,monvolstd,battproducer,battproductdate,battinusedate " +
 			       " from  db_battinf.tb_battinf " +
 			       " where  ";
 		//閫夊彇钃勭數姹犵粍鏉′欢
@@ -1686,7 +1865,7 @@
 				" and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id  " +
 				" and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid  " +
 				" and db_user.tb_user_inf.uid=? " +
-		        " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ?)";
+		        " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ? and db_battinf.tb_battinf.stationname5 like ?) ";
 		baseSql+=userSql;
 		//鎺掑簭
 		String endSql=" order by db_battinf.tb_battinf.battgroupid asc ";
@@ -1696,7 +1875,7 @@
 		sql=baseSql+endSql+limitSql;
 		//System.out.println(sql);
         List<BattInf> list=DAOHelper.executeQueryLimit(sql,conn, new Object[]{
-			binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%",
+			binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%",  
 			(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
 			
 			public List getResults(ResultSet rs) {
@@ -1708,6 +1887,8 @@
 						binf.setBattGroupId(rs.getInt("battGroupId"));
 						binf.setStationId(rs.getString("stationId"));
 						binf.setStationName1(rs.getString("stationName1"));
+						binf.setStationName2(rs.getString("stationName2"));
+						binf.setStationName5(rs.getString("stationName5"));
 						binf.setStationName(rs.getString("stationName"));
 						binf.setStationIp(rs.getString("stationIp"));
 						binf.setBattGroupName(rs.getString("battGroupName"));
@@ -1887,7 +2068,7 @@
 			Page page =bmd.getPage();
 			Batttestdata_inf tinf=bmd.getTdata();
 			String sql="";
-			String baseSql=" select  distinct(db_battinf.tb_battinf.BattgroupId),StationName1,StationName,stationip,BattGroupName,BattGroupName1,moncount,moncapstd,monvolstd,battproducer,battproductdate,battinusedate " +
+			String baseSql=" select  distinct(db_battinf.tb_battinf.BattgroupId),StationName1,StationName2,StationName5,StationName,stationip,BattGroupName,BattGroupName1,moncount,moncapstd,monvolstd,battproducer,battproductdate,battinusedate " +
 				       " ,db_batt_testdata.tb_batttestdata_inf.test_record_count,test_starttime " +
 				       "from  db_battinf.tb_battinf,db_batt_testdata.tb_batttestdata_inf " +
 				       " where db_battinf.tb_battinf.battgroupid=db_batt_testdata.tb_batttestdata_inf.battgroupid " +
@@ -1907,7 +2088,7 @@
 				" and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id  " +
 				" and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid  " +
 				" and db_user.tb_user_inf.uid=? " +
-			    " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ?)";
+			    " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ? and db_battinf.tb_battinf.stationname5 like ?)";
 			baseSql+=userSql;
 			//鍏呯數鏀剧數閫夋嫨
 			String test_typeA="";//鍏ㄩ儴
@@ -1943,7 +2124,7 @@
 			//System.out.println(sql);
 	     	List<BattInf> list=DAOHelper.executeQuery(sql,DBUtil.getConn(), new Object[]{
 				tinf.getRecord_time(),tinf.getRecord_time1()
-				,binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%"
+				,binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%"
 				}, new CallBack() {
 				
 				public List getResults(ResultSet rs) {
@@ -1954,6 +2135,8 @@
 							BattInf binf=new BattInf();
 							binf.setBattGroupId(rs.getInt("battGroupId"));
 							binf.setStationName1(rs.getString("stationName1"));
+							binf.setStationName2(rs.getString("stationName2"));
+							binf.setStationName2(rs.getString("stationName5"));
 							binf.setStationName(rs.getString("stationName"));
 							binf.setStationIp(rs.getString("stationIp"));
 							binf.setBattGroupName(rs.getString("battGroupName"));
@@ -3228,7 +3411,7 @@
 				" where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId   " +
 				" and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id  " +
 				" and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid  " +
-				" and db_user.tb_user_inf.uid=?" +
+				" and db_user.tb_user_inf.uid=? and db_battinf.tb_battinf.Station_install=1 " +
 				"  limit 1";
 		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
 			
@@ -3448,7 +3631,7 @@
 				" FROM db_battinf.tb_battinf " +
 				" where StationName1 like ? and StationName2 like ?  " +
 				" ORDER BY CONVERT( StationName USING gbk ) COLLATE gbk_chinese_ci ASC ";
-		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getNum(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%"},new CallBack() {
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%"},new CallBack() {
 			
 			public List getResults(ResultSet rs) {
 				List list=new ArrayList();
@@ -3738,12 +3921,12 @@
 	//鐢垫睜閰嶇粍绠$悊(閲嶈)
 	public List serchMakeGroup(Object obj){
 		BattInf binf=(BattInf) obj;
-		String sql="SELECT distinct BattGroupId,battgroupname,stationid,stationname1,stationname2,stationname,stationname3,BattProducer,MonVolStd,MonCapStd,monCount " +
+		String sql="SELECT distinct BattGroupId,battgroupname,stationid,stationname1,stationname2,stationname5,stationname,stationname3,BattProducer,MonVolStd,MonCapStd,monCount " +
 				" ,battinf_re.old_stationname,old_battgroupname,old_battproducer,old_stationid,old_battgroupid,old_monum,new_stationname,new_battgroupname,new_battproducer,new_stationid,new_battgroupid,new_monum,rebuild_time,rebuild_uid,rebuild_address,rebuild_clear_type " +
 				" from db_battinf.tb_battinf " +
 				" left outer join (select * from db_battinf.tb_battinf_rebuild where tb_battinf_rebuild.rebuild_clear_type=1 ) as battinf_re " +
 				" on BattGroupId=battinf_re.new_battgroupid or BattGroupId=battinf_re.old_battgroupid " +
-				" where stationname2 like ?  ";
+				" where stationname2 like ?  and stationname5 like ?  ";
 		//鐢ㄦ埛绠$悊
 		String userSql=" 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=?" +
@@ -3757,7 +3940,7 @@
 		}else{
 			sql+=producerSqlF;
 		}
-		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+binf.getStationName2()+"%",binf.getNum()}, new CallBack() {
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%",binf.getNum()}, new CallBack() {
 			
 			public List getResults(ResultSet rs) {
 				List<BattInf> list=new ArrayList();
@@ -3772,6 +3955,7 @@
 						binf.setStationName1(rs.getString("stationName1"));
 						binf.setStationName2(rs.getString("stationName2"));
 						binf.setStationName3(rs.getString("stationName3"));
+						binf.setStationName5(rs.getString("stationName5"));
 						binf.setBattProducer(rs.getString("battProducer"));
 						binf.setMonVolStd(rs.getFloat("monVolStd"));
 						binf.setMonCapStd(rs.getFloat("monCapStd"));
@@ -3818,18 +4002,18 @@
 	//鐢垫睜閰嶇粍绠$悊(閲嶈)
 	public List serchGroupByInfor(Object obj){
 		BattInf binf=(BattInf) obj;
-		String sql="SELECT distinct BattGroupId,battgroupname,stationid,stationname1,stationname2,stationname,stationname3,BattProducer,MonVolStd,MonCapStd,monCount " +
+		String sql="SELECT distinct BattGroupId,battgroupname,stationid,stationname1,stationname2,stationname,stationname3,stationname5,BattProducer,MonVolStd,MonCapStd,monCount " +
 				" ,battinf_re.old_stationname,old_battgroupname,old_battproducer,old_stationid,old_battgroupid,old_monum,new_stationname,new_battgroupname,new_battproducer,new_stationid,new_battgroupid,new_monum,rebuild_time,rebuild_uid,rebuild_address,rebuild_clear_type " +
 				" from db_battinf.tb_battinf " +
 				" left outer join (select * from db_battinf.tb_battinf_rebuild where tb_battinf_rebuild.rebuild_clear_type=1 ) as battinf_re " +
 				" on BattGroupId=battinf_re.new_battgroupid or BattGroupId=battinf_re.old_battgroupid " +
-				" where stationname1 like ? and stationname2 like ? and stationname3 like ?  and battgroupname like ?  and battgroupid=? ";
+				" where stationname1 like ? and stationname2 like ? and stationname3 like ?  and stationname5 like ? and battgroupname like ?  and battgroupid=? ";
 		//鐢ㄦ埛绠$悊
 		String userSql=" 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=?" +
 				" ) ";
 		sql+=userSql;
-		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getBattGroupName()+"%",binf.getBattGroupId(),binf.getNum()}, new CallBack() {
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationName5()+"%","%"+binf.getBattGroupName()+"%",binf.getBattGroupId(),binf.getNum()}, new CallBack() {
 			
 			public List getResults(ResultSet rs) {
 				List<BattInf> list=new ArrayList();
@@ -3844,6 +4028,7 @@
 						binf.setStationName1(rs.getString("stationName1"));
 						binf.setStationName2(rs.getString("stationName2"));
 						binf.setStationName3(rs.getString("stationName3"));
+						binf.setStationName5(rs.getString("stationName5"));
 						binf.setBattProducer(rs.getString("battProducer"));
 						binf.setMonVolStd(rs.getFloat("monVolStd"));
 						binf.setMonCapStd(rs.getFloat("monCapStd"));
@@ -3887,7 +4072,181 @@
 		});
 		return list;
 	}
-	
+	//棣栭〉涓婃牴鎹畇tationid鏌ヨ鐢垫睜缁勭殑鏈哄巻鍗�
+	public List serchBattAllInfoByStationId(Object obj){
+		BattInf binf=(BattInf) obj;
+		String sql="select * from db_battinf.tb_battinf " +
+				" left outer join  db_battinf.tb_battinf_ex on db_battinf.tb_battinf.stationId=db_battinf.tb_battinf_ex.stationid " +
+				" where db_battinf.tb_battinf.stationId=? " +
+				" order by db_battinf.tb_battinf.battgroupid";
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getStationId()}, new CallBack() {
+			
+			public List getResults(ResultSet rs) {
+				List list=new ArrayList();
+				try {
+					while(rs.next()){
+						  BattInf batt = new BattInf();
+						  
+						  batt.setStationId((rs.getString("StationId")));
+						  batt.setStationId_ex(rs.getString("stationId_ex"));
+						  
+						  batt.setStationName(rs.getString("StationName"));
+						  
+						  batt.setStationName1(rs.getString("StationName1"));
+						  
+						  batt.setStationName2(rs.getString("StationName2"));
+						  
+						  batt.setStationName3(rs.getString("StationName3"));
+						  
+						  batt.setStationName4(rs.getString("StationName4"));
+						  
+						  batt.setStationName5(rs.getString("StationName5"));
+						  
+						  batt.setStationName6(rs.getString("StationName6"));
+						  
+						  batt.setStationName7(rs.getString("StationName7"));
+						  
+						  batt.setStationName8(rs.getString("StationName8"));
+						  
+						  batt.setStationName9(rs.getString("StationName9"));
+						  
+						  batt.setStationIp(rs.getString("StationIp"));
+						  
+						  batt.setFBSDeviceId(Integer.parseInt(rs.getString("FBSDeviceId")));
+						  
+						  batt.setFbsDeviceIp(rs.getString("FbsDeviceIp"));
+						  
+						  batt.setFBSDeviceName(rs.getString("FBSDeviceName"));
+						  
+						  batt.setGroupIndexInFBSDevice(Integer.parseInt(rs.getString(
+						  "GroupIndexInFBSDevice")));
+						  
+						  batt.setBattModel(rs.getString("BattModel"));
+						  
+						  batt.setBattGroupId(Integer.parseInt(rs.getString("BattGroupId")));
+						  
+						  batt.setBattGroupNum(Integer.parseInt(rs.getString("BattGroupNum")));
+						  
+						  batt.setBattGroupName(rs.getString("BattGroupName"));
+						  
+						  batt.setBattGroupName1(rs.getString("BattGroupName1"));
+						 
+						  batt.setBattGroupName2(rs.getString("BattGroupName2"));
+						  
+						  batt.setBattGroupName3(rs.getString("BattGroupName3"));
+						  
+						  batt.setBattGroupName4(rs.getString("BattGroupName4"));
+						  
+						  batt.setBattGroupName5(rs.getString("BattGroupName5"));
+						  
+						  batt.setBattGroupName6(rs.getString("BattGroupName6"));
+						  
+						  batt.setFloatVolLevel(Float.parseFloat(rs.getString("FloatVolLevel")));
+						  
+						  batt.setOfflineVolLevel(Float.parseFloat(rs.getString("OfflineVolLevel"))) ;
+						 
+						  batt.setBattFloatCurrent(Float.parseFloat(rs.getString("BattFloatCurrent")));
+						  
+						  batt.setDeviceId(rs.getString("DeviceId"));
+						  
+						  batt.setDeviceName(rs.getString("DeviceName"));
+						  
+						  batt.setMonCount(Integer.parseInt(rs.getString("MonCount")));
+						  
+						  batt.setMonCapStd(Float.parseFloat(rs.getString("MonCapStd")));
+						  
+						  batt.setMonResStd(Float.parseFloat(rs.getString("MonResStd")));
+						 
+						  batt.setMonSerStd(Float.parseFloat(rs.getString("MonSerStd")));
+						  
+						  batt.setMonTmpStd(Float.parseFloat(rs.getString("MonTmpStd")));
+						  
+						  batt.setMonVolStd(Float.parseFloat(rs.getString("MonVolStd")));
+						  
+						  batt.setMonVolLowToAvg(Float.parseFloat(rs.getString("MonVolLowToAvg")));
+						  
+						  batt.setMonNum(Integer.parseInt(rs.getString("MonNum")));
+						  
+						  batt.setBattProducer(rs.getString("BattProducer"));
+						  
+						  batt.setBattProductDate((Date) rs.getObject("BattProductDate"));
+						  
+						  batt.setBattInUseDate((Date) rs.getObject("BattInUseDate"));
+						  
+						  batt.setSignalId(rs.getString("SignalId"));
+						  
+						  batt.setCInterFaceId(Integer.parseInt(rs.getString("CInterFaceId")));
+						  batt.setInstall_user(rs.getString("install_user"));
+						  batt.setSignalName(rs.getString("SignalName"));
+						  int BattGuarantDayCount=rs.getInt("BattGuarantDayCount")-ActionUtil.daysBetween(rs.getDate("BattInUseDate"), new Date());//鍓╀綑淇濅慨澶╂暟
+						  batt.setBattGuarantDayCount(BattGuarantDayCount);
+						  
+						  Battinf_ex binf_ex=new Battinf_ex();
+							binf_ex.setStationId(rs.getString("stationId"));
+							binf_ex.setFBSDeviceId(rs.getInt("fBSDeviceId"));
+							binf_ex.setStationName(rs.getString("stationName"));
+							binf_ex.setStationCode(rs.getString("stationCode"));
+							binf_ex.setStationRegion(rs.getString("stationRegion"));
+							binf_ex.setKeyWords(rs.getString("keyWords"));
+							binf_ex.setAffiliation(rs.getString("affiliation"));
+							binf_ex.setDataSources(rs.getString("dataSources"));
+							binf_ex.setStationType(rs.getString("stationType"));
+							binf_ex.setLongitude(rs.getDouble("longitude"));
+							binf_ex.setLatitude(rs.getInt("latitude"));
+							binf_ex.setStationAddr(rs.getString("stationAddr"));
+							binf_ex.setStationLevel(rs.getString("stationLevel"));
+							binf_ex.setMaintenanceState(rs.getString("maintenanceState"));
+							binf_ex.setBlockedState(rs.getString("blockedState"));
+							binf_ex.setMaintenanceCompany(rs.getString("maintenanceCompany"));
+							binf_ex.setBusinessScenario(rs.getString("businessScenario"));
+							binf_ex.setCoverScenario(rs.getString("coverScenario"));
+							binf_ex.setSiteTerrain(rs.getString("siteTerrain"));
+							binf_ex.setPropertyRights(rs.getString("propertyRights"));
+							binf_ex.setPropertyUnit(rs.getString("propertyUnit"));
+							binf_ex.setIsShare(rs.getString("isShare"));
+							binf_ex.setUseUnit(rs.getString("useUnit"));
+							binf_ex.setSiteCode(rs.getString("siteCode"));
+							binf_ex.setHistorySiteCode(rs.getString("historySiteCode"));
+							binf_ex.setSiteInternalNumber(rs.getString("siteInternalNumber"));
+							binf_ex.setSitePinyinReferred(rs.getString("sitePinyinReferred"));
+							binf_ex.setSiteChineseReferred(rs.getString("siteChineseReferred"));
+							binf_ex.setSiteMergeRecord(rs.getString("siteMergeRecord"));
+							binf_ex.setIsOpenBusiness(rs.getString("isOpenBusiness"));
+							binf_ex.setSchoolPersonnel(rs.getString("schoolPersonnel"));
+							binf_ex.setEntryTime(rs.getString("entryTime"));
+							binf_ex.setModifyPeople(rs.getString("modifyPeople"));
+							binf_ex.setModifyTime(rs.getString("modifyTime"));
+							binf_ex.setNote(rs.getString("note"));
+							binf_ex.setSiteReceivesMark(rs.getString("siteReceivesMark"));
+							binf_ex.setSiteValidity(rs.getString("siteValidity"));
+							binf_ex.setSiteNameCMCC(rs.getString("siteNameCMCC"));
+							binf_ex.setSiteNameCUCC(rs.getString("siteNameCUCC"));
+							binf_ex.setSiteNameCTC(rs.getString("siteNameCTC"));
+							binf_ex.setProducer(rs.getString("producer"));
+							binf_ex.setLastTimeLong(rs.getDouble("lastTimeLong"));
+							binf_ex.setLastTimeType(rs.getString("lastTimeType"));
+							binf_ex.setLastTimeDate(rs.getTimestamp("lastTimeDate"));
+							binf_ex.setShareInfo(rs.getString("shareInfo"));
+							binf_ex.setElectPowerCMCC(rs.getInt("electPowerCMCC"));
+							binf_ex.setElectPowerCUCC(rs.getInt("electPowerCUCC"));
+							binf_ex.setElectPowerCTC(rs.getInt("electPowerCTC"));
+							binf_ex.setIsCanElectPower(rs.getInt("isCanElectPower"));
+							binf_ex.setUpperStationRoute(rs.getDouble("upperStationRoute"));
+							binf_ex.setUpperStationDifficult(rs.getString("upperStationDifficult"));
+							binf_ex.setClienteleErrorService(rs.getString("clienteleErrorService"));
+							
+							batt.setBinf_ex(binf_ex);
+						    list.add(batt); 
+					}
+				} catch (SQLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				return list;
+			}
+		});
+		return list;
+	}
 	
 	public static void main(String[] args) throws ParseException {
 		//new BattInfImpl().searchAll();
@@ -3902,6 +4261,7 @@
 		binf.setStationName3("");
 		binf.setBattGroupName("");
 		binf.setBattProducer("1");
+		binf.setStationId("42000575");
 		User_inf uinf=new User_inf();
 		uinf.setUId(1002);
 		
@@ -3929,11 +4289,15 @@
 		//List<BattInf> list=biml.serchMakeGroup(binf);
 		//List<BattInf> list=biml.serchGroupByInfor(binf);
 		//List<BattInf> list=biml.searchInform1(bmd);
-		List<BattInf> list=biml.serchStationName5(binf);
-		/*for (BattInf b : list) {
+		//<BattInf> list=biml.serchStationName5(binf);
+		/*List<BattInf> list=biml.serchBattAllInfoByStationId(binf);
+		//List<BattInf> list=biml.searchInform_ky();
+		for (BattInf b : list) {
 			System.out.println(b);
-		}*/
-		System.out.println(list.size());
+		}
+		System.out.println(list.size());*/
+		int nums=biml.serchByInstall_count(uinf);
+		System.out.println(nums);
 	}
 	
     public List getResults(ResultSet rs) {
@@ -3967,7 +4331,7 @@
 				binf.setBattProducer(rs.getString("battProducer"));
 				binf.setBattProductDate(rs.getDate("battProductDate"));
 				binf.setBattInUseDate(rs.getDate("battInUseDate"));
-
+               
 				//minf.setFault_type(rs.getString("fault_type"));
 				if (rs.getString("maint_done_time") != null)
 					mainf.setMaint_done_time(DAOHelper.sdf.parse(rs

--
Gitblit v1.9.1