From eec8a33340e2f3ae8bc09362e3912c88a8d59b27 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 31 十月 2018 10:59:18 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/Bts_station_eventImpl.java | 71 +++++++++++++++++++++++++++++------
1 files changed, 58 insertions(+), 13 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 06eae27..288bc51 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
@@ -9,6 +9,8 @@
import java.util.Date;
import java.util.List;
+import sun.security.krb5.internal.PAEncTSEnc;
+
import com.fgkj.actions.ActionUtil;
import com.fgkj.dao.AlarmDaoFactory;
import com.fgkj.dao.BaseDAO;
@@ -55,6 +57,13 @@
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 " +
" 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 record_datetime>=? and record_datetime<=? " +
" and stationname1 like ? and stationname2 like ? and stationname3 like ? and stationid like ? " ;
/*//浜嬩欢绛涢��
@@ -71,8 +80,8 @@
//鎺掑簭
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.getBattInUseDate(),binf.getBattInUseDate1(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationId()+"%"}, new CallBack() {
+ //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() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
@@ -292,16 +301,38 @@
public List serchByInfo(Object obj) {
Bts_station_event bevent=(Bts_station_event) obj;
Page p=bevent.getPage();
- Connection conn=DBUtil.getConn();
- String numberSql=" SELECT FOUND_ROWS() number";
- String sql="select SQL_CALC_FOUND_ROWS distinct station_id,dev_id,station_event_type,record_datetime,station_event_trig ,tb_battinf.StationName,tb_battinf.StationName1,tb_battinf.StationName2,tb_battinf.StationName3 " +
- " from tb_bts_station_event,db_battinf.tb_battinf " +
+ //Connection conn=DBUtil.getConn();
+ //String numberSql=" SELECT FOUND_ROWS() number";
+ //SQL_CALC_FOUND_ROWS
+ String sql="select distinct station_id,dev_id,station_event_type,record_datetime,station_event_trig ,tb_battinf.StationName,tb_battinf.StationName1,tb_battinf.StationName2,tb_battinf.StationName3 " +
+ " 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 dev_id=? " +
- " and record_datetime>=? and record_datetime<=? " +
- " order by station_id,station_event_type,record_datetime,station_event_trig asc " +
- " limit ?,? ";
- List<Bts_station_event> list=DAOHelper.executeQuery(sql, conn, new Object[]{bevent.getDev_id(),bevent.getRecord_datetime(),bevent.getRecord_datetime_end(),(p.getPageCurr()-1)*p.getPageSize(),p.getPageSize()}, new CallBack() {
+ " and record_datetime>=? and record_datetime<=? ";
+ //鍩虹珯鐘舵��
+ String eventSqlT=" and station_event_type!=? ";
+ String eventSqlF=" and station_event_type=? ";
+ if(bevent.getStation_event_type()==0){
+ sql+=eventSqlT;
+ }else{
+ sql+=eventSqlF;
+ }
+ //鎺掑簭
+ String orderSql=" order by station_id,station_event_type,record_datetime,station_event_trig asc " ;
+ sql+=orderSql;
+ //鍒嗛〉
+ //String limitSql=" limit ?,? ";
+ //sql+=limitSql;
+ //,(p.getPageCurr()-1)*p.getPageSize(),p.getPageSize()
+ //executeQueryLimit
+ List<Bts_station_event> list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{bevent.getNum(),bevent.getDev_id(),bevent.getRecord_datetime(),bevent.getRecord_datetime_end(),bevent.getStation_event_type()}, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
@@ -314,6 +345,8 @@
b.setStation_event_type(rs.getInt("station_event_type"));
b.setStation_event_trig(rs.getInt("station_event_trig"));
b.setStationName(rs.getString("stationName"));
+ Page p=new Page();
+ b.setPage(p);
list.add(b);
}
} catch (SQLException e) {
@@ -323,12 +356,12 @@
return list;
}
});
- //鍘绘帀limit鏉′欢鍚庣殑鎬绘暟
+ /*//鍘绘帀limit鏉′欢鍚庣殑鎬绘暟
int number=LimitNumberFactory.GetLimtitNumber(conn, numberSql);
//System.out.println("number: "+number);
if(list!=null&&list.size()>0){
list.get(list.size()-1).getPage().setPageAll(number);
- }
+ }*/
return list;
}
public static void main(String[] args) throws ParseException {
@@ -352,7 +385,7 @@
BattInf binf = new BattInf();
- binf.setNum(0);
+ binf.setNum(1002);
binf.setStationName("");
binf.setStationName1("");
binf.setStationName2("");
@@ -373,6 +406,18 @@
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);
+ b.setRecord_datetime(ActionUtil.getSimpDate(date1));
+ b.setRecord_datetime_end(ActionUtil.getSimpDate(date2));
+ b.setStation_event_type(0);
+ Page page=new Page();
+ page.setPageCurr(1);
+ page.setPageSize(10);
+ b.setPage(page);
+ /*List list=bimpl.serchByInfo(b);
+ System.out.println(list.size());*/
}
}
--
Gitblit v1.9.1