From ccf7ab3cf4754a4d549b7403cd28dce26a56ae11 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.23>
Date: 星期四, 01 十一月 2018 09:56:20 +0800
Subject: [PATCH] 电池告警实时和历史加区县
---
gx_tieta/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java | 6 ++++--
gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
index d1e2c23..dfd27f6 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
@@ -443,11 +443,11 @@
String numberSql=" SELECT FOUND_ROWS() number";
Connection conn=DBUtil.getConn();
String baseSql = "select SQL_CALC_FOUND_ROWS distinct db_alarm.tb_battalarm_data.BattGroupId,db_alarm.tb_battalarm_data.num,alm_signal_id,db_alarm.tb_battalarm_data.monnum,alm_value,alm_level,alm_is_confirmed,alm_confirmed_time,alm_start_time,alm_end_time "
- + " ,stationname,battgroupname"
+ + " ,stationname,stationname5,battgroupname"
+ " from db_alarm.tb_battalarm_data,db_battinf.tb_battinf "
+ " where alm_id in(?,?,?,?,?,?,?,?,?,?) and alm_signal_id%2 in(?,?) " +
" and alm_level in(?,?,?,?) and alm_cleared_type=0 " +
- " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ?";
+ " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ? and db_battinf.tb_battinf.stationname5 like ? ";
//鐢ㄤ簬鐢垫睜缁勬潯浠�
String idSqlT=" and db_battinf.tb_battinf.battgroupid!=? and db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid ";//鍏ㄩ儴
String idSqlF=" and db_battinf.tb_battinf.battgroupid=? and db_alarm.tb_battalarm_data.battgroupid=db_battinf.tb_battinf.battgroupid ";
@@ -493,6 +493,7 @@
"%"+binf.getStationName1()+"%",
"%"+binf.getStationName()+"%",
"%"+binf.getStationName2()+"%",
+ "%"+binf.getStationName5()+"%",
binf.getBattGroupId(),
uinf.getUId(),
@@ -521,6 +522,7 @@
BattInf binf=new BattInf();
binf.setBattGroupId(rs.getInt("battGroupId"));
binf.setStationName(rs.getString("stationName"));
+ binf.setStationName5(rs.getString("stationName5"));
binf.setBattGroupName(rs.getString("battGroupName"));
//battinf涓殑StationName8锛孲tationName9瀛樻斁鍛婅鍚嶇О鍜岀瓑绾�
name=AlarmDaoFactory.getAlarmName(adata.getAlm_signal_id());
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 f3d80d9..f550002 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
@@ -105,12 +105,12 @@
String numberSql="SELECT FOUND_ROWS() number";//瀛樻斁鎬绘暟
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,battgroupname" +
+ " stationname,stationname5,battgroupname" +
" from db_alarm.tb_battalarm_data_history,db_battinf.tb_battinf " +
" where alm_id in(?,?,?,?,?,?) and alm_signal_id%2 in(?,?) " +
" and alm_level in(?,?,?,?) " +
" and alm_start_time>=? and alm_start_time<=? " +
- " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ? ";
+ " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ? and db_battinf.tb_battinf.stationname5 like ? ";
/*//鐢ㄤ簬瀹炴椂鍛婅
String almSqlT="and alm_cleared_type=? ";
//鍘嗗彶鍛婅
@@ -170,6 +170,7 @@
"%"+binf.getStationName1()+"%",
"%"+binf.getStationName()+"%",
"%"+binf.getStationName2()+"%",
+ "%"+binf.getStationName5()+"%",
//adata_H.getAlm_cleared_type(),
@@ -188,6 +189,7 @@
Batt_Maint_Dealarm bmd = new Batt_Maint_Dealarm();
BattInf binf = new BattInf();
binf.setStationName(rs.getString("stationName"));
+ binf.setStationName5(rs.getString("stationName5"));
binf.setBattGroupName(rs.getString("battGroupName"));
Battalarm_data_history adata_H = new Battalarm_data_history();
--
Gitblit v1.9.1