From a6b4c1e19b3b3fdcf80d7f69f20fe406205fcf8f Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.20>
Date: 星期一, 26 十一月 2018 11:54:39 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java |   47 ++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 36 insertions(+), 11 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 d4b99ab..e8d8225 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
@@ -182,13 +182,9 @@
 	public int serchByState(Object obj) {
 		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_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_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=?" +
+				" ) ";
 		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
 			
 			public List getResults(ResultSet rs) {
@@ -210,7 +206,35 @@
 		}
 		return nums;
 	}
-	//鏌ヨ褰撳墠鏈烘埧鍋滅數鏁�(鏍规嵁station_id )
+	//鏌ヨ褰撳墠鏈烘埧鎺夋垬鏁�
+	public int serchByState_diaozhan(Object obj) {
+		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=?" +
+				" ) ";
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
+			
+			public List getResults(ResultSet rs) {
+				List list=new ArrayList();
+				try {
+					while(rs.next()){
+						list.add(rs.getInt("nums"));
+					}
+				} catch (SQLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				return list;
+			}
+		});
+		int nums=0;//鎬绘暟
+		if(list!=null&&list.size()>0){
+			nums=(Integer) list.get(list.size()-1);
+		}
+		return nums;
+	}
+	//鏌ヨ鍏蜂綋鏌愭満鎴垮仠鐢垫暟(鏍规嵁station_id )
 	public int serchByStationId(Object obj) {
 		BattMap_information binformation=(BattMap_information) obj;
 		String sql="select count(num) as nums  from db_ram_db.tb_bts_station_state " +
@@ -263,10 +287,11 @@
 			//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);
 		}
-		/*int nums=bimpl.serchByState(uinf);*/
-		BattMap_information bm=new BattMap_information();
+		int nums=bimpl.serchByState(uinf);
+		/*BattMap_information bm=new BattMap_information();
 		bm.setStationId("42000570");
-		int nums=bimpl.serchByStationId(bm);
+		int nums=bimpl.serchByStationId(bm);*/
+		//int nums=bimpl.serchByState_diaozhan(uinf);
 		System.out.println(nums);
 	}
 

--
Gitblit v1.9.1