From 98cd37e22ae11376692241a62a8b5d932cbcd24e Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 19 十月 2018 13:25:16 +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 | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 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 a689c13..cb3f729 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
@@ -73,7 +73,7 @@
//鎺掑簭
String orderSql=" order by station_id,record_datetime,station_event_type asc ";
sql+=orderSql;
- System.err.println(sql);
+ //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() {
public List getResults(ResultSet rs) {
@@ -294,9 +294,10 @@
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 " +
+ //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 dev_id=? " +
@@ -313,9 +314,11 @@
String orderSql=" order by station_id,station_event_type,record_datetime,station_event_trig asc " ;
sql+=orderSql;
//鍒嗛〉
- String limitSql=" limit ?,? ";
- sql+=limitSql;
- List<Bts_station_event> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{bevent.getDev_id(),bevent.getRecord_datetime(),bevent.getRecord_datetime_end(),bevent.getStation_event_type(),(p.getPageCurr()-1)*p.getPageSize(),p.getPageSize()}, new CallBack() {
+ //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.getDev_id(),bevent.getRecord_datetime(),bevent.getRecord_datetime_end(),bevent.getStation_event_type()}, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
@@ -339,12 +342,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 {
--
Gitblit v1.9.1