From 97db75238a96a75f41bafd469548c2a84ba37080 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期五, 28 九月 2018 14:31:04 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/Dev_paramImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 aefaf23..581d18d 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Dev_paramImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Dev_paramImpl.java
@@ -115,7 +115,8 @@
" alm_low_level,alm_high_en,alm_low_en," +
" 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 " ;
+ " 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 ? " ;
//璁惧id鏉′欢
String devSqlT=" and dev_id=? ";
String devSqlF=" and dev_id!=? ";
@@ -135,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.getDev_id(),dparam.getAlm_id()}, new CallBack() {
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+dparam.getStationName1()+"%","%"+dparam.getStationName2()+"%","%"+dparam.getStationName()+"%",dparam.getDev_id(),dparam.getAlm_id()}, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
@@ -261,4 +262,15 @@
});
return list;
}
+ public static void main(String[] args) {
+ Dev_paramImpl impl=new Dev_paramImpl();
+ Dev_param dparam=new Dev_param();
+ dparam.setDev_id(618500001);
+ dparam.setAlm_id(0);
+ dparam.setStationName("鍩庡競-鍖哄幙-姝︽眽婧愭殺瀹為獙瀹�-61850璁惧");
+ dparam.setStationName1("");
+ dparam.setStationName2("");
+ List list=impl.serchByCondition(dparam);
+ System.out.println(list.size());
+ }
}
--
Gitblit v1.9.1