From 41119c1848a2c02111400b2bc3bb68855e7f6d8c Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 01 十一月 2018 14:31:54 +0800
Subject: [PATCH] 设备实时告警修改后台添加stationname5
---
gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java | 65 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 5 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 5d5a60a..852aec8 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 " ;
@@ -337,6 +337,14 @@
}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!=? ";//鍏ㄩ儴
String almTypeF=" and alm_type=? ";
@@ -358,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();
@@ -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) {
@@ -582,6 +590,52 @@
});
return list;
}
+ //鍛婅鍙戝０(30绉掍箣鍐呯殑鍛婅)
+ public List serchIn30(Object obj){
+ User_inf uinf=(User_inf) obj;
+ String sql="select distinct db_alarm.tb_devalarm_data.dev_id,db_battinf.tb_battinf.stationid,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationid,db_battinf.tb_battinf.fbsdevicename,dev_ip,alm_type,alm_start_time " +
+ " 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))<"+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=?" +
+ " ) ";
+ sql+=userSql;
+ String orderSql=" order by alm_start_time desc ";
+ sql+=orderSql;
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
+
+ public List getResults(ResultSet rs) {
+ List list=new ArrayList();
+ try {
+ while(rs.next()){
+ Batt_devalarm_data ddata=new Batt_devalarm_data();
+ ddata.setNum(1);//1琛ㄧず璁惧鍛婅
+ ddata.setDev_id(rs.getInt("dev_id"));
+ ddata.setDev_ip(rs.getString("dev_ip"));
+ ddata.setDev_name(rs.getString("fbsdevicename"));
+ ddata.setStationName(rs.getString("stationName"));
+ ddata.setStationId(rs.getString("stationId"));
+ ddata.setAlm_type(rs.getInt("alm_type"));
+ ddata.setAlm_start_time(rs.getTimestamp("alm_start_time"));
+ String ddataStr=""+ddata.getStationName() // 鏈烘埧鍚嶇О
+ +"鍦�"+ActionUtil.chageDateToString(ddata.getAlm_start_time(), ActionUtil.time_yyyyMMddHHmmss) // 鍛婅寮�濮嬫椂闂�
+ +"鍑虹幇浜�"+AlarmDaoFactory.getdevName(ddata.getAlm_type()) // 鍛婅绫诲瀷鍚嶇О
+ +"鍛婅!";
+ ddata.setNote(ddataStr);
+ list.add(ddata);
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ return list;
+ }
//椤圭洰涓嬫柟鐨勬粴鍔紝鏌ヨ璇ヨ澶囧憡璀︾殑瀹炴椂淇℃伅
public List serchDev_alarm(Object obj){
Batt_devalarm_data ddata=(Batt_devalarm_data) obj;
@@ -643,10 +697,11 @@
bmd.setBinf(binf);
bmd.setPage(page);
bmd.setUinf(uinf);
- List<Batt_devalarm_data> list=dimpl.serchByInfo(ddata);
+ List list=dimpl.serchIn30(uinf);
+ /*List<Batt_devalarm_data> list=dimpl.serchByInfo(ddata);
for (Batt_devalarm_data b : list) {
System.out.println(b);
- }
+ }*/
//List<Batt_devalarm_data> list = dimpl.serchByCondition(bmd);
System.out.println(list.size());
}
--
Gitblit v1.9.1