From 0b2f4a97fab7d325fdf3e228bcab940f861954c7 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 01 十一月 2018 13:50:26 +0800
Subject: [PATCH] 机房状态统计查询区/县添加
---
gx_tieta/src/com/fgkj/dao/impl/Bts_station_eventImpl.java | 32 ++++++++++++--------------------
1 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Bts_station_eventImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Bts_station_eventImpl.java
index 288bc51..5fc9a3e 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Bts_station_eventImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Bts_station_eventImpl.java
@@ -54,18 +54,14 @@
//鏈烘埧浜嬩欢缁熻
public List serchByCondition(Object obj) {
final BattInf binf=(BattInf) obj;
- String sql="select station_id,dev_id,station_event_type,record_datetime,station_event_trig ,tb_battinf.StationName,tb_battinf.StationName1,tb_battinf.StationName2,tb_battinf.StationName3 " +
+ String sql="select station_id,dev_id,station_event_type,record_datetime,station_event_trig ,tb_battinf.StationName,tb_battinf.StationName1,tb_battinf.StationName2,tb_battinf.StationName3,tb_battinf.StationName5 " +
" from db_alarm.tb_bts_station_event,db_battinf.tb_battinf " +
" where tb_bts_station_event.dev_id=tb_battinf.FBSDeviceId " +
- " and tb_bts_station_event.station_id in (" +
- " select distinct db_battinf.tb_battinf.stationid " +
- " from db_battinf.tb_battinf " +
- " left outer join db_user.tb_user_battgroup_baojigroup_battgroup on db_user.tb_user_battgroup_baojigroup_battgroup.stationid=db_battinf.tb_battinf.stationid " +
- " left outer join db_user.tb_user_battgroup_baojigroup_usr on db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
- " left outer join db_user.tb_user_inf on tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
- " where db_user.tb_user_inf.uid=? ) " +
+ " and tb_bts_station_event.station_id 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=?" +
+ " ) " +
" and record_datetime>=? and record_datetime<=? " +
- " and stationname1 like ? and stationname2 like ? and stationname3 like ? and stationid like ? " ;
+ " and stationname1 like ? and stationname2 like ? and stationname3 like ? and stationname5 like ? and stationid like ? " ;
/*//浜嬩欢绛涢��
String eventSqlT=" and station_event_type!=? ";
String eventSqlF=" and station_event_type=? ";
@@ -81,7 +77,7 @@
String orderSql=" order by station_id,record_datetime,station_event_type asc ";
sql+=orderSql;
//System.err.println(sql);
- List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getNum(),binf.getBattInUseDate(),binf.getBattInUseDate1(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationId()+"%"}, new CallBack() {
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getNum(),binf.getBattInUseDate(),binf.getBattInUseDate1(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationName5()+"%","%"+binf.getStationId()+"%"}, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
@@ -308,12 +304,8 @@
" from db_alarm.tb_bts_station_event,db_battinf.tb_battinf " +
" where tb_bts_station_event.dev_id=tb_battinf.FBSDeviceId " +
" and tb_bts_station_event.station_id in (" +
- " select distinct db_battinf.tb_battinf.stationid " +
- " from db_battinf.tb_battinf " +
- " left outer join db_user.tb_user_battgroup_baojigroup_battgroup on db_user.tb_user_battgroup_baojigroup_battgroup.stationid=db_battinf.tb_battinf.stationid " +
- " left outer join db_user.tb_user_battgroup_baojigroup_usr on db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
- " left outer join db_user.tb_user_inf on tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
- " where db_user.tb_user_inf.uid=? ) " +
+ " 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=?" +
+ " ) " +
" and dev_id=? " +
" and record_datetime>=? and record_datetime<=? ";
//鍩虹珯鐘舵��
@@ -401,11 +393,11 @@
bmd.setPage(p);
bmd.setBinf(binf);
bmd.setUinf(uinf);
- List<Bts_station_event> list=bimpl.serchByCondition(binf);
+ /*List<Bts_station_event> list=bimpl.serchByCondition(binf);
System.out.println(list.size());
for (Bts_station_event b : list) {
System.out.println(b.getNote()+" "+b.getDev_id()+" "+b.getStation_event_type_poff()+" "+b.getStation_event_type_xuhang()+" "+b.getStation_event_type_fadian()+" "+b.getStation_event_type_diaozhan()+" "+b.getStation_event_type_dooropen()+" "+b.getStation_event_type_tempup()+" "+b.getStation_event_type_templow()+" "+b.getStation_event_type_dampup()+" "+b.getStation_event_type_damplow()+" "+b.getStationName());
- }
+ }*/
Bts_station_event b=new Bts_station_event();
b.setNum(1002);
b.setDev_id(910000001);
@@ -416,8 +408,8 @@
page.setPageCurr(1);
page.setPageSize(10);
b.setPage(page);
- /*List list=bimpl.serchByInfo(b);
- System.out.println(list.size());*/
+ List list=bimpl.serchByInfo(b);
+ System.out.println(list.size());
}
}
--
Gitblit v1.9.1