From 880eaffb3557deb7da44b32a637b61125655115c Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.24>
Date: 星期五, 28 九月 2018 14:33:45 +0800
Subject: [PATCH] 电池续航时间查询后台修改

---
 gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java |   51 ++++++++++++++++++++++++++++-----------------------
 1 files changed, 28 insertions(+), 23 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 6fc39ff..0f02da4 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
@@ -41,33 +41,34 @@
     //缁埅鏃堕棿鐨勬煡璇�
 	public List serchByCondition(Object obj) {
 		Batt_endurance bendurance=(Batt_endurance) obj;
-		String sql="select distinct tb_batt_endurance.num,tb_batt_endurance.deviceid,tb_batt_endurance.stationid,endurance_state,real_cap,tb_batt_endurance.moncapstd,real_curr,endurance_timelong " +
-				",db_battinf.tb_battinf.StationName " +
+		String sql="select 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 " +
 				" from web_site.tb_batt_endurance,db_battinf.tb_battinf " +
 				" where tb_batt_endurance.stationid=db_battinf.tb_battinf.stationid " ;
 		//鏈烘埧绛涢��
-		String stationSql=" and db_battinf.tb_battinf.StationName like ?";
+		String stationSql=" and db_battinf.tb_battinf.StationName like ? and db_battinf.tb_battinf.StationName1 like ? and db_battinf.tb_battinf.StationName2 like ?";
 		sql+=stationSql;
-		//缁埅鐘舵��
-		String enduranceSqlT=" and endurance_state=? ";
-		String enduranceSqlF=" and endurance_state!=? ";//鍏ㄩ儴
-		if(bendurance.getEndurance_state()==0){
-			sql+=enduranceSqlF;
-		}else{
-			sql+=enduranceSqlT;
-		}
-		//缁埅鏃堕棿
-		String timelongSqlT=" and endurance_timelong<=? ";//灏忎簬鏌愪竴鏃堕棿
-		String timelongSqlF=" and endurance_timelong!=?";//鍏ㄩ儴
-		if(bendurance.getEndurance_timelong()==0){
+		//瀹為檯缁埅鏃堕棿
+		String timelongSqlT=" and endurance_actual_timelong<=? ";//灏忎簬鏌愪竴鏃堕棿
+		String timelongSqlF=" and endurance_actual_timelong!=? ";//鍏ㄩ儴
+		if(bendurance.getEndurance_actual_timelong()==0){
 			sql+=timelongSqlF;
 		}else{
 			sql+=timelongSqlT;
 		}
+		//鏄惁鎺夌珯
+		String is_out_standSqlT=" and is_out_stand!=? ";//鍏ㄩ儴
+		String is_out_standSqlF=" and is_out_stand=? ";
+		if(bendurance.getIs_out_stand()==100){
+			sql+=is_out_standSqlT;
+		}else{
+			sql+=is_out_standSqlF;
+		}
 		//鎺掑簭鏃堕棿
-		String orderSql=" order by endurance_timelong asc";
+		String orderSql=" order by endurance_actual_timelong asc ";
+		sql+=orderSql;
 		//System.out.println(sql);
-		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+bendurance.getNote()+"%",bendurance.getEndurance_state(),bendurance.getEndurance_timelong()}, new CallBack() {
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+bendurance.getStationName()+"%","%"+bendurance.getStationName1()+"%","%"+bendurance.getStationName2()+"%",bendurance.getEndurance_actual_timelong(),bendurance.getIs_out_stand()}, new CallBack() {
 			
 			public List getResults(ResultSet rs) {
 				List list=new ArrayList();
@@ -77,12 +78,14 @@
 						b.setNum(rs.getInt("num"));
 						b.setDeviceId(rs.getInt("deviceId"));
 						b.setStationid(rs.getString("stationid"));
-						b.setEndurance_state(rs.getInt("endurance_state"));
 						b.setReal_cap(rs.getFloat("real_cap"));
 						b.setMoncapstd(rs.getFloat("moncapstd"));
 						b.setReal_curr(rs.getFloat("real_curr"));
-						b.setEndurance_timelong(rs.getInt("endurance_timelong"));
-						b.setNote(rs.getString("stationname"));
+						b.setEndurance_theory_timelong(rs.getInt("endurance_theory_timelong"));
+						b.setEndurance_actual_timelong(rs.getInt("endurance_actual_timelong"));
+						b.setStationName(rs.getString("stationname"));
+						b.setStationName1(rs.getString("stationname1"));
+						b.setStationName2(rs.getString("stationname2"));
 						list.add(b);
 					}
 				} catch (SQLException e) {
@@ -102,9 +105,11 @@
 	public static void main(String[] args) {
 		Batt_enduranceImpl bimpl=new Batt_enduranceImpl();
 		Batt_endurance ben=new Batt_endurance();
-		ben.setNote("");
-		ben.setEndurance_state(0);
-		ben.setEndurance_timelong(0);
+		ben.setStationName("");
+		ben.setStationName1("");
+		ben.setStationName2("");
+		ben.setEndurance_actual_timelong(120);
+		ben.setIs_out_stand(100);
 		List list=bimpl.serchByCondition(ben);
 		System.out.println(list.size());
 	}

--
Gitblit v1.9.1