From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 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 3d4fce9..9c611d6 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
@@ -307,9 +307,12 @@
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.stationName5,db_battinf.tb_battinf.FbsDeviceName " +
- " FROM db_alarm.tb_devalarm_data,db_battinf.tb_battinf " +
+ " FROM db_alarm.tb_devalarm_data,db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf " +
" WHERE " +
- " tb_devalarm_data.dev_id=db_battinf.tb_battinf.FbsDeviceId and tb_battinf.station_install=1 " ;
+ " tb_devalarm_data.dev_id=db_battinf.tb_battinf.FbsDeviceId and tb_battinf.station_install=1 "
+ + "and db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId "
+ + "and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id "
+ + "and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid and db_user.tb_user_inf.uid=? " ;
//璁惧瀹炴椂鍛婅
String alarmTypeSql=" AND alm_cleared_type=0 ";
baseSql+=alarmTypeSql;
@@ -353,20 +356,21 @@
}else{
baseSql+=almTypeF;
}
- //鍒ゆ柇鏄惁涓虹鐞嗙殑鏈烘埧
+ /*//鍒ゆ柇鏄惁涓虹鐞嗙殑鏈烘埧
String stationSql=" and db_alarm.tb_devalarm_data.dev_id in(select distinct db_battinf.tb_battinf.FbsDeviceId " +
" from db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf " +
" where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId " +
" and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
" and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
" and db_user.tb_user_inf.uid=?) ";
- baseSql+=stationSql;
+ baseSql+=stationSql;*/
//鎺掑簭
String endSql=" ORDER BY alm_start_time DESC,db_alarm.tb_devalarm_data.dev_id asc ";
//鍒嗛〉
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.getStationName5(),ddata.getAlm_type(),uinf.getUId(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
+ //System.out.println(sql);
+ List<Batt_devalarm_data> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{uinf.getUId(),ddata.getStationName1(),ddata.getStationName(),ddata.getStationName2(),ddata.getStationName5(),ddata.getAlm_type(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
@@ -550,7 +554,7 @@
String sql="select distinct db_alarm.tb_devalarm_data.dev_id,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 db_alarm.tb_devalarm_data.dev_id=db_battinf.tb_battinf.fbsdeviceid and tb_battinf.station_install=1 " +
" and db_alarm.tb_devalarm_data.dev_id in (select distinct db_battinf.tb_battinf.FbsDeviceId " +
" from db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf " +
" where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId " +
@@ -596,7 +600,7 @@
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 db_alarm.tb_devalarm_data.dev_id=db_battinf.tb_battinf.fbsdeviceid and tb_battinf.station_install=1 " +
" and (UNIX_TIMESTAMP(NOW())-UNIX_TIMESTAMP(alm_start_time))<"+AlarmDaoFactory.alarm_voice_timelong ;
//鐢ㄦ埛绠＄悊
String userSql=" and tb_battinf.StationId in(" +
@@ -641,7 +645,7 @@
Batt_devalarm_data ddata=(Batt_devalarm_data) obj;
String sql="select distinct db_alarm.tb_devalarm_data.dev_id,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationid,db_battinf.tb_battinf.fbsdevicename,dev_ip,alm_type,alm_start_time,alm_cleared_type " +
" from db_alarm.tb_devalarm_data,db_battinf.tb_battinf " +
- " where db_alarm.tb_devalarm_data.dev_id=db_battinf.tb_battinf.fbsdeviceid" +
+ " where db_alarm.tb_devalarm_data.dev_id=db_battinf.tb_battinf.fbsdeviceid and tb_battinf.station_install=1 " +
" and db_alarm.tb_devalarm_data.dev_id=? and alm_type=? and alm_start_time=? ";
List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{ddata.getDev_id(),ddata.getAlm_type(),ddata.getAlm_start_time()}, new CallBack() {
@@ -702,14 +706,14 @@
bmd.setPage(page);
bmd.setUinf(uinf);
//List list=dimpl.serchIn30(uinf);
- /*List<Batt_devalarm_data> list=dimpl.serchByInfo(ddata);
+ 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());
- int nums=dimpl.searchNums(uinf);
- System.out.println(nums);
+ /*int nums=dimpl.searchNums(uinf);
+ System.out.println(nums);*/
}
--
Gitblit v1.9.1