From e2ca120ce17355241d1d64d6bff54a7d5d5af7e6 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 01 十一月 2018 10:13:55 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java | 9 ++--
gx_tieta/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java | 6 ++-
gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java | 12 +++++-
gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java | 6 ++-
gx_tieta/src/com/fgkj/dao/impl/Dev_paramImpl.java | 4 +-
gx_tieta/src/com/fgkj/dto/Batt_devalarm_data_history.java | 14 ++++++-
gx_tieta/src/com/fgkj/dto/Dev_param.java | 11 +++++
gx_tieta/src/com/fgkj/dto/Batt_devalarm_data.java | 12 +++++-
8 files changed, 56 insertions(+), 18 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/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();
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Dev_paramImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Dev_paramImpl.java
index 581d18d..41f5726 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Dev_paramImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Dev_paramImpl.java
@@ -116,7 +116,7 @@
" db_battinf.tb_battinf.stationname " +
" from db_param.tb_dev_param,db_battinf.tb_battinf " +
" where db_param.tb_dev_param.dev_id=db_battinf.tb_battinf.FBSDeviceId " +
- " and db_battinf.tb_battinf.StationName1 like ? and db_battinf.tb_battinf.StationName2 like ? and 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.StationName like ? and db_battinf.tb_battinf.StationName5 like ? " ;
//璁惧id鏉′欢
String devSqlT=" and dev_id=? ";
String devSqlF=" and dev_id!=? ";
@@ -136,7 +136,7 @@
String endSql=" order by db_param.tb_dev_param.num asc ";
//鏈�缁堢殑SQl
sql=baseSql+endSql;
- List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+dparam.getStationName1()+"%","%"+dparam.getStationName2()+"%","%"+dparam.getStationName()+"%",dparam.getDev_id(),dparam.getAlm_id()}, new CallBack() {
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+dparam.getStationName1()+"%","%"+dparam.getStationName2()+"%","%"+dparam.getStationName()+"%","%"+dparam.getStationName5()+"%",dparam.getDev_id(),dparam.getAlm_id()}, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
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 + "]";
}
+
}
diff --git a/gx_tieta/src/com/fgkj/dto/Dev_param.java b/gx_tieta/src/com/fgkj/dto/Dev_param.java
index d1970fe..74b4e80 100644
--- a/gx_tieta/src/com/fgkj/dto/Dev_param.java
+++ b/gx_tieta/src/com/fgkj/dto/Dev_param.java
@@ -17,6 +17,7 @@
private String stationName;
private String stationName1;
private String stationName2;
+ private String stationName5;
private String note;
public Integer getNum() {
@@ -104,6 +105,13 @@
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 "Dev_param [num=" + num + ", dev_id=" + dev_id + ", alm_id="
@@ -113,7 +121,8 @@
+ alm_low_level + ", alm_high_en=" + alm_high_en
+ ", alm_low_en=" + alm_low_en + ", stationName=" + stationName
+ ", stationName1=" + stationName1 + ", stationName2="
- + stationName2 + ", note=" + note + "]";
+ + stationName2 + ", stationName5=" + stationName5 + ", note="
+ + note + "]";
}
--
Gitblit v1.9.1