From 48baf25f530fc9c51a194230959f674939fbf3b1 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.25>
Date: 星期二, 13 十一月 2018 13:18:17 +0800
Subject: [PATCH] 升级页面实时刷新

---
 gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
index 2439cb5..875d6d5 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
@@ -48,15 +48,22 @@
 		Connection conn=DBUtil.getConn();
 		String numberSql=" SELECT FOUND_ROWS() number";
 		String sql="select SQL_CALC_FOUND_ROWS distinct tb_batt_endurance.num,tb_batt_endurance.deviceid,tb_batt_endurance.stationid,real_cap,tb_batt_endurance.moncapstd,real_curr,endurance_theory_timelong,endurance_actual_timelong,is_out_stand " +
-				",db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.StationName1,db_battinf.tb_battinf.StationName2 " +
+				",db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.StationName1,db_battinf.tb_battinf.StationName2,db_battinf.tb_battinf.StationName5  " +
 				" from web_site.tb_batt_endurance,db_battinf.tb_battinf " +
-				" where tb_batt_endurance.stationid=db_battinf.tb_battinf.stationid " ;
+				" where tb_batt_endurance.stationid=db_battinf.tb_battinf.stationid "+
+				"  and tb_batt_endurance.stationid in (" +
+				"  select distinct db_battinf.tb_battinf.stationid  " +
+				"  from db_battinf.tb_battinf " +
+				"  left outer join db_user.tb_user_battgroup_baojigroup_battgroup on db_user.tb_user_battgroup_baojigroup_battgroup.stationid=db_battinf.tb_battinf.stationid " +
+				"  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=?  ) " ;
 		//鏈烘埧绛涢��
-		String stationSql=" and db_battinf.tb_battinf.StationName like ? and db_battinf.tb_battinf.StationName1 like ? and db_battinf.tb_battinf.StationName2 like ?";
+		String stationSql=" and db_battinf.tb_battinf.StationName like ? and db_battinf.tb_battinf.StationName1 like ? and db_battinf.tb_battinf.StationName2 like ? and db_battinf.tb_battinf.StationName5 like ?";
 		sql+=stationSql;
 		//瀹為檯缁埅鏃堕棿
 		String timelongSqlT=" and endurance_actual_timelong<=? ";//灏忎簬鏌愪竴鏃堕棿
-		String timelongSqlF=" and endurance_actual_timelong!=? ";//鍏ㄩ儴
+		String timelongSqlF=" and endurance_actual_timelong>-1? ";//鍏ㄩ儴
 		if(bendurance.getEndurance_actual_timelong()==0){
 			sql+=timelongSqlF;
 		}else{
@@ -71,7 +78,7 @@
 			sql+=is_out_standSqlF;
 		}
 		//鎺掑簭鏃堕棿
-		String orderSql=" order by endurance_actual_timelong asc ";
+		String orderSql=" order by endurance_actual_timelong,tb_batt_endurance.deviceid asc ";
 		sql+=orderSql;
 		//鍒嗛〉
 		String limitSql=" limit ?,? ";
@@ -79,7 +86,7 @@
 		
 		
 		//System.out.println(sql);
-		List<Batt_endurance> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+bendurance.getStationName()+"%","%"+bendurance.getStationName1()+"%","%"+bendurance.getStationName2()+"%",bendurance.getEndurance_actual_timelong(),bendurance.getIs_out_stand()
+		List<Batt_endurance> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{bendurance.getNum(),"%"+bendurance.getStationName()+"%","%"+bendurance.getStationName1()+"%","%"+bendurance.getStationName2()+"%","%"+bendurance.getStationName5()+"%",bendurance.getEndurance_actual_timelong(),bendurance.getIs_out_stand()
 			                            ,(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
 			
 			public List getResults(ResultSet rs) {
@@ -98,6 +105,7 @@
 						b.setStationName(rs.getString("stationname"));
 						b.setStationName1(rs.getString("stationname1"));
 						b.setStationName2(rs.getString("stationname2"));
+						b.setStationName5(rs.getString("stationname5"));
 						Page p=new Page();
 						b.setPage(p);
 						list.add(b);
@@ -125,6 +133,7 @@
 	public static void main(String[] args) {
 		Batt_enduranceImpl bimpl=new Batt_enduranceImpl();
 		Batt_endurance ben=new Batt_endurance();
+		ben.setNum(1002);
 		ben.setStationName("");
 		ben.setStationName1("");
 		ben.setStationName2("");

--
Gitblit v1.9.1