From f620196f9a441ef0e0e8f1ca6b38b356dabdafc4 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.8>
Date: 星期一, 29 十月 2018 17:21:36 +0800
Subject: [PATCH] 告警30秒
---
gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java | 8 ++
gx_tieta/src/com/fgkj/services/Battalarm_dataService.java | 26 ++++++++
gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java | 51 ++++++++++++++++
gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java | 53 +++++++++++++++++
4 files changed, 132 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java b/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java
index cf21a3d..3f974c1 100644
--- a/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java
@@ -136,7 +136,13 @@
result=ActionUtil.tojson(model);
return SUCCESS;
}
-
+ //鍛婅鍙戝０(30绉掍箣鍐呯殑鍛婅)
+ public String serchIn30(){
+ User_inf uinf=(User_inf) ActionUtil.getUser();
+ ServiceModel model=service.serchIn30(uinf);
+ result=ActionUtil.tojson(model);
+ return SUCCESS;
+ }
//鐐瑰嚮椤圭洰涓嬫柟鐨勬粴鍔紝鏌ヨ璇ユ潯鍛婅鐨勫疄鏃朵俊鎭�
public String serchBatt_alarm(){
Battalarm_data adata=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Battalarm_data.class);
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 5d5a60a..18e5c89 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
@@ -582,6 +582,52 @@
});
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 (UNIX_TIMESTAMP(NOW())-UNIX_TIMESTAMP(alm_start_time))<30 " ;
+ //鐢ㄦ埛绠＄悊
+ 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;
@@ -643,10 +689,11 @@
bmd.setBinf(binf);
bmd.setPage(page);
bmd.setUinf(uinf);
- List<Batt_devalarm_data> list=dimpl.serchByInfo(ddata);
+ 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());
}
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 3fa940f..5fca417 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
@@ -1814,6 +1814,54 @@
});
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 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))<30 ";
+ //鐢ㄦ埛绠＄悊
+ 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;
@@ -1916,10 +1964,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());
}
}
diff --git a/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java b/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
index e110b81..8592d42 100644
--- a/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
+++ b/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
@@ -458,7 +458,31 @@
}
return model;
}
-
+ //鍛婅鍙戝０(30绉掍箣鍐呯殑鍛婅)
+ public ServiceModel serchIn30(Object obj){
+ List<Battalarm_data> lista=((Battalarm_dataDAOImpl)dao).serchIn30(obj);
+ List<Batt_devalarm_data> listd=(new Batt_devalarm_dataImpl()).serchIn30(obj);
+ if(listd!=null&&listd.size()>0){
+ for (Batt_devalarm_data ddata : listd) {
+ Battalarm_data data=new Battalarm_data();
+ data.setAlm_id(ddata.getDev_id());
+ data.setNote(ddata.getNote());
+ data.setNum(ddata.getNum());//1琛ㄧず璁惧鍛婅
+ data.setAlm_start_time(ddata.getAlm_start_time());
+ data.setAlm_signal_id(ddata.getAlm_type());
+ lista.add(data);
+ }
+ }
+ if(lista!=null&&lista.size()>0){
+ model.setCode(1);
+ model.setData(lista);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
+ return model;
+ }
//鐐瑰嚮椤圭洰涓嬫柟鐨勬粴鍔紝鏌ヨ璇ユ潯鍛婅鐨勫疄鏃朵俊鎭�
public ServiceModel serchBatt_alarm(Object obj){
List list=((Battalarm_dataDAOImpl)dao).serchBatt_alarm(obj);
--
Gitblit v1.9.1