From a16c42ca5a9de21cec01f1342902052a5c32f362 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.30>
Date: 星期三, 14 十一月 2018 16:03:12 +0800
Subject: [PATCH] 电池组信息跨域

---
 gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java |  966 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 830 insertions(+), 136 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index a3346ad..af7ad73 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -25,10 +25,13 @@
 import com.fgkj.db.DBUtil;
 import com.fgkj.db.IDatabaseName;
 import com.fgkj.dto.BattInf;
+import com.fgkj.dto.BattInf_Rebuild;
 import com.fgkj.dto.BattMap_information;
 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;
 import com.fgkj.dto.Limit;
@@ -39,9 +42,10 @@
 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 {
-    //娣诲姞鏂扮殑鐢垫睜缁�(澶氫釜)
+	//娣诲姞鏂扮殑鐢垫睜缁�(澶氫釜)
 	public boolean add(Object obj) {
 		List<BattInf> list=(List<BattInf>) obj;
 		ArrayList<String> sql_str=new ArrayList();
@@ -66,14 +70,14 @@
 				}
 				binf.setBattGroupId(maxb);
 				String sql = "insert into db_battinf.tb_battinf(" +
-						"StationId,StationName,StationName1,StationName2,StationName3,StationName4,StationIp,FBSDeviceId,FbsDeviceIp,FbsDeviceIp_YM,FbsDeviceIp_WG,"
+						"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" +
-						") values('"+binf.getStationId()+"','"+binf.getStationName()+"','"+binf.getStationName1()+"','"+binf.getStationName2()+"','"+binf.getStationName3()+"','"+binf.getStationName4()+
+						",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate,Load_curr,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.getBattProducer()+"','"+binf.getBattModel()+"','"+DAOHelper.sdf.format(binf.getBattProductDate())+"','"+DAOHelper.sdf.format(binf.getBattInUseDate())+"',"+binf.getLoad_curr()+","+binf.getDisCurrMax()+",'"+binf.getStation_phone()+"')";
 				
 				if(binf.getStationId().equals(maxs)){
 					maxs++;
@@ -112,10 +116,10 @@
 						binf.setStationId(String.valueOf(maxs));
 					}
 				}
-				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()+"',StationIp='"+binf.getStationIp()+"',FBSDeviceId="+binf.getFBSDeviceId()+",FbsDeviceIp='"+binf.getFbsDeviceIp()+"',"
+				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())+"' "
-						 +" where battgroupId="+binf.getBattGroupId();
+						  "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();
 				sql_str.add(sql);
 				{
 					String msg="淇敼"+binf.getStationName()+"鏈烘埧"+binf.getBattGroupId()+"鐢垫睜缁勭殑淇℃伅";
@@ -157,21 +161,21 @@
 		Boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
 		return bl;
 	}
