From 1feaa0cef7764a19c84c33b3c951f41089843f74 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.23>
Date: 星期四, 01 十一月 2018 15:19:46 +0800
Subject: [PATCH] 落后单体查询测试
---
gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 7b95a9c..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
@@ -309,7 +309,7 @@
" 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 " +
" 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 " ;
//璁惧瀹炴椂鍛婅
String alarmTypeSql=" AND alm_cleared_type=0 ";
baseSql+=alarmTypeSql;
@@ -366,7 +366,7 @@
//鍒嗛〉
String limitSql=" LIMIT ?,? ";
sql=baseSql+endSql+limitSql;
- List<Batt_devalarm_data> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{ddata.getStationName1(),ddata.getStationName(),ddata.getStationName2(),ddata.getAlm_type(),uinf.getUId(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
+ List<Batt_devalarm_data> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{ddata.getStationName1(),ddata.getStationName(),ddata.getStationName2(),ddata.getStationName5(),ddata.getAlm_type(),uinf.getUId(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
@@ -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