From 0b24343b661ea24eda35566beca8722c82585eed Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.23>
Date: 星期四, 01 十一月 2018 10:10:04 +0800
Subject: [PATCH] 设备告警参数设置加区县
---
gx_tieta/src/com/fgkj/dao/impl/Dev_paramImpl.java | 4 ++--
gx_tieta/src/com/fgkj/dto/Dev_param.java | 11 ++++++++++-
2 files changed, 12 insertions(+), 3 deletions(-)
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/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