-    //鏍规嵁缁存姢鍖哄拰鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁勪俊鎭�
+    //鏍规嵁缁存姢鍖哄拰鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁勪俊鎭�(鐢垫睜缁勪俊鎭厤缃�)
 	public List searchInform(Object obj){
 		Batt_Maint_Dealarm bmd=(Batt_Maint_Dealarm) obj;
 		BattInf binf=bmd.getBinf();
 		Page page=bmd.getPage();
 		Connection conn= DBUtil.getConn();
 		String numberSql=" SELECT FOUND_ROWS() number";
-		String sql="select SQL_CALC_FOUND_ROWS distinct(StationId),StationName1,StationName2,StationName3,StationName4,StationIp,FBSDeviceId,FbsDeviceIp_YM,FbsDeviceIp_WG,FbsDeviceIp,"
+		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 " +
+				 ",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate,Load_curr,DisCurrMax,station_phone  " +
 				 " From db_battinf.tb_battinf " +
-				 " Where StationName like ? and StationName1 like ? and StationName2 like ?  " +
+				 " Where StationName like ? and StationName1 like ? and StationName2 like ?  and StationName5 like ? " +
 				 " order by StationId  " +
 				 " limit ?,?";
-		List<BattInf> list=DAOHelper.executeQueryLimit(sql,conn, new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%",(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()},new CallBack() {
+		List<BattInf> list=DAOHelper.executeQueryLimit(sql,conn, new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%",(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()},new CallBack() {
 			
 			public List getResults(ResultSet rs) {
 				List list = new ArrayList<BattInf>();
@@ -185,6 +189,7 @@
 						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"));
 						
@@ -209,7 +214,120 @@
 						binf.setBattModel(rs.getString("battModel"));
 						binf.setBattProductDate(rs.getDate("battProductDate"));
 						binf.setBattInUseDate(rs.getDate("battInUseDate"));
+						binf.setLoad_curr(rs.getFloat("load_curr"));
+                        binf.setDisCurrMax(rs.getFloat("disCurrMax"));
+                        binf.setStation_phone(rs.getString("station_phone"));
+						list.add(binf);
 
+					}
+				} catch (SQLException e) {
+					e.printStackTrace();
+				}		
+				return list;
+			}
+		});
+		//鍘绘帀limit鏉′欢鍚庣殑鎬绘暟
+		int number=LimitNumberFactory.GetLimtitNumber(conn, numberSql);
+		if(list!=null&&list.size()>0){
+			list.get(list.size()-1).setNum(number);
+		}
+		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,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.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;
+		BattInf binf=bmd.getBinf();
+		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  " +
+				 " From db_battinf.tb_battinf " +
+				 " limit ?,?";
+		List<BattInf> list=DAOHelper.executeQueryLimit(sql,conn, new Object[]{(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()},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.setStationName1(rs.getString("stationName1"));
+						binf.setStationName2(rs.getString("stationName2"));
+						binf.setStationName3(rs.getString("stationName3"));
+						binf.setFBSDeviceId(rs.getInt("fBSDeviceId"));
+						binf.setStationName(rs.getString("stationName"));
+						binf.setStationId_ex(rs.getString("stationId_ex"));
 						list.add(binf);
 
 					}
@@ -340,11 +458,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!=? ";//鍏ㄩ儴
@@ -353,6 +471,22 @@
 			baseSql+=station1SqlT;
 		}else{
 			baseSql+=station1SqlF;
+		}
+		//鐢ㄤ簬缁存姢鍖�
+		String station2SqlT=" and stationname2!=? ";//鍏ㄩ儴
+		String station2SqlF=" and stationname2=? ";
+		if(binf.getStationName2().equals("")){
+			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!=? ";//鍏ㄩ儴
@@ -373,7 +507,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.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();
@@ -384,6 +518,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);
 					}
@@ -1002,104 +1138,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.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; }
 
 		});
@@ -1410,7 +1548,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,battgroupnum,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,battgroupnum,moncount,moncapstd,monvolstd,battproducer,battproductdate,battinusedate "
 						+ " from db_battinf.tb_battinf  "
 						+ " where ";
 				//閫夊彇钃勭數姹犵粍鏉′欢
@@ -1428,14 +1566,14 @@
 				" 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 StationName1 asc,db_battinf.tb_battinf.BattgroupId asc ";
 				sql=baseSql+endSql;
 				String limitSql=" limit ?,? ";
 				sql+=limitSql;
 				//System.out.println(sql);
