From 0edab78d73d975663da8ce2596a0a00c1b6a6db1 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 12 十一月 2018 08:51:53 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java | 77 ++++++++++++++++++++++++++++++++------
1 files changed, 65 insertions(+), 12 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 49bc6fd..6e02453 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
@@ -443,14 +443,14 @@
String numberSql=" SELECT FOUND_ROWS() number";
Connection conn=DBUtil.getConn();
String baseSql = "select SQL_CALC_FOUND_ROWS distinct db_alarm.tb_battalarm_data.BattGroupId,db_alarm.tb_battalarm_data.num,alm_signal_id,db_alarm.tb_battalarm_data.monnum,alm_value,alm_level,alm_is_confirmed,alm_confirmed_time,alm_start_time,alm_end_time "
- + " ,stationname,battgroupname"
+ + " ,stationname,stationname5,battgroupname"
+ " from db_alarm.tb_battalarm_data,db_battinf.tb_battinf "
+ " where alm_id in(?,?,?,?,?,?,?,?,?,?) and alm_signal_id%2 in(?,?) " +
" 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.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{
@@ -492,6 +492,8 @@
"%"+binf.getStationName1()+"%",
"%"+binf.getStationName()+"%",
+ "%"+binf.getStationName2()+"%",
+ "%"+binf.getStationName5()+"%",
binf.getBattGroupId(),
uinf.getUId(),
@@ -520,6 +522,7 @@
BattInf binf=new BattInf();
binf.setBattGroupId(rs.getInt("battGroupId"));
binf.setStationName(rs.getString("stationName"));
+ binf.setStationName5(rs.getString("stationName5"));
binf.setBattGroupName(rs.getString("battGroupName"));
//battinf涓殑StationName8锛孲tationName9瀛樻斁鍛婅鍚嶇О鍜岀瓑绾�
name=AlarmDaoFactory.getAlarmName(adata.getAlm_signal_id());
@@ -759,7 +762,7 @@
" where alm_id in(?,?,?,?,?,?) and alm_signal_id%2 in(?,?) " +
" and alm_level in(?,?,?,?) " +
" and alm_start_time>=? and alm_start_time<=? " +
- " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? ";
+ " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ?";
//鐢ㄤ簬瀹炴椂鍛婅
String almSqlT="and alm_cleared_type=? ";
//鍘嗗彶鍛婅
@@ -817,6 +820,7 @@
adata.getAlm_start_time1(),
"%"+binf.getStationName1()+"%",
"%"+binf.getStationName()+"%",
+ "%"+binf.getStationName2()+"%",
adata.getAlm_cleared_type(),
@@ -1306,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);
@@ -1371,7 +1375,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_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() {
@@ -1522,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() {
@@ -1771,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 " +
@@ -1812,12 +1816,60 @@
});
return list;
}
+ //鍛婅鍙戝０(30绉掍箣鍐呯殑鍛婅)
+ public List serchIn30(Object obj){
+ User_inf uinf=(User_inf) obj;
+ 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 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;
+ //鐢ㄦ埛绠＄悊
+ String userSql=" and 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=?" +
+ " ) ";
+ sql+=userSql;
+ String orderSql=" order by alm_start_time desc ";
+ sql+=orderSql;
+ //System.out.println(sql);
+ 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()){
+ Battalarm_data adata=new Battalarm_data();
+ adata.setNum(0);//0琛ㄧず鐢垫睜鍛婅
+ adata.setBattGroupId(rs.getInt("battGroupId"));
+ adata.setStationid(rs.getString("stationid"));
+ adata.setStationname(rs.getString("stationname"));
+ adata.setMonNum(rs.getInt("monNum"));
+ adata.setAlm_id(rs.getInt("alm_id"));
+ adata.setAlm_signal_id(rs.getInt("alm_signal_id"));
+ adata.setAlm_start_time(rs.getTimestamp("alm_start_time"));
+ String adataStr=adata.getStationname()
+ +"鍦�"+ActionUtil.chageDateToString(adata.getAlm_start_time(), ActionUtil.time_yyyyMMddHHmmss)
+ +"鍑虹幇浜�"+AlarmDaoFactory.getAlarmName(adata.getAlm_signal_id())
+ +"鍛婅";
+ adata.setNote(adataStr);
+ list.add(adata);
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ return list;
+ }
//鐐瑰嚮椤圭洰涓嬫柟鐨勬粴鍔紝鏌ヨ璇ユ潯鍛婅鐨勫疄鏃朵俊鎭�
public List serchBatt_alarm(Object obj){
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() {
@@ -1914,10 +1966,11 @@
System.out.println(list.size());*/
// List list=bimp.serchRealTime(uinf);
// System.out.println(list);
- List<Integer> list = bimp.serchGood(uinf);
+ /*List<Integer> list = bimp.serchGood(uinf);
for (int num : list) {
System.out.println(num);
- }
+ }*/
+ List list=bimp.serchIn30(uinf);
System.out.println(list.size());
}
}
--
Gitblit v1.9.1