From dc4e90ff7d720a78dba3aa72d868b89f69eafff7 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期一, 06 一月 2020 13:42:07 +0800
Subject: [PATCH] 加入指定机房
---
Device_Manage/src/com/fgkj/dao/impl/Battalarm_dataImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Device_Manage/src/com/fgkj/dao/impl/Battalarm_dataImpl.java b/Device_Manage/src/com/fgkj/dao/impl/Battalarm_dataImpl.java
index fe12405..2ec3409 100644
--- a/Device_Manage/src/com/fgkj/dao/impl/Battalarm_dataImpl.java
+++ b/Device_Manage/src/com/fgkj/dao/impl/Battalarm_dataImpl.java
@@ -74,14 +74,16 @@
//鏌ヨ瀹炴椂鍛婅锛堝垎椤碉級
@Override
public List serchByInfo(Object obj) {
- Page page=(Page) obj;
+ BattInf binf=(BattInf) obj;
+ Page page=binf.getPage();
String sql=" select distinct db_alarm.tb_battalarm_data.battgroupid,alm_start_time,alm_id,db_alarm.tb_battalarm_data.monnum,alm_signal_id,alm_level "
+ " ,FBSDeviceId,BattGroupName "
+ " from db_alarm.tb_battalarm_data,db_battinf.tb_battinf "
+ " where db_alarm.tb_battalarm_data.battGroupId=db_battinf.tb_battinf.battGroupId "
+ + " and db_battinf.tb_battinf.FBSDeviceId=? "
+ " order by db_alarm.tb_battalarm_data.battgroupid asc,alm_start_time desc "
+ " limit ?,? ";
- List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getFBSDeviceId(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
@Override
public List getResults(ResultSet rs) {
@@ -148,11 +150,13 @@
return list;
}
//鏌ヨ瀹炴椂鍛婅鐨勬�绘暟
- public List searchAlarmNum(){
+ public List searchAlarmNum(Object obj){
+ BattInf binf=(BattInf) obj;
String sql=" select count(db_alarm.tb_battalarm_data.num) as number "
+ " from db_alarm.tb_battalarm_data,db_battinf.tb_battinf "
- + " where db_alarm.tb_battalarm_data.battGroupId=db_battinf.tb_battinf.battGroupId ";
- List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), null, new CallBack() {
+ + " where db_alarm.tb_battalarm_data.battGroupId=db_battinf.tb_battinf.battGroupId "
+ + " and db_battinf.tb_battinf.FBSDeviceId=? ";
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getFBSDeviceId()}, new CallBack() {
@Override
public List getResults(ResultSet rs) {
--
Gitblit v1.9.1