From bcb7a41f9f4114f0734bd1ef25b0a20eaeb211fe Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.14>
Date: 星期三, 28 十一月 2018 17:10:50 +0800
Subject: [PATCH] 111

---
 gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java |   61 ++++++++++++++++++++++--------
 1 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
index 6e02453..5fc087e 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
@@ -1261,7 +1261,7 @@
 		}
 		return list;
 	}
-	//0.5鏌ヨ瀹炴椂鍛婅鏁�
+	//0.5鏌ヨ瀹炴椂鍛婅鏁�(鐢垫睜鍛婅鐜�)
 	/*public List serchAlm(Object obj){
 		Batt_Maint_Dealarm bmd=(Batt_Maint_Dealarm) obj;
 		Battalarm_data adata=bmd.getAdata();
@@ -1296,25 +1296,21 @@
 		return list;	
 	}*/
 	public List serchAlm(Object obj){
-		Batt_Maint_Dealarm bmd=(Batt_Maint_Dealarm) obj;
-		Battalarm_data adata=bmd.getAdata();
-		BattInf binf=bmd.getBinf();
-		User_inf uinf=bmd.getUinf();
+		User_inf uinf=(User_inf) obj;
 		String sql="select count(num) as number,alm_id " +
 				"from db_alarm.tb_battalarm_data  " +
 				"where  " +
 				"alm_cleared_type=0  " ;
         //鏍规嵁鍩庡競閫夊彇
-		String citySql=" and tb_battalarm_data.BattGroupId in (select distinct db_battinf.tb_battinf.battgroupid " +
-				" from db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf   " +
-				" where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId   " +
-				" and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id  " +
-				" and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid  " +
-				" and db_user.tb_user_inf.uid=? and db_battinf.tb_battinf.stationname like ? and tb_battinf.station_install=1  )  " +
+		String citySql=" and tb_battalarm_data.BattGroupId in ( select distinct db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId " +
+				" 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=? )  " +
+				" and tb_battalarm_data.BattGroupId in (select distinct db_battinf.tb_battinf.BattGroupId  from db_battinf.tb_battinf where  station_install=1) " +
 				" GROUP BY(alm_id) ";
 		sql+=citySql;
 		//System.out.println(sql);
-		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId(),"%"+binf.getStationName()+"%"}, new CallBack() {
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
 			
 			public List getResults(ResultSet rs) {
 				List list=new ArrayList();
@@ -1368,8 +1364,8 @@
 		String sql="select count(num) as number " +
 				"from db_alarm.tb_battalarm_data  " +
 				"where  " +
-				"alm_cleared_type=0  " +
-				"and alm_id not in("+AlarmDaoFactory.Alarm_vol_Online+","+AlarmDaoFactory.Alarm_CapAlarm+","+AlarmDaoFactory.Alarm_CapChange+","+AlarmDaoFactory.Alarm_res_Conn+","+AlarmDaoFactory.ALM_TYPE_DisChargeMonVol_ID+")"+
+				"alm_cleared_type=0  " +//+AlarmDaoFactory.Alarm_vol_Online+","
+				"and alm_id not in("+AlarmDaoFactory.Alarm_CapAlarm+","+AlarmDaoFactory.Alarm_CapChange+","+AlarmDaoFactory.Alarm_res_Conn+","+AlarmDaoFactory.ALM_TYPE_DisChargeMonVol_ID+")"+
 				"and db_alarm.tb_battalarm_data.BattGroupId  in (select distinct db_battinf.tb_battinf.battgroupid " +
 				" from db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf   " +
 				" where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId   " +
@@ -1898,7 +1894,36 @@
 		return list;
 	}
 
-	
+	//鏌ヨ瀛樺湪鐢垫睜鍛婅鐨勬満鎴夸釜鏁�
+	public int  searchAlarmInStation(Object obj){
+		User_inf uinf=(User_inf) obj;
+		String sql=" select count(distinct db_battinf.tb_battinf.stationid) as nums from db_battinf.tb_battinf where  station_install=1 " +
+				" and db_battinf.tb_battinf.battgroupid in (select distinct db_alarm.tb_battalarm_data.battgroupid from db_alarm.tb_battalarm_data) " +
+				" and db_battinf.tb_battinf.stationid 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;
+	}
 	
 	public static void main(String[] args) throws ParseException {
 		Battalarm_dataDAOImpl bimp = new Battalarm_dataDAOImpl();
@@ -1970,7 +1995,9 @@
         for (int num : list) {
 			System.out.println(num);
 		}*/
-        List list=bimp.serchIn30(uinf);
-        System.out.println(list.size());
+        //List list=bimp.serchIn30(uinf);
+        //System.out.println(list.size());
+        int nums=bimp.searchAlarmInStation(uinf);
+        System.out.println(nums);
 	}
 }

--
Gitblit v1.9.1