From eb8bc83b3eba5e679fe773b8639c95ed235cae95 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期三, 09 一月 2019 16:50:27 +0800
Subject: [PATCH] 修改
---
gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java
index 3b98e06..fa64695 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java
@@ -69,8 +69,13 @@
String sql="";
String baseSql=" SELECT SQL_CALC_FOUND_ROWS tb_devalarm_data_history.num,record_id,dev_id,dev_ip,alm_type,alm_level,alm_start_time,alm_end_time," +
" alm_is_confirmed,alm_confirmed_time,alm_cleared_type, " +
- " DISTINCTbinf.stationName,DISTINCTbinf.FbsDeviceName " +
- " FROM db_alarm.tb_devalarm_data_history,(SELECT DISTINCT db_battinf.tb_battinf.FbsDeviceId,db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.FbsDeviceName from db_battinf.tb_battinf where db_battinf.tb_battinf.StationName LIKE ? AND db_battinf.tb_battinf.StationName1 LIKE ? AND db_battinf.tb_battinf.StationName2 LIKE ?) as DISTINCTbinf " +
+ " DISTINCTbinf.stationName,DISTINCTbinf.stationName5,DISTINCTbinf.FbsDeviceName " +
+ " FROM db_alarm.tb_devalarm_data_history,"
+ + "(SELECT DISTINCT db_battinf.tb_battinf.FbsDeviceId,db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.stationName5,db_battinf.tb_battinf.FbsDeviceName 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_battinf.tb_battinf.StationName LIKE ? AND db_battinf.tb_battinf.StationName1 LIKE ? AND db_battinf.tb_battinf.StationName2 LIKE ? AND db_battinf.tb_battinf.StationName5 LIKE ? "
+ + "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=?) as DISTINCTbinf " +
" WHERE tb_devalarm_data_history.dev_id=DISTINCTbinf.FbsDeviceId " +
" AND alm_start_time>=? and alm_start_time<=? ";
@@ -78,13 +83,13 @@
String alarmTypeSql=" AND alm_cleared_type!=0";
baseSql+=alarmTypeSql;*/
//鍒ゆ柇鏄惁涓虹鐞嗙殑鏈烘埧
- String stationSql=" and db_alarm.tb_devalarm_data_history.dev_id in(select distinct db_battinf.tb_battinf.FbsDeviceId " +
+ /*String stationSql=" and db_alarm.tb_devalarm_data_history.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 ";
@@ -92,9 +97,9 @@
String limitSql=" LIMIT ?,? ";
sql=baseSql+endSql+limitSql;
-
- List<Batt_devalarm_data_history> list=DAOHelper.executeQueryLimit(sql, conn,new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%",binf.getBattProductDate(),binf.getBattProductDate1()
- ,uinf.getUId(),(page.getPageCurr() - 1)*page.getPageSize()
+ //System.out.println(sql);
+ List<Batt_devalarm_data_history> list=DAOHelper.executeQueryLimit(sql, conn,new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%",uinf.getUId(),binf.getBattProductDate(),binf.getBattProductDate1()
+ ,(page.getPageCurr() - 1)*page.getPageSize()
,page.getPageSize()}, new CallBack() {
public List getResults(ResultSet rs) {
@@ -115,8 +120,7 @@
ddata.setDev_name(rs.getString("FbsDeviceName"));
ddata.setStationName(rs.getString("stationName"));
-
-
+ ddata.setStationName5(rs.getString("stationName5"));
list.add(ddata);
}
} catch (SQLException e) {
@@ -144,20 +148,12 @@
" ,"+AlarmDaoFactory.ALM_TYPE_BTS9100S_TEMPUP_ComError_ID+","+AlarmDaoFactory.ALM_TYPE_BTS9100S_TEMPLOW_ComError_ID+","+AlarmDaoFactory.ALM_TYPE_BTS9100S_DAMPUP_ComError_ID+","+AlarmDaoFactory.ALM_TYPE_BTS9100S_DAMPLOW_ComError_ID+") " +
" and alm_start_time>=? and alm_start_time<=? " +
" and stationname1 like ? and stationname2 like ? and stationname3 like ? and stationid like ? " ;
- //寮傚父绫诲瀷绛涢��
- String alm_typeSqlT=" and alm_type!=? ";
- String alm_typeSqlF=" and alm_type=? ";
- if(binf.getNum()==0){
- sql+=alm_typeSqlT;
- }else{
- sql+=alm_typeSqlF;
- }
//鎺掑簭
String orderSql=" order by dev_id,alm_start_time,alm_type asc ";
sql+=orderSql;
//System.out.println(sql);
//binf.getBattInUseDate(),binf.getBattInUseDate1(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationId()+"%",
- List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getBattInUseDate(),binf.getBattInUseDate1(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationId()+"%",binf.getNum()}, new CallBack() {
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getBattInUseDate(),binf.getBattInUseDate1(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationId()+"%"}, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
@@ -385,10 +381,13 @@
binf.setStationName1("");
binf.setStationName2("");
binf.setStationName3("");
+ binf.setStationName5("");
binf.setStationId("");
binf.setBattGroupNum(1);
binf.setBattInUseDate(ActionUtil.getSimpDate(date1));
binf.setBattInUseDate1(ActionUtil.getSimpDate(date2));
+ binf.setBattProductDate(ActionUtil.getSimpDate(date1));
+ binf.setBattProductDate1(ActionUtil.getSimpDate(date2));
User_inf uinf=new User_inf();
uinf.setUId(1002);
@@ -396,8 +395,8 @@
bmd.setPage(p);
bmd.setBinf(binf);
bmd.setUinf(uinf);
- //List<Batt_devalarm_data_history> list=bimpl.serchByCondition(bmd);
- List<Batt_devalarm_data_history> list=bimpl.serchStateBydev_id(binf);
+ List<Batt_devalarm_data_history> list=bimpl.serchByCondition(bmd);
+ //List<Batt_devalarm_data_history> list=bimpl.serchStateBydev_id(binf);
System.out.println(list.size());
for (Batt_devalarm_data_history b : list) {
System.out.println(b.getDev_ip()+" "+b.getDev_id()+" "+b.getNum()+" "+b.getRecord_id()+" "+b.getAlm_type()+" "+b.getAlm_level()+" "+b.getAlm_is_confirmed()+" "+b.getAlm_cleared_type()+" "+b.getUsr_id()+" "+b.getNote()+" "+b.getStationName());
--
Gitblit v1.9.1