From aec9f0131a10fffa56c9c27b6d34cdd5ecb22b3c Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 01 十一月 2018 14:03:11 +0800
Subject: [PATCH] 实时告警区/县添加
---
gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 18e5c89..7b95a9c 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
@@ -306,7 +306,7 @@
String sql="";
String baseSql=" SELECT SQL_CALC_FOUND_ROWS distinct tb_devalarm_data.num,dev_id,dev_ip,alm_type,alm_level,alm_start_time,alm_end_time," +
" alm_is_confirmed,alm_confirmed_time,alm_cleared_type," +
- " db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.FbsDeviceName " +
+ " 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 " ;
@@ -336,6 +336,14 @@
baseSql+=stationSql2T;
}else{
baseSql+=stationSql2F;
+ }
+ //鐢ㄤ簬鍖哄幙
+ String stationSql5T=" and stationname5!=? ";//鍏ㄩ儴
+ String stationSql5F=" and stationname5=? ";
+ if(ddata.getStationName5().equals("")){
+ baseSql+=stationSql5T;
+ }else{
+ baseSql+=stationSql5F;
}
//鐢ㄤ簬鏁呴殰浜嬩欢
String almTypeT=" and alm_type!=? ";//鍏ㄩ儴
@@ -378,7 +386,7 @@
ddata.setDev_name(rs.getString("FbsDeviceName"));
ddata.setStationName(rs.getString("stationName"));
-
+ ddata.setStationName5(rs.getString("stationName5"));
list.add(ddata);
}
} catch (SQLException e) {
@@ -589,7 +597,7 @@
" from db_alarm.tb_devalarm_data,db_battinf.tb_battinf" +
" where alm_cleared_type=0 " +
" and db_alarm.tb_devalarm_data.dev_id=db_battinf.tb_battinf.fbsdeviceid " +
- " and (UNIX_TIMESTAMP(NOW())-UNIX_TIMESTAMP(alm_start_time))<30 " ;
+ " and (UNIX_TIMESTAMP(NOW())-UNIX_TIMESTAMP(alm_start_time))<"+AlarmDaoFactory.alarm_voice_timelong ;
//鐢ㄦ埛绠＄悊
String userSql=" and tb_battinf.StationId in(" +
" select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id and db_user.tb_user_battgroup_baojigroup_usr.uId=?" +
--
Gitblit v1.9.1