From a17fcf6bdbdd29831bd5e746e95ca5b6f9b5b421 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期四, 03 一月 2019 16:14:17 +0800
Subject: [PATCH] 告警修改
---
gx_tieta/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java
index fa5d6e9..7905605 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java
@@ -106,7 +106,8 @@
Connection conn=DBUtil.getConn();//sql鍜宯umberSql鍏辩敤涓�涓猚onnection
String baseSql = "select SQL_CALC_FOUND_ROWS distinct(db_alarm.tb_battalarm_data_history.BattGroupId),db_alarm.tb_battalarm_data_history.num,alm_signal_id,db_alarm.tb_battalarm_data_history.monnum,alm_value,alm_level,alm_is_confirmed,alm_confirmed_time,alm_start_time,alm_end_time, " +
" stationname,stationname5,battgroupname" +
- " from db_alarm.tb_battalarm_data_history,db_battinf.tb_battinf " +
+ " from db_alarm.tb_battalarm_data_history,db_battinf.tb_battinf"
+ + ",db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf " +
" where alm_id in(?,?,?,?,?,?,?) and alm_signal_id%2 in(?,?) " +
" and alm_level in(?,?,?,?) " +
" and alm_start_time>=? and alm_start_time<=? " +
@@ -135,14 +136,20 @@
}else{
baseSql+=idSqlF;
}
- //鐢ㄤ簬鐢ㄦ埛绠＄悊鐨勭數姹犵粍鐨勭瓫閫�
+ //鐢ㄤ簬鐢ㄦ埛绠＄悊鐨勭數姹犵粍鐨勭瓫閫�
+ String userSql=" 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=? ";
+ baseSql+=userSql;
+
+ /*//鐢ㄤ簬鐢ㄦ埛绠＄悊鐨勭數姹犵粍鐨勭瓫閫�
String userSql=" and db_alarm.tb_battalarm_data_history.BattGroupId in(select distinct db_battinf.tb_battinf.battgroupid " +
" 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+=userSql;
+ baseSql+=userSql;*/
String endSql="order by db_alarm.tb_battalarm_data_history.alm_start_time desc,db_alarm.tb_battalarm_data_history.monnum asc ";
String limitSql=" limit ?,? ";
sql=baseSql+endSql+limitSql;
@@ -236,7 +243,7 @@
Battalarm_data_historyImpl bimpl=new Battalarm_data_historyImpl();
Page p = new Page();
p.setPageCurr(1);
- p.setPageSize(10);
+ p.setPageSize(1000);
/*鏉′欢鎵�瀛樻斁鐨勪綅缃墠鍙帮細tb_batt_maint_inf
* 鍦ㄧ嚎鐢靛帇锛歶sr_id
* 缁勭鐢靛帇锛歠ault_type_id
@@ -277,6 +284,9 @@
binf.setStationName("");
binf.setStationName1("");
+ binf.setStationName2("");
+ binf.setStationName3("");
+ binf.setStationName5("");
binf.setBattGroupId(0);
--
Gitblit v1.9.1