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/App_bts_comm_taskImpl.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/App_bts_comm_taskImpl.java b/gx_tieta/src/com/fgkj/dao/impl/App_bts_comm_taskImpl.java
index 97b3cd1..e9daa0e 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/App_bts_comm_taskImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/App_bts_comm_taskImpl.java
@@ -43,17 +43,18 @@
// TODO Auto-generated method stub
return null;
}
- //鏍规嵁鐪佸競鍖烘満鎴垮悕绉版煡璇�(uid鏀惧湪num涓�)
+ //鏍规嵁璁惧id鏌ヨ(uid鏀惧湪num涓�)
public List serchByCondition(Object obj) {
- //BattInf binf=(BattInf) obj;
- Page page=(Page) obj;
+ BattInf binf=(BattInf) obj;
+ Page page=binf.getPage();
Connection conn=DBUtil.getConn();
String numberSql=" SELECT FOUND_ROWS() number";
- String sql=" select SQL_CALC_FOUND_ROWS distinct dev_id,thread_id,battgroup_cnt,battgroup_id1,battgroup_index1,battgroup_id2,battgroup_index2,battgroup_id3,battgroup_index3,battgroup_id4,battgroup_index4,connet_time,dev_comm_runtime,break_type " +
+ String sql=" select SQL_CALC_FOUND_ROWS distinct dev_id,thread_id,dev_mcu_uid,battgroup_cnt,battgroup_id1,battgroup_index1,battgroup_id2,battgroup_index2,battgroup_id3,battgroup_index3,battgroup_id4,battgroup_index4,connet_time,dev_comm_runtime,break_type " +
" ,stationName,stationName1,stationName2,stationName3,stationName5,StationId " +
" from db_app_sys.tb_app_bts_comm_task " +
" left outer join db_battinf.tb_battinf on db_app_sys.tb_app_bts_comm_task.dev_id=db_battinf.tb_battinf.fBSDeviceId " +
- //" where stationName1 like ? and stationName2 like ? and stationId like ? and stationName5 like ? " +
+ " where ";
+ //stationName1 like ? and stationName2 like ? and stationId like ? and stationName5 like ? " +
/*" and db_app_sys.tb_app_bts_comm_task.dev_id in (" +
" select distinct db_battinf.tb_battinf.fBSDeviceId " +
" from db_battinf.tb_battinf " +
@@ -61,9 +62,18 @@
" 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 db_battinf.tb_battinf.station_install=1 ) "+*/
- " order by dev_id limit ?,? ";
+ //FBSDeviceId绛涢��
+ String dev_idT=" db_app_sys.tb_app_bts_comm_task.dev_id=? ";
+ String dev_idF=" db_app_sys.tb_app_bts_comm_task.dev_id!=? ";
+ if(binf.getFBSDeviceId()==0){
+ sql+=dev_idF;
+ }else{
+ sql+=dev_idT;
+ }
+ String orderSql=" order by dev_id limit ?,? ";
+ sql+=orderSql;
//System.out.println(sql); //"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationId()+"%","%"+binf.getStationName5()+"%",binf.getNum()
- List<App_bts_comm_task> list=DAOHelper.executeQueryLimit(sql, conn,new Object[]{(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
+ List<App_bts_comm_task> list=DAOHelper.executeQueryLimit(sql, conn,new Object[]{binf.getFBSDeviceId(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
@@ -73,6 +83,7 @@
atask.setDev_id(rs.getInt("dev_id"));
atask.setThread_id(rs.getInt("thread_id"));
atask.setBattgroup_cnt(rs.getInt("battgroup_cnt"));
+ atask.setDev_mcu_uid(rs.getString("dev_mcu_uid"));
atask.setBattgroup_id1(rs.getInt("battgroup_id1"));
atask.setBattgroup_index1(rs.getInt("battgroup_index1"));
atask.setBattgroup_id2(rs.getInt("battgroup_id2"));
@@ -118,6 +129,7 @@
binf.setStationName5("");
binf.setStationId("");
binf.setBattGroupNum(62);
+ binf.setFBSDeviceId(0);
Page p=new Page();
p.setPageCurr(1);
p.setPageSize(100);
--
Gitblit v1.9.1