-				List<BattInf> list = DAOHelper.executeQueryLimit(sql,conn,new Object[] {binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%",(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()},
+				List<BattInf> list = DAOHelper.executeQueryLimit(sql,conn,new Object[] {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) {
 								List list=new ArrayList();
@@ -1446,6 +1584,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.setStationIp(rs.getString("stationIp"));
 										binf.setBattGroupName(rs.getString("battGroupName"));
 										binf.setBattGroupName1(rs.getString("battGroupName1"));
@@ -1611,7 +1751,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  ";
 		//閫夊彇钃勭數姹犵粍鏉′欢
@@ -1629,7 +1769,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.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 ";
@@ -1639,7 +1779,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.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) {
@@ -1651,6 +1791,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"));
@@ -1830,7 +1972,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 " +
@@ -1850,7 +1992,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.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="";//鍏ㄩ儴
@@ -1886,7 +2028,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.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%"
 				}, new CallBack() {
 				
 				public List getResults(ResultSet rs) {
@@ -1897,6 +2039,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"));
@@ -3271,6 +3415,31 @@
 		} );
 		return list;
 	}
+	//鏌ヨ鎵�鏈夌殑鐪佷唤(宸︿晶瀵艰埅绗竴灞傦紝鏌ユ墍鏈夌殑鐪佷唤)
+	public List serchAllStation_all(Object obj){
+		BattInf binf=(BattInf) obj;;
+		String sql="select DISTINCT StationName1 " +
+				" FROM db_battinf.tb_battinf " +
+				" ORDER BY CONVERT( StationName1 USING gbk ) COLLATE gbk_chinese_ci ASC";
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), null,new CallBack() {
+			
+			public List getResults(ResultSet rs) {
+				List list=new ArrayList();
+					try {
+						while(rs.next()){
+							BattInf batt = new BattInf();
+							batt.setStationName1(rs.getString("stationName1"));
+							list.add(batt);
+						}
+					} catch (SQLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				return list;
+			}
+		} );
+		return list;
+	}
 	
 	//鏌ヨ绠$悊鐨勫競(宸︿晶瀵艰埅绗簩灞傦紝鏌ユ墍鏈夌殑甯�,num涓瓨鏀緐id)
 	public List serchStationName2(Object obj){
@@ -3301,15 +3470,43 @@
 		} );
 		return list;
 	}
