From bc08da69b44c9893cf29e1549e917e8bf527b85b Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.23>
Date: 星期四, 01 十一月 2018 09:21:04 +0800
Subject: [PATCH] 机房状态查询

---
 gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java |    7 ++++---
 gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java          |   11 ++++++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
index 09a7d35..11ae092 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
@@ -51,10 +51,10 @@
 		String numberSql="SELECT FOUND_ROWS() number";//瀛樻斁鎬绘暟
 		String sql="select SQL_CALC_FOUND_ROWS distinct station_id,dev_id,record_datetime,station_stat,station_poff_start_time,station_fadian_start_time" +
 				   " ,station_diaozhan_start_time,station_temp,station_damp,station_dooropen_start_time,station_xuhang_start_time" +
-				   " ,tb_battinf.stationname,tb_battinf.stationname1,tb_battinf.stationname2,tb_battinf.stationname3 " +
+				   " ,tb_battinf.stationname,tb_battinf.stationname1,tb_battinf.stationname2,tb_battinf.stationname3,tb_battinf.stationname5 " +
 				   " from db_ram_db.tb_bts_station_state,db_battinf.tb_battinf  " +
 				   " where  tb_bts_station_state.dev_id=db_battinf.tb_battinf.FBSDeviceId  " +
-				   " and tb_battinf.stationname1 like ? and tb_battinf.stationname2 like ? and tb_battinf.stationname3 like ?  " +
+				   " and tb_battinf.stationname1 like ? and tb_battinf.stationname2 like ? and tb_battinf.stationname3 like ?  and tb_battinf.stationname5 like ?   " +
 				   " and stationid like ? " ;
 				   /*"  and tb_bts_station_state.station_id in (" +
 				   "  select distinct db_battinf.tb_battinf.stationid  " +
@@ -120,7 +120,7 @@
 		String orderSql=" limit ? ,? ";
 		sql+=orderSql;
 		//System.out.println(sql);
-		List<Bts_station_state> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationId()+"%",binf.getNum(),(p.getPageCurr()-1)*p.getPageSize(),p.getPageSize()},new CallBack() {
+		List<Bts_station_state> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationName5()+"%","%"+binf.getStationId()+"%",binf.getNum(),(p.getPageCurr()-1)*p.getPageSize(),p.getPageSize()},new CallBack() {
 			
 			public List getResults(ResultSet rs) {
 				List list=new ArrayList();
@@ -157,6 +157,7 @@
 						b.setStationName1(rs.getString("stationName1"));
 						b.setStationName2(rs.getString("stationName2"));
 						b.setStationName3(rs.getString("stationName3"));
+						b.setStationName5(rs.getString("stationName5"));
 						Page page=new Page();
 						b.setPage(page);
 						list.add(b);
diff --git a/gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java b/gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java
index 4d36200..6539372 100644
--- a/gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java
+++ b/gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java
@@ -39,6 +39,7 @@
 	private String stationName1;
 	private String stationName2;
 	private String stationName3;
+	private String stationName5;
 	private Page page;
 	
 	
@@ -218,6 +219,12 @@
 	public void setStation_xuhang_tlong(int station_xuhang_tlong) {
 		this.station_xuhang_tlong = station_xuhang_tlong;
 	}
+	public String getStationName5() {
+		return stationName5;
+	}
+	public void setStationName5(String stationName5) {
+		this.stationName5 = stationName5;
+	}
 	@Override
 	public String toString() {
 		return "Bts_station_state [num=" + num + ", station_id=" + station_id
@@ -241,10 +248,12 @@
 				+ station_xuhang_tlong + ", note=" + note + ", stationName="
 				+ stationName + ", stationName1=" + stationName1
 				+ ", stationName2=" + stationName2 + ", stationName3="
-				+ stationName3 + ", page=" + page + "]";
+				+ stationName3 + ", stationName5=" + stationName5 + ", page="
+				+ page + "]";
 	}
 	
 	
 	
 	
+	
 }

--
Gitblit v1.9.1