From 05cf9f772d0fbbd761a462d70fbeeaed054eba0b Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.23>
Date: 星期四, 01 十一月 2018 14:43:40 +0800
Subject: [PATCH] 设备实时告警筛选出已安装的设备
---
gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java
index 7b95a9c..50a69c8 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java
@@ -309,7 +309,7 @@
" db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.stationName5,db_battinf.tb_battinf.FbsDeviceName " +
" FROM db_alarm.tb_devalarm_data,db_battinf.tb_battinf " +
" WHERE " +
- " tb_devalarm_data.dev_id=db_battinf.tb_battinf.FbsDeviceId " ;
+ " tb_devalarm_data.dev_id=db_battinf.tb_battinf.FbsDeviceId and tb_battinf.station_intall=1 " ;
//璁惧瀹炴椂鍛婅
String alarmTypeSql=" AND alm_cleared_type=0 ";
baseSql+=alarmTypeSql;
@@ -366,7 +366,7 @@
//鍒嗛〉
String limitSql=" LIMIT ?,? ";
sql=baseSql+endSql+limitSql;
- List<Batt_devalarm_data> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{ddata.getStationName1(),ddata.getStationName(),ddata.getStationName2(),ddata.getAlm_type(),uinf.getUId(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
+ List<Batt_devalarm_data> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{ddata.getStationName1(),ddata.getStationName(),ddata.getStationName2(),ddata.getStationName5(),ddata.getAlm_type(),uinf.getUId(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
--
Gitblit v1.9.1