From e9a608a0f94ea1ad916cf6ac0fc4e35076aaa05b Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 30 十月 2018 15:27:05 +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/BattInfImpl.java | 18 ++++++++++++------
gx_tieta/src/com/fgkj/db/DBUtil.java | 4 ++--
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index 1bd1d2e..ec264df 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -3548,8 +3548,8 @@
//鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�(宸︿晶瀵艰埅绗簲灞�,鏍规嵁鏈烘埧鏌ヨ涓嬮潰鐨勭數姹犵粍,num涓瓨鏀緐id)
public List serchBattByStation(Object obj){
BattInf binf=(BattInf) obj;
- String sql="select DISTINCT StationName,StationName1,StationName2,StationId,stationid_ex,StationIP,FBSDeviceId,BattGroupName,BattGroupName1,BattGroupName2,MonCount,battgroupId,MonCapStd,MonVolStd,MonResStd,MonSerStd,BattProducer,BattInUseDate,GroupIndexInFBSDevice,Load_curr,DisCurrMax " +
- "from db_battinf.tb_battinf where StationName1 like ? and StationName2 like ? and StationName like ? ";
+ String sql="select DISTINCT StationName,StationName1,StationName2,StationName3,StationName5,StationId,stationid_ex,StationIP,FBSDeviceId,BattGroupName,BattGroupName1,BattGroupName2,MonCount,battgroupId,MonCapStd,MonVolStd,MonResStd,MonSerStd,BattProducer,BattInUseDate,GroupIndexInFBSDevice,Load_curr,DisCurrMax " +
+ "from db_battinf.tb_battinf where StationName1 like ? and StationName2 like ? and StationName like ? and StationName5 like ? ";
//鏈烘埧id
String idSqlT=" and Stationid like ? ";
sql+=idSqlT;
@@ -3562,7 +3562,7 @@
String orderSql=" ORDER BY StationName1,battgroupId ";
sql+=orderSql;
//System.out.println(sql);
- List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName()+"%","%"+binf.getStationId()+"%",binf.getNum()},new CallBack() {
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName5()+"%","%"+binf.getStationId()+"%",binf.getNum()},new CallBack() {
public List getResults(ResultSet rs) {
List list = new ArrayList();
@@ -3572,6 +3572,8 @@
batt.setStationName(rs.getString("stationName"));
batt.setStationName1(rs.getString("stationName1"));
batt.setStationName2(rs.getString("stationName2"));
+ batt.setStationName3(rs.getString("stationName3"));
+ batt.setStationName5(rs.getString("stationName5"));
batt.setStationId(rs.getString("StationId"));
batt.setStationId_ex(rs.getString("stationId_ex"));
batt.setStationIp(rs.getString("StationIP"));
@@ -3603,8 +3605,8 @@
//鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�(宸︿晶瀵艰埅绗簲灞�,鏍规嵁鏈烘埧鏌ヨ涓嬮潰鐨勭數姹犵粍,num涓瓨鏀緐id)
public List serchBattByStation_all(Object obj){
BattInf binf=(BattInf) obj;
- String sql="select DISTINCT StationName,StationId,StationIP,FBSDeviceId,BattGroupName,BattGroupName1,BattGroupName2,MonCount,battgroupId,MonCapStd,MonVolStd,MonResStd,MonSerStd,BattProducer,BattInUseDate,GroupIndexInFBSDevice " +
- "from db_battinf.tb_battinf where StationName1 like ? and StationName2 like ? and StationName like ? ";
+ String sql="select DISTINCT StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationId,StationIP,FBSDeviceId,BattGroupName,BattGroupName1,BattGroupName2,MonCount,battgroupId,MonCapStd,MonVolStd,MonResStd,MonSerStd,BattProducer,BattInUseDate,GroupIndexInFBSDevice " +
+ "from db_battinf.tb_battinf where StationName1 like ? and StationName2 like ? and StationName like ? and StationName5 like ? ";
//鏈烘埧id
String idSqlT=" and Stationid like ? ";
sql+=idSqlT;
@@ -3617,7 +3619,7 @@
String orderSql=" ORDER BY StationName1,battgroupId ";
sql+=orderSql;
//System.out.println(sql);
- List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName()+"%","%"+binf.getStationId()+"%"},new CallBack() {
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName5()+"%","%"+binf.getStationId()+"%"},new CallBack() {
public List getResults(ResultSet rs) {
List list = new ArrayList();
@@ -3625,6 +3627,10 @@
while (rs.next()) {
BattInf batt = new BattInf();
batt.setStationName(rs.getString("stationName"));
+ batt.setStationName1(rs.getString("stationName1"));
+ batt.setStationName2(rs.getString("stationName2"));
+ batt.setStationName3(rs.getString("stationName3"));
+ batt.setStationName5(rs.getString("stationName5"));
batt.setStationId(rs.getString("StationId"));
batt.setStationIp(rs.getString("StationIP"));
batt.setBattGroupName(rs.getString("BattGroupName").trim());
diff --git a/gx_tieta/src/com/fgkj/db/DBUtil.java b/gx_tieta/src/com/fgkj/db/DBUtil.java
index 633017e..4195765 100644
--- a/gx_tieta/src/com/fgkj/db/DBUtil.java
+++ b/gx_tieta/src/com/fgkj/db/DBUtil.java
@@ -19,8 +19,8 @@
private static String username="root";
private static String password="lmx8688139";
//private static String url="jdbc:mysql://118.89.139.230:3360/db_user";
- //private static String url="jdbc:mysql://123.207.82.239:3360/db_user";
- private static String url="jdbc:mysql://192.168.0.34:3360/db_user";
+ private static String url="jdbc:mysql://123.207.82.239:3360/db_user";
+ //private static String url="jdbc:mysql://192.168.0.34:3360/db_user";
//private static String url="jdbc:mysql://127.0.0.1:3360/db_user";
/*private static String username="root";
private static String password="123456";*/
--
Gitblit v1.9.1