-	//鏌ヨ绠$悊鐨勬満鎴�(宸︿晶瀵艰埅绗笁灞傦紝鏌ユ墍鏈夌殑鏈烘埧,num涓瓨鏀緐id)
-	public List serchStationName3(Object obj){
+	//鏌ヨ绠$悊鐨勫競(宸︿晶瀵艰埅绗簩灞傦紝鏌ユ墍鏈夌殑甯�)
+	public List serchStationName2_all(Object obj){
 		BattInf binf=(BattInf) obj;
-		String sql="select DISTINCT StationName1,StationName2,StationName3,stationid,fbsdeviceid  " +
+		String sql="select DISTINCT StationName1,StationName2  " +
+				" FROM db_battinf.tb_battinf " +
+				" where StationName1 like ? " +
+				" ORDER BY CONVERT( StationName2 USING gbk ) COLLATE gbk_chinese_ci ASC ";
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+binf.getStationName1()+"%"},new CallBack() {
+			
+			public List getResults(ResultSet rs) {
+				List list=new ArrayList();
+					try {
+						while(rs.next()){
+							BattInf batt = new BattInf();
+							batt.setStationName1(rs.getString("stationName1"));
+							batt.setStationName2(rs.getString("stationName2"));
+							list.add(batt);
+						}
+					} catch (SQLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				return list;
+			}
+		} );
+		return list;
+	}
+	//鏌ヨ绠$悊鐨勫幙/鍖�(宸︿晶瀵艰埅绗笁灞傦紝鏌ユ墍鏈夌殑鍘�/鍖�)
+	public List serchStationName5(Object obj){
+		BattInf binf=(BattInf) obj;
+		String sql="select DISTINCT stationName5,StationName1,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 ? and StationName2 like ?  " +
-				" ORDER BY CONVERT( StationName3 USING gbk ) COLLATE gbk_chinese_ci ASC ";
+				" ORDER BY CONVERT( StationName USING gbk ) COLLATE gbk_chinese_ci ASC ";
+		//System.out.println(sql);
 		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getNum(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%"},new CallBack() {
 			
 			public List getResults(ResultSet rs) {
@@ -3319,8 +3516,102 @@
 							BattInf batt = new BattInf();
 							batt.setStationName1(rs.getString("stationName1"));
 							batt.setStationName2(rs.getString("stationName2"));
+							batt.setStationName5(rs.getString("stationName5"));
+							list.add(batt);
+						}
+					} catch (SQLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				return list;
+			}
+		} );
+		return list;
+	}
+	//鏌ヨ绠$悊鐨勫幙/鍖�(宸︿晶瀵艰埅绗笁灞傦紝鏌ユ墍鏈夌殑鍘�/鍖�)
+	public List serchStationName5_all(Object obj){
+		BattInf binf=(BattInf) obj;
+		String sql="select DISTINCT stationName5,StationName1,StationName2  " +
+				" 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.getStationName1()+"%","%"+binf.getStationName2()+"%"},new CallBack() {
+			
+			public List getResults(ResultSet rs) {
+				List list=new ArrayList();
+					try {
+						while(rs.next()){
+							BattInf batt = new BattInf();
+							batt.setStationName1(rs.getString("stationName1"));
+							batt.setStationName2(rs.getString("stationName2"));
+							batt.setStationName5(rs.getString("stationName5"));
+							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 StationName,StationName1,StationName2,StationName3,StationName5,stationid,fbsdeviceid,FBSDeviceName  " +
+				" 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 ? and StationName5 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()+"%","%"+binf.getStationName5()+"%"},new CallBack() {
+			
+			public List getResults(ResultSet rs) {
+				List list=new ArrayList();
+					try {
+						while(rs.next()){
+							BattInf batt = new BattInf();
+							batt.setStationName(rs.getString("stationName"));
+							batt.setStationName1(rs.getString("stationName1"));
+							batt.setStationName2(rs.getString("stationName2"));
 							batt.setStationName3(rs.getString("stationName3"));
+							batt.setStationName5(rs.getString("stationName5"));
 							batt.setStationId(rs.getString("stationId"));
+							batt.setFBSDeviceName(rs.getString("fBSDeviceName"));
+							batt.setFBSDeviceId(rs.getInt("fBSDeviceId"));
+							list.add(batt);
+						}
+					} catch (SQLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				return list;
+			}
+		} );
+		return list;
+	}
+	//鏌ヨ绠$悊鐨勬満鎴�(宸︿晶瀵艰埅绗洓灞傦紝鏌ユ墍鏈夌殑鏈烘埧)
+	public List serchStationName3_all(Object obj){
+		BattInf binf=(BattInf) obj;
+		String sql="select DISTINCT StationName,StationName1,StationName2,StationName3,StationName5,stationid,fbsdeviceid,FBSDeviceName  " +
+				" FROM db_battinf.tb_battinf " +
+				" where StationName1 like ? and StationName2 like ?  and StationName5 like ? " +
+				" ORDER BY CONVERT( StationName USING gbk ) COLLATE gbk_chinese_ci ASC ";
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%"},new CallBack() {
+			
+			public List getResults(ResultSet rs) {
+				List list=new ArrayList();
+					try {
+						while(rs.next()){
+							BattInf batt = new BattInf();
+							batt.setStationName(rs.getString("stationName"));
+							batt.setStationName1(rs.getString("stationName1"));
+							batt.setStationName2(rs.getString("stationName2"));
+							batt.setStationName3(rs.getString("stationName3"));
+							batt.setStationName5(rs.getString("stationName5"));
+							batt.setStationId(rs.getString("stationId"));
+							batt.setFBSDeviceName(rs.getString("fBSDeviceName"));
 							batt.setFBSDeviceId(rs.getInt("fBSDeviceId"));
 							list.add(batt);
 						}
@@ -3335,11 +3626,11 @@
 	}
    
 	
-	//鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�(宸︿晶瀵艰埅绗洓灞�,鏍规嵁鏈烘埧鏌ヨ涓嬮潰鐨勭數姹犵粍,num涓瓨鏀緐id)
+	//鏍规嵁鏈烘埧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 StationName1 like ? and StationName2 like ?  and  StationName3 like ?  ";
+		String sql="select DISTINCT StationName,StationName1,StationName2,StationName3,StationName5,StationId,stationid_ex,StationIP,FBSDeviceId,BattGroupName,BattGroupName1,BattGroupName2,MonCount,battgroupId,MonCapStd,MonVolStd,MonResStd,MonSerStd,BattProducer,BattInUseDate,GroupIndexInFBSDevice,Load_curr,DisCurrMax " +
+				"from db_battinf.tb_battinf  where StationName1 like ? and StationName2 like ?   and  StationName like ? and StationName5 like ?  ";
 	    //鏈烘埧id
 		String idSqlT=" and  Stationid like ? ";
 		sql+=idSqlT;
@@ -3350,8 +3641,9 @@
 		sql+=userSql;
 		//鎺掑簭
 		String orderSql=" ORDER BY StationName1,battgroupId ";
+		sql+=orderSql;
 		//System.out.println(sql);
-		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationId()+"%",binf.getNum()},new CallBack() {
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName5()+"%","%"+binf.getStationId()+"%",binf.getNum()},new CallBack() {
 			
 			public List getResults(ResultSet rs) {
 				List list = new ArrayList();
@@ -3359,6 +3651,67 @@
 					while (rs.next()) {
 						BattInf batt = new BattInf();
 						batt.setStationName(rs.getString("stationName"));
+						batt.setStationName1(rs.getString("stationName1"));
+						batt.setStationName2(rs.getString("stationName2"));
+						batt.setStationName3(rs.getString("stationName3"));
+						batt.setStationName5(rs.getString("stationName5"));
+						batt.setStationId(rs.getString("StationId"));
+						batt.setStationId_ex(rs.getString("stationId_ex"));
+						batt.setStationIp(rs.getString("StationIP"));
+						batt.setBattGroupName(rs.getString("BattGroupName").trim());
+						batt.setBattGroupName1(rs.getString("BattGroupName1").trim());
+						batt.setBattGroupName2(rs.getString("BattGroupName2").trim());
+						batt.setFBSDeviceId(rs.getInt("fBSDeviceId"));
+						batt.setMonCount(rs.getInt("MonCount"));
+						batt.setBattGroupId(rs.getInt("battgroupId"));
+						batt.setMonCapStd(rs.getFloat("monCapStd"));
+						batt.setMonVolStd(rs.getFloat("monVolStd"));
+						batt.setMonResStd(rs.getFloat("MonResStd"));
+						batt.setMonSerStd(rs.getFloat("MonSerStd"));
+						batt.setBattProducer(rs.getString("BattProducer"));
+						batt.setBattInUseDate(rs.getDate("BattInUseDate"));
+						batt.setGroupIndexInFBSDevice(rs.getInt("groupIndexInFBSDevice"));
+						batt.setLoad_curr(rs.getFloat("load_curr"));
+						batt.setDisCurrMax(rs.getFloat("disCurrMax"));
+						list.add(batt);
+					}
+				} catch (SQLException e) {
+					e.printStackTrace();
+				}
+				return list;
+			}
+		});
+		return list;
+		}
+	//鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�(宸︿晶瀵艰埅绗簲灞�,鏍规嵁鏈烘埧鏌ヨ涓嬮潰鐨勭數姹犵粍,num涓瓨鏀緐id)
+	public List serchBattByStation_all(Object obj){
+		BattInf binf=(BattInf) obj;
+		String sql="select DISTINCT StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationId,StationIP,FBSDeviceId,BattGroupName,BattGroupName1,BattGroupName2,MonCount,battgroupId,MonCapStd,MonVolStd,MonResStd,MonSerStd,BattProducer,BattInUseDate,GroupIndexInFBSDevice " +
+				"from db_battinf.tb_battinf  where StationName1 like ? and StationName2 like ?  and  StationName like ? and StationName5 like ? ";
+	    //鏈烘埧id
+		String idSqlT=" and  Stationid like ? ";
+		sql+=idSqlT;
+		//鐢ㄦ埛绠$悊
+		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;
+		//鎺掑簭
+		String orderSql=" ORDER BY StationName1,battgroupId ";
+		sql+=orderSql;
+		//System.out.println(sql);
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName5()+"%","%"+binf.getStationId()+"%"},new CallBack() {
+			
+			public List getResults(ResultSet rs) {
+				List list = new ArrayList();
+				try {
+					while (rs.next()) {
+						BattInf batt = new BattInf();
+						batt.setStationName(rs.getString("stationName"));
+						batt.setStationName1(rs.getString("stationName1"));
+						batt.setStationName2(rs.getString("stationName2"));
+						batt.setStationName3(rs.getString("stationName3"));
+						batt.setStationName5(rs.getString("stationName5"));
 						batt.setStationId(rs.getString("StationId"));
 						batt.setStationIp(rs.getString("StationIP"));
 						batt.setBattGroupName(rs.getString("BattGroupName").trim());
@@ -3468,15 +3821,351 @@
 		return nums;
 	}
     
+	
+	//鐢垫睜閰嶇粍绠$悊(閲嶈)
+	public List serchMakeGroup(Object obj){
+		BattInf binf=(BattInf) obj;
+		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 ?  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=?" +
+				" ) ";
+		sql+=userSql;
+		//閫変腑鍝佺墝涓�鑷�
+		String producerSqlT=" order by BattProducer,MonCapStd,MonVolStd,BattGroupId ";//涓�鑷�
+		String producerSqlF=" order by MonCapStd,MonVolStd,BattGroupId ";//涓嶄竴鑷�
+		if(binf.getBattProducer().equals("1")){
+			sql+=producerSqlT;
+		}else{
+			sql+=producerSqlF;
+		}
+		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();
+				int battgroupid=0;
+				try {
+					while(rs.next()){
+						BattInf binf=new BattInf();
+						binf.setBattGroupId(rs.getInt("battGroupId"));
+						binf.setBattGroupName(rs.getString("battGroupName"));
+						binf.setStationId(rs.getString("stationId"));
+						binf.setStationName(rs.getString("stationName"));
+						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"));
+						binf.setMonCount(rs.getInt("monCount"));
+						
+						BattInf_Rebuild brinf=new BattInf_Rebuild();
+						brinf.setNew_battgroupid(rs.getInt("new_battgroupid"));
+						brinf.setNew_battgroupname(rs.getString("new_battgroupname"));
+						brinf.setNew_battproducer(rs.getString("new_battproducer"));
+						brinf.setNew_monum(rs.getInt("new_monum"));
+						brinf.setNew_stationid(rs.getString("new_stationid"));
+						brinf.setNew_stationname(rs.getString("new_stationname"));
+						brinf.setOld_battgroupid(rs.getInt("old_battgroupid"));
+						brinf.setOld_battgroupname(rs.getString("old_battgroupname"));
+						brinf.setOld_battproducer(rs.getString("old_battproducer"));
+						brinf.setOld_monum(rs.getInt("old_monum"));
+						brinf.setOld_stationid(rs.getString("old_stationid"));
+						brinf.setOld_stationname(rs.getString("old_stationname"));
+						brinf.setRebuild_address(rs.getString("rebuild_address"));
+						brinf.setRebuild_clear_type(rs.getInt("rebuild_clear_type"));
+						brinf.setRebuild_time(rs.getTimestamp("rebuild_time"));
+						brinf.setRebuild_uid(rs.getInt("rebuild_uid"));
+						
+                        if(binf.getBattGroupId()==battgroupid){
+							((ArrayList)list.get(list.size()-1).getObj()).add(brinf);
+							continue;
+						}
+						List listr=new ArrayList();
+						listr.add(brinf);
+						binf.setObj(listr);
+						battgroupid=binf.getBattGroupId();
+						
+						list.add(binf);
+					}
+				} catch (SQLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				return list;
+			}
+		});
+		return list;
+	}
+	//鐢垫睜閰嶇粍绠$悊(閲嶈)
+	public List serchGroupByInfor(Object obj){
+		BattInf binf=(BattInf) obj;
+		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 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.getStationName5()+"%","%"+binf.getBattGroupName()+"%",binf.getBattGroupId(),binf.getNum()}, new CallBack() {
+			
+			public List getResults(ResultSet rs) {
+				List<BattInf> list=new ArrayList();
+				int battgroupid=0;
+				try {
+					while(rs.next()){
+						BattInf binf=new BattInf();
+						binf.setBattGroupId(rs.getInt("battGroupId"));
+						binf.setBattGroupName(rs.getString("battGroupName"));
+						binf.setStationId(rs.getString("stationId"));
+						binf.setStationName(rs.getString("stationName"));
+						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"));
+						binf.setMonCount(rs.getInt("monCount"));
+						
+						BattInf_Rebuild brinf=new BattInf_Rebuild();
+						brinf.setNew_battgroupid(rs.getInt("new_battgroupid"));
+						brinf.setNew_battgroupname(rs.getString("new_battgroupname"));
+						brinf.setNew_battproducer(rs.getString("new_battproducer"));
+						brinf.setNew_monum(rs.getInt("new_monum"));
+						brinf.setNew_stationid(rs.getString("new_stationid"));
+						brinf.setNew_stationname(rs.getString("new_stationname"));
+						brinf.setOld_battgroupid(rs.getInt("old_battgroupid"));
+						brinf.setOld_battgroupname(rs.getString("old_battgroupname"));
+						brinf.setOld_battproducer(rs.getString("old_battproducer"));
+						brinf.setOld_monum(rs.getInt("old_monum"));
+						brinf.setOld_stationid(rs.getString("old_stationid"));
+						brinf.setOld_stationname(rs.getString("old_stationname"));
+						brinf.setRebuild_address(rs.getString("rebuild_address"));
+						brinf.setRebuild_clear_type(rs.getInt("rebuild_clear_type"));
+						brinf.setRebuild_time(rs.getTimestamp("rebuild_time"));
+						brinf.setRebuild_uid(rs.getInt("rebuild_uid"));
+						
+                        if(binf.getBattGroupId()==battgroupid){
+							((ArrayList)list.get(list.size()-1).getObj()).add(brinf);
+							continue;
+						}
+						List listr=new ArrayList();
+						listr.add(brinf);
+						binf.setObj(listr);
+						battgroupid=binf.getBattGroupId();
+						
+						list.add(binf);
+					}
+				} catch (SQLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				return list;
+			}
+		});
+		return list;
+	}
+	//棣栭〉涓婃牴鎹畇tationid鏌ヨ鐢垫睜缁勭殑鏈哄巻鍗�
+	public List serchBattAllInfoByStationId(Object obj){
+		BattInf binf=(BattInf) obj;
+		String sql="select * from db_battinf.tb_battinf,db_battinf.tb_battinf_ex " +
+				" where db_battinf.tb_battinf.stationId=db_battinf.tb_battinf_ex.stationid " +
+				" and 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.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();
 		
 		BattInfImpl biml = new BattInfImpl();
 		BattInf binf = new BattInf();
-		binf.setBattGroupId(1000967);
-		binf.setStationName("鍐呰挋鍙�");
-		binf.setStationName1("鍐呰挋鍙�");
-		
+		binf.setNum(1002);
+		binf.setBattGroupId(1000001);
+		binf.setStationName("");
+		binf.setStationName1("");
+		binf.setStationName2("");
+		binf.setStationName3("");
+		binf.setBattGroupName("");
+		binf.setBattProducer("1");
+		binf.setStationId("42000002");
 		User_inf uinf=new User_inf();
 		uinf.setUId(1002);
 		
@@ -3501,7 +4190,12 @@
 		//List<BattInf> list = biml.serchByConditionNew(bmd);
 		//List<BattInf> list=biml.serchByTestType(bmd);
 		//List<BattInf> list=biml.serchGroupAssess(bmd);
-		List<BattInf> list=biml.serchByMonNum(binf);
+		//List<BattInf> list=biml.serchMakeGroup(binf);
+		//List<BattInf> list=biml.serchGroupByInfor(binf);
+		//List<BattInf> list=biml.searchInform1(bmd);
+		//<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);
 		}

--
Gitblit v1.9.1