From 162b1ec7816f035de05ef93ba432e64b95c96b7b Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.23>
Date: 星期四, 01 十一月 2018 10:06:16 +0800
Subject: [PATCH] 设备实时告警和历史实时告警加区县
---
gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java
index 8808597..d132216 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java
@@ -69,8 +69,8 @@
String sql="";
String baseSql=" SELECT SQL_CALC_FOUND_ROWS tb_devalarm_data_history.num,record_id,dev_id,dev_ip,alm_type,alm_level,alm_start_time,alm_end_time," +
" alm_is_confirmed,alm_confirmed_time,alm_cleared_type, " +
- " DISTINCTbinf.stationName,DISTINCTbinf.FbsDeviceName " +
- " FROM db_alarm.tb_devalarm_data_history,(SELECT DISTINCT db_battinf.tb_battinf.FbsDeviceId,db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.FbsDeviceName from db_battinf.tb_battinf where db_battinf.tb_battinf.StationName LIKE ? AND db_battinf.tb_battinf.StationName1 LIKE ? AND db_battinf.tb_battinf.StationName2 LIKE ?) as DISTINCTbinf " +
+ " DISTINCTbinf.stationName,DISTINCTbinf.stationName5,DISTINCTbinf.FbsDeviceName " +
+ " FROM db_alarm.tb_devalarm_data_history,(SELECT DISTINCT db_battinf.tb_battinf.FbsDeviceId,db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.stationName5,db_battinf.tb_battinf.FbsDeviceName from db_battinf.tb_battinf where 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 ?) as DISTINCTbinf " +
" WHERE tb_devalarm_data_history.dev_id=DISTINCTbinf.FbsDeviceId " +
" AND alm_start_time>=? and alm_start_time<=? ";
@@ -93,7 +93,7 @@
sql=baseSql+endSql+limitSql;
- List<Batt_devalarm_data_history> list=DAOHelper.executeQueryLimit(sql, conn,new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%",binf.getBattProductDate(),binf.getBattProductDate1()
+ List<Batt_devalarm_data_history> list=DAOHelper.executeQueryLimit(sql, conn,new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%",binf.getBattProductDate(),binf.getBattProductDate1()
,uinf.getUId(),(page.getPageCurr() - 1)*page.getPageSize()
,page.getPageSize()}, new CallBack() {
@@ -115,8 +115,7 @@
ddata.setDev_name(rs.getString("FbsDeviceName"));
ddata.setStationName(rs.getString("stationName"));
-
-
+ ddata.setStationName5(rs.getString("stationName5"));
list.add(ddata);
}
} catch (SQLException e) {
--
Gitblit v1.9.1