From 637284e4862dd4069e3179a061dbe6c67a8f5f82 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.23>
Date: 星期四, 01 十一月 2018 14:54:35 +0800
Subject: [PATCH] 设备实时告警数只查询已安装的
---
gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 a0dac21..3d4fce9 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
@@ -444,7 +444,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() {
@@ -679,6 +679,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);
@@ -691,19 +693,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 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