From e24744ff8b8aaa16ec75f33dd67a31e8fb94979d Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.28>
Date: 星期一, 19 十一月 2018 14:48:22 +0800
Subject: [PATCH] 修改

---
 gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java |   81 ++++++++++++++++++++++++++++++++++++++--
 1 files changed, 76 insertions(+), 5 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index 15e221f..6cbe6d7 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -233,6 +233,75 @@
 		}
 		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;
@@ -240,7 +309,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() {
@@ -256,6 +325,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"));
@@ -3910,9 +3980,9 @@
 	//棣栭〉涓婃牴鎹畇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=? " +
+		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() {
 			
@@ -4096,7 +4166,7 @@
 		binf.setStationName3("");
 		binf.setBattGroupName("");
 		binf.setBattProducer("1");
-		binf.setStationId("42000002");
+		binf.setStationId("42000575");
 		User_inf uinf=new User_inf();
 		uinf.setUId(1002);
 		
@@ -4126,6 +4196,7 @@
 		//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