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/Battalarm_dataDAOImpl.java | 59 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 14 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 dfd27f6..e6ffb26 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
@@ -449,8 +449,8 @@
" and alm_level in(?,?,?,?) and alm_cleared_type=0 " +
" and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ? and db_battinf.tb_battinf.stationname5 like ? ";
//鐢ㄤ簬鐢垫睜缁勬潯浠�
- String idSqlT=" and db_battinf.tb_battinf.battgroupid!=? and db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid ";//鍏ㄩ儴
- String idSqlF=" and db_battinf.tb_battinf.battgroupid=? and db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid ";
+ String idSqlT=" and db_battinf.tb_battinf.battgroupid!=? and db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid and tb_battinf.station_install=1";//鍏ㄩ儴
+ String idSqlF=" and db_battinf.tb_battinf.battgroupid=? and db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid and tb_battinf.station_install=1 ";
if(binf.getBattGroupId()==0){
baseSql+=idSqlT;
}else{
@@ -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();
@@ -1310,7 +1310,7 @@
" 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 db_user.tb_user_inf.uid=? and db_battinf.tb_battinf.stationname like ? and tb_battinf.station_install=1 ) " +
" GROUP BY(alm_id) ";
sql+=citySql;
//System.out.println(sql);
@@ -1368,14 +1368,14 @@
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 " +
" 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_user.tb_user_inf.uid=? and tb_battinf.station_install=1 )";
//System.out.println(sql);
List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
@@ -1526,7 +1526,7 @@
BattMap_information binformation=(BattMap_information) obj;
String sql="select count(num) as nums from db_alarm.tb_battalarm_data " +
"where " +
- "battgroupid in (select distinct battgroupid from db_battinf.tb_battinf where stationid=? ) " +
+ "battgroupid in (select distinct battgroupid from db_battinf.tb_battinf where stationid=? and tb_battinf.station_install=1) " +
"and alm_cleared_type=0 and alm_id not in("+AlarmDaoFactory.Alarm_CapAlarm+","+AlarmDaoFactory.Alarm_CapChange+") limit 1 ";
//System.out.println(sql);
List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binformation.getStationId()}, new CallBack() {
@@ -1775,7 +1775,7 @@
String sql="select distinct db_alarm.tb_battalarm_data.battgroupid,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationid,db_alarm.tb_battalarm_data.monnum,alm_id,alm_start_time,alm_signal_id " +
" from db_alarm.tb_battalarm_data,db_battinf.tb_battinf " +
" where alm_cleared_type=0 " +
- " and db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid " +
+ " and db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid and tb_battinf.station_install=1" +
" 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 " +
@@ -1822,7 +1822,7 @@
String sql="select distinct db_alarm.tb_battalarm_data.battgroupid,db_battinf.tb_battinf.stationId,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationid,db_alarm.tb_battalarm_data.monnum,alm_id,alm_start_time,alm_signal_id " +
" from db_alarm.tb_battalarm_data,db_battinf.tb_battinf " +
" where alm_cleared_type=0 " +
- " and db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid " +
+ " and db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid and tb_battinf.station_install=1 " +
" and alm_id not in("+AlarmDaoFactory.Alarm_vol_Online+","+AlarmDaoFactory.Alarm_CapAlarm+","+AlarmDaoFactory.Alarm_CapChange+","+AlarmDaoFactory.Alarm_res_Conn+","+AlarmDaoFactory.ALM_TYPE_DisChargeMonVol_ID+") " +
" and (UNIX_TIMESTAMP(NOW())-UNIX_TIMESTAMP(alm_start_time))<"+AlarmDaoFactory.alarm_voice_timelong;
//鐢ㄦ埛绠＄悊
@@ -1869,7 +1869,7 @@
Battalarm_data adata=(Battalarm_data) obj;
String sql="select distinct db_alarm.tb_battalarm_data.battgroupid,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationid,db_alarm.tb_battalarm_data.monnum,alm_id,alm_start_time,alm_signal_id,alm_cleared_type " +
" from db_alarm.tb_battalarm_data,db_battinf.tb_battinf " +
- " where db_battinf.tb_battinf.battgroupid=db_alarm.tb_battalarm_data.battgroupid " +
+ " where db_battinf.tb_battinf.battgroupid=db_alarm.tb_battalarm_data.battgroupid and tb_battinf.station_install=1 " +
" and db_alarm.tb_battalarm_data.battgroupid=? and db_alarm.tb_battalarm_data.monnum=? and alm_id=? and alm_start_time=? ";
List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{adata.getBattGroupId(),adata.getMonNum(),adata.getAlm_id(),adata.getAlm_start_time()}, new CallBack() {
@@ -1898,7 +1898,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 +1999,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