From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java | 97 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 85 insertions(+), 12 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java
index 60276ab..9c611d6 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java
@@ -306,10 +306,13 @@
String sql="";
String baseSql=" SELECT SQL_CALC_FOUND_ROWS distinct tb_devalarm_data.num,dev_id,dev_ip,alm_type,alm_level,alm_start_time,alm_end_time," +
" alm_is_confirmed,alm_confirmed_time,alm_cleared_type," +
- " db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.FbsDeviceName " +
- " FROM db_alarm.tb_devalarm_data,db_battinf.tb_battinf " +
+ " db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.stationName5,db_battinf.tb_battinf.FbsDeviceName " +
+ " FROM db_alarm.tb_devalarm_data,db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf " +
" WHERE " +
- " tb_devalarm_data.dev_id=db_battinf.tb_battinf.FbsDeviceId " ;
+ " tb_devalarm_data.dev_id=db_battinf.tb_battinf.FbsDeviceId and tb_battinf.station_install=1 "
+ + "and 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=? " ;
//璁惧瀹炴椂鍛婅
String alarmTypeSql=" AND alm_cleared_type=0 ";
baseSql+=alarmTypeSql;
@@ -329,6 +332,22 @@
}else{
baseSql+=stationSqlF;
}
+ //鐢ㄤ簬鏈烘埧绔欑偣
+ String stationSql2T=" and stationname2!=? ";//鍏ㄩ儴
+ String stationSql2F=" and stationname2=? ";
+ if(ddata.getStationName2().equals("")){
+ baseSql+=stationSql2T;
+ }else{
+ baseSql+=stationSql2F;
+ }
+ //鐢ㄤ簬鍖哄幙
+ String stationSql5T=" and stationname5!=? ";//鍏ㄩ儴
+ String stationSql5F=" and stationname5=? ";
+ if(ddata.getStationName5().equals("")){
+ baseSql+=stationSql5T;
+ }else{
+ baseSql+=stationSql5F;
+ }
//鐢ㄤ簬鏁呴殰浜嬩欢
String almTypeT=" and alm_type!=? ";//鍏ㄩ儴
String almTypeF=" and alm_type=? ";
@@ -337,20 +356,21 @@
}else{
baseSql+=almTypeF;
}
- //鍒ゆ柇鏄惁涓虹鐞嗙殑鏈烘埧
+ /*//鍒ゆ柇鏄惁涓虹鐞嗙殑鏈烘埧
String stationSql=" and db_alarm.tb_devalarm_data.dev_id in(select distinct db_battinf.tb_battinf.FbsDeviceId " +
" 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=?) ";
- baseSql+=stationSql;
+ baseSql+=stationSql;*/
//鎺掑簭
- String endSql=" ORDER BY alm_start_time DESC ";
+ String endSql=" ORDER BY alm_start_time DESC,db_alarm.tb_devalarm_data.dev_id asc ";
//鍒嗛〉
String limitSql=" LIMIT ?,? ";
sql=baseSql+endSql+limitSql;
- List<Batt_devalarm_data> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{ddata.getStationName1(),ddata.getStationName(),ddata.getAlm_type(),uinf.getUId(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
+ //System.out.println(sql);
+ List<Batt_devalarm_data> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{uinf.getUId(),ddata.getStationName1(),ddata.getStationName(),ddata.getStationName2(),ddata.getStationName5(),ddata.getAlm_type(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
@@ -370,7 +390,7 @@
ddata.setDev_name(rs.getString("FbsDeviceName"));
ddata.setStationName(rs.getString("stationName"));
-
+ ddata.setStationName5(rs.getString("stationName5"));
list.add(ddata);
}
} catch (SQLException e) {
@@ -428,7 +448,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() {
@@ -534,7 +554,7 @@
String sql="select distinct db_alarm.tb_devalarm_data.dev_id,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationid,db_battinf.tb_battinf.fbsdevicename,dev_ip,alm_type,alm_start_time " +
" from db_alarm.tb_devalarm_data,db_battinf.tb_battinf" +
" where alm_cleared_type=0 " +
- " and db_alarm.tb_devalarm_data.dev_id=db_battinf.tb_battinf.fbsdeviceid " +
+ " and db_alarm.tb_devalarm_data.dev_id=db_battinf.tb_battinf.fbsdeviceid and tb_battinf.station_install=1 " +
" and db_alarm.tb_devalarm_data.dev_id in (select distinct db_battinf.tb_battinf.FbsDeviceId " +
" 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 " +
@@ -574,12 +594,58 @@
});
return list;
}
+ //鍛婅鍙戝０(30绉掍箣鍐呯殑鍛婅)
+ public List serchIn30(Object obj){
+ User_inf uinf=(User_inf) obj;
+ String sql="select distinct db_alarm.tb_devalarm_data.dev_id,db_battinf.tb_battinf.stationid,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationid,db_battinf.tb_battinf.fbsdevicename,dev_ip,alm_type,alm_start_time " +
+ " from db_alarm.tb_devalarm_data,db_battinf.tb_battinf" +
+ " where alm_cleared_type=0 " +
+ " and db_alarm.tb_devalarm_data.dev_id=db_battinf.tb_battinf.fbsdeviceid and tb_battinf.station_install=1 " +
+ " 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;
+ 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()){
+ Batt_devalarm_data ddata=new Batt_devalarm_data();
+ ddata.setNum(1);//1琛ㄧず璁惧鍛婅
+ ddata.setDev_id(rs.getInt("dev_id"));
+ ddata.setDev_ip(rs.getString("dev_ip"));
+ ddata.setDev_name(rs.getString("fbsdevicename"));
+ ddata.setStationName(rs.getString("stationName"));
+ ddata.setStationId(rs.getString("stationId"));
+ ddata.setAlm_type(rs.getInt("alm_type"));
+ ddata.setAlm_start_time(rs.getTimestamp("alm_start_time"));
+ String ddataStr=""+ddata.getStationName() // 鏈烘埧鍚嶇О
+ +"鍦�"+ActionUtil.chageDateToString(ddata.getAlm_start_time(), ActionUtil.time_yyyyMMddHHmmss) // 鍛婅寮�濮嬫椂闂�
+ +"鍑虹幇浜�"+AlarmDaoFactory.getdevName(ddata.getAlm_type()) // 鍛婅绫诲瀷鍚嶇О
+ +"鍛婅!";
+ ddata.setNote(ddataStr);
+ list.add(ddata);
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ return list;
+ }
//椤圭洰涓嬫柟鐨勬粴鍔紝鏌ヨ璇ヨ澶囧憡璀︾殑瀹炴椂淇℃伅
public List serchDev_alarm(Object obj){
Batt_devalarm_data ddata=(Batt_devalarm_data) obj;
String sql="select distinct db_alarm.tb_devalarm_data.dev_id,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationid,db_battinf.tb_battinf.fbsdevicename,dev_ip,alm_type,alm_start_time,alm_cleared_type " +
" from db_alarm.tb_devalarm_data,db_battinf.tb_battinf " +
- " where db_alarm.tb_devalarm_data.dev_id=db_battinf.tb_battinf.fbsdeviceid" +
+ " where db_alarm.tb_devalarm_data.dev_id=db_battinf.tb_battinf.fbsdeviceid and tb_battinf.station_install=1 " +
" and db_alarm.tb_devalarm_data.dev_id=? and alm_type=? and alm_start_time=? ";
List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{ddata.getDev_id(),ddata.getAlm_type(),ddata.getAlm_start_time()}, new CallBack() {
@@ -617,6 +683,8 @@
ddata.setAlm_start_time1(ActionUtil.getSimpDate(date2));
ddata.setStationName1("");
ddata.setStationName("");
+ ddata.setStationName2("");
+ ddata.setStationName5("");
ddata.setAlm_type(0);
Page page = new Page();
page.setPageCurr(1);
@@ -629,18 +697,23 @@
BattInf binf = new BattInf();
binf.setStationName("");
binf.setStationName1("");
+ binf.setStationName2("");
+ binf.setStationName5("");
binf.setBattProductDate(ActionUtil.getSimpDate(date1));
binf.setBattProductDate1(ActionUtil.getSimpDate(date2));
bmd.setBinf(binf);
bmd.setPage(page);
bmd.setUinf(uinf);
+ //List list=dimpl.serchIn30(uinf);
List<Batt_devalarm_data> list=dimpl.serchByInfo(ddata);
for (Batt_devalarm_data b : list) {
System.out.println(b);
}
//List<Batt_devalarm_data> list = dimpl.serchByCondition(bmd);
- System.out.println(list.size());
+ //System.out.println(list.size());
+ /*int nums=dimpl.searchNums(uinf);
+ System.out.println(nums);*/
}
--
Gitblit v1.9.1