From d3281891af5bf8e5069cb15b1f9c1d6a14c212c6 Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.25>
Date: 星期四, 27 九月 2018 17:30:00 +0800
Subject: [PATCH] 设备告警参数修改

---
 gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 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 146d94b..6fc39ff 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
@@ -41,12 +41,12 @@
     //缁埅鏃堕棿鐨勬煡璇�
 	public List serchByCondition(Object obj) {
 		Batt_endurance bendurance=(Batt_endurance) obj;
-		String sql="select distinct num,deviceid,tb_batt_endurance.stationid,endurance_state,real_cap,tb_batt_endurance.moncapstd,real_curr,endurance_timelong " +
+		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 " +
 				" from web_site.tb_batt_endurance,db_battinf.tb_battinf " +
 				" where tb_batt_endurance.stationid=db_battinf.tb_battinf.stationid " ;
 		//鏈烘埧绛涢��
-		String stationSql=" and tb_batt_endurance.stationid like ?";
+		String stationSql=" and db_battinf.tb_battinf.StationName like ?";
 		sql+=stationSql;
 		//缁埅鐘舵��
 		String enduranceSqlT=" and endurance_state=? ";
@@ -66,7 +66,8 @@
 		}
 		//鎺掑簭鏃堕棿
 		String orderSql=" order by endurance_timelong asc";
-		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+bendurance.getStationid()+"%",bendurance.getEndurance_state(),bendurance.getEndurance_timelong()}, new CallBack() {
+		//System.out.println(sql);
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+bendurance.getNote()+"%",bendurance.getEndurance_state(),bendurance.getEndurance_timelong()}, new CallBack() {
 			
 			public List getResults(ResultSet rs) {
 				List list=new ArrayList();
@@ -98,5 +99,14 @@
 		// TODO Auto-generated method stub
 		return null;
 	}
+	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);
+		List list=bimpl.serchByCondition(ben);
+		System.out.println(list.size());
+	}
 
 }

--
Gitblit v1.9.1