From 162b1ec7816f035de05ef93ba432e64b95c96b7b Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.23>
Date: 星期四, 01 十一月 2018 10:06:16 +0800
Subject: [PATCH] 设备实时告警和历史实时告警加区县
---
gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java | 9 ++++-----
gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java | 12 ++++++++++--
gx_tieta/src/com/fgkj/dto/Batt_devalarm_data_history.java | 14 ++++++++++++--
gx_tieta/src/com/fgkj/dto/Batt_devalarm_data.java | 12 ++++++++++--
4 files changed, 36 insertions(+), 11 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 5ee815b..7b95a9c 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
@@ -306,7 +306,7 @@
String sql="";
String baseSql=" SELECT SQL_CALC_FOUND_ROWS distinct tb_devalarm_data.num,dev_id,dev_ip,alm_type,alm_level,alm_start_time,alm_end_time," +
" alm_is_confirmed,alm_confirmed_time,alm_cleared_type," +
- " db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.FbsDeviceName " +
+ " 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 " ;
@@ -336,6 +336,14 @@
baseSql+=stationSql2T;
}else{
baseSql+=stationSql2F;
+ }
+ //鐢ㄤ簬鍖哄幙
+ String stationSql5T=" and stationname5!=? ";//鍏ㄩ儴
+ String stationSql5F=" and stationname5=? ";
+ if(ddata.getStationName5().equals("")){
+ baseSql+=stationSql5T;
+ }else{
+ baseSql+=stationSql5F;
}
//鐢ㄤ簬鏁呴殰浜嬩欢
String almTypeT=" and alm_type!=? ";//鍏ㄩ儴
@@ -378,7 +386,7 @@
ddata.setDev_name(rs.getString("FbsDeviceName"));
ddata.setStationName(rs.getString("stationName"));
-
+ ddata.setStationName5(rs.getString("stationName5"));
list.add(ddata);
}
} catch (SQLException e) {
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 8808597..d132216 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,8 @@
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 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 ?) as DISTINCTbinf " +
" WHERE tb_devalarm_data_history.dev_id=DISTINCTbinf.FbsDeviceId " +
" AND alm_start_time>=? and alm_start_time<=? ";
@@ -93,7 +93,7 @@
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()
+ List<Batt_devalarm_data_history> list=DAOHelper.executeQueryLimit(sql, conn,new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%",binf.getBattProductDate(),binf.getBattProductDate1()
,uinf.getUId(),(page.getPageCurr() - 1)*page.getPageSize()
,page.getPageSize()}, new CallBack() {
@@ -115,8 +115,7 @@
ddata.setDev_name(rs.getString("FbsDeviceName"));
ddata.setStationName(rs.getString("stationName"));
-
-
+ ddata.setStationName5(rs.getString("stationName5"));
list.add(ddata);
}
} catch (SQLException e) {
diff --git a/gx_tieta/src/com/fgkj/dto/Batt_devalarm_data.java b/gx_tieta/src/com/fgkj/dto/Batt_devalarm_data.java
index 8653a09..db4fcbb 100644
--- a/gx_tieta/src/com/fgkj/dto/Batt_devalarm_data.java
+++ b/gx_tieta/src/com/fgkj/dto/Batt_devalarm_data.java
@@ -23,6 +23,7 @@
private String stationName;//鏈烘埧鍚嶇О
private String stationName1;//缁存姢鍖哄悕绉�
private String stationName2;//甯傜骇
+ private String stationName5;//鍖哄幙
private String stationId;//鏈烘埧id
private Page page;//鍒嗛〉
private User_inf uinf;
@@ -156,6 +157,12 @@
public void setStationName2(String stationName2) {
this.stationName2 = stationName2;
}
+ public String getStationName5() {
+ return stationName5;
+ }
+ public void setStationName5(String stationName5) {
+ this.stationName5 = stationName5;
+ }
@Override
public String toString() {
return "Batt_devalarm_data [num=" + num + ", record_id=" + record_id
@@ -168,9 +175,10 @@
+ ", usr_id=" + usr_id + ", note=" + note + ", dev_name="
+ dev_name + ", stationName=" + stationName + ", stationName1="
+ stationName1 + ", stationName2=" + stationName2
- + ", stationId=" + stationId + ", page=" + page + ", uinf="
- + uinf + "]";
+ + ", stationName5=" + stationName5 + ", stationId=" + stationId
+ + ", page=" + page + ", uinf=" + uinf + "]";
}
+
}
diff --git a/gx_tieta/src/com/fgkj/dto/Batt_devalarm_data_history.java b/gx_tieta/src/com/fgkj/dto/Batt_devalarm_data_history.java
index c07d189..d3a3d58 100644
--- a/gx_tieta/src/com/fgkj/dto/Batt_devalarm_data_history.java
+++ b/gx_tieta/src/com/fgkj/dto/Batt_devalarm_data_history.java
@@ -21,6 +21,7 @@
private String dev_name;//璁惧鍚嶇О
private String stationName;//鏈烘埧鍚嶇О
+ private String stationName5;//鏈烘埧鍚嶇О
private String stationId;//鏈烘埧id
private Page page;//鍒嗛〉
private User_inf uinf;
@@ -138,6 +139,13 @@
public void setUinf(User_inf uinf) {
this.uinf = uinf;
}
+
+ public String getStationName5() {
+ return stationName5;
+ }
+ public void setStationName5(String stationName5) {
+ this.stationName5 = stationName5;
+ }
@Override
public String toString() {
return "Batt_devalarm_data_history [num=" + num + ", record_id="
@@ -149,9 +157,11 @@
+ ", alm_confirmed_time=" + alm_confirmed_time
+ ", alm_cleared_type=" + alm_cleared_type + ", usr_id="
+ usr_id + ", note=" + note + ", dev_name=" + dev_name
- + ", stationName=" + stationName + ", stationId=" + stationId
- + ", page=" + page + ", uinf=" + uinf + "]";
+ + ", stationName=" + stationName + ", stationName5="
+ + stationName5 + ", stationId=" + stationId + ", page=" + page
+ + ", uinf=" + uinf + "]";
}
+
}
--
Gitblit v1.9.1