From c4dba5d08a114cad2d98222a26c796582973d8e1 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.16>
Date: 星期三, 12 十二月 2018 17:12:45 +0800
Subject: [PATCH] 电池实时状态查询添加已安装
---
gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
index dff7238..bf9c9c2 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
@@ -56,7 +56,7 @@
" from db_ram_db.tb_bts_station_state,db_battinf.tb_battinf " +
" where tb_bts_station_state.dev_id=db_battinf.tb_battinf.FBSDeviceId " +
" and tb_battinf.stationname1 like ? and tb_battinf.stationname2 like ? and tb_battinf.stationname3 like ? and tb_battinf.stationname5 like ? " +
- " and stationid like ? " ;
+ " and stationid like ? and Station_install=1 " ;
/*" and tb_bts_station_state.station_id in (" +
" select distinct db_battinf.tb_battinf.stationid " +
" from db_battinf.tb_battinf " +
@@ -184,8 +184,12 @@
User_inf uinf=(User_inf) obj;
String sql=" select count(*) as nums from db_ram_db.tb_bts_station_state where station_stat&2>1 " +
" and tb_bts_station_state.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=?" +
- " ) ";
+ " 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 Station_install=1 ) ";
List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
public List getResults(ResultSet rs) {
@@ -212,8 +216,12 @@
User_inf uinf=(User_inf) obj;
String sql=" select count(*) as nums from db_ram_db.tb_bts_station_state where station_stat&32>1 " +
" and tb_bts_station_state.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=?" +
- " ) ";
+ " 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 Station_install=1 ) ";
List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
public List getResults(ResultSet rs) {
@@ -313,22 +321,22 @@
p.setPageCurr(1);
p.setPageSize(10);
binf.setPage(p);
- List<Bts_station_state> list=bimpl.serchByCondition(binf);
+ /*List<Bts_station_state> list=bimpl.serchByCondition(binf);
for (Bts_station_state bs : list) {
//System.out.println(bs.getStation_stat_diaozhan()+" "+bs.getStation_stat_dooropen()+" "+bs.getStation_stat_fadian()+" "+bs.getStation_stat_xuhang()+" "+bs.getStation_stat_poff());
System.out.println(bs);
- }
+ }*/
//System.out.println(list.size());
//int nums=bimpl.serchByState(uinf);
/*BattMap_information bm=new BattMap_information();
bm.setStationId("42000570");
int nums=bimpl.serchByStationId(bm);*/
- //int nums=bimpl.serchByState_diaozhan(uinf);
+ int nums=bimpl.serchByState_diaozhan(uinf);
/*BattMap_information bm=new BattMap_information();
bm.setStationId("42000366");
- int nums=bimpl.serchByStationId_diaozhan(bm);
+ int nums=bimpl.serchByStationId_diaozhan(bm);*/
- System.out.println(nums);*/
+ System.out.println(nums);
}
--
Gitblit v1.9.1