From 37dc2eac7e0010da4f1b90d3ce4ac30ad23b1544 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 31 十月 2018 17:32:18 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dto/BattPower_off.java | 17 ++++++++++++++++-
gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java | 9 +++++----
gx_tieta/src/com/fgkj/dao/impl/BattPower_offImpl.java | 8 +++++---
3 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattPower_offImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattPower_offImpl.java
index d201120..cdc166e 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattPower_offImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattPower_offImpl.java
@@ -123,10 +123,10 @@
String numberSql=" SELECT FOUND_ROWS() number";
String sql=" SELECT SQL_CALC_FOUND_ROWS DISTINCT tb_battpower_off.dev_id,poweroff_starttime,poweroff_stoptime,timelong,power_state,note" +
- ",db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.StationName1 " +
+ ",db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.StationName1,db_battinf.tb_battinf.StationName2,db_battinf.tb_battinf.StationName5 " +
" FROM web_site.tb_battpower_off,db_battinf.tb_battinf " +
" WHERE tb_battpower_off.dev_id=db_battinf.tb_battinf.FBSDeviceId " +
- " AND db_battinf.tb_battinf.StationName LIKE ? AND db_battinf.tb_battinf.StationName2 LIKE ? " +
+ " AND db_battinf.tb_battinf.StationName LIKE ? AND db_battinf.tb_battinf.StationName2 LIKE ? AND db_battinf.tb_battinf.StationName5 LIKE ? " +
" AND poweroff_starttime>=? " +
" AND poweroff_starttime<=? ";
//瀹炴椂杩樻槸鍘嗗彶
@@ -148,7 +148,7 @@
//鍒嗛〉
String limitSql=" limit ?,?";
sql+=limitSql;
- List<BattPower_off> list = DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%",binf.getBattProductDate(),binf.getBattProductDate1()
+ List<BattPower_off> list = DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%",binf.getBattProductDate(),binf.getBattProductDate1()
,binf.getNum(),uinf.getUId(),"%"+binf.getStationName1()+"%",(page.getPageCurr() - 1)*page.getPageSize(),
page.getPageSize()}, new CallBack() {
@@ -164,6 +164,8 @@
bpoff.setTimelong(rs.getInt("timelong"));
bpoff.setStationName(rs.getString("stationName"));
bpoff.setStationName1(rs.getString("stationName1"));
+ bpoff.setStationName2(rs.getString("stationName2"));
+ bpoff.setStationName5(rs.getString("stationName5"));
bpoff.setNote(rs.getString("note"));
list.add(bpoff);
}
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java
index 067a544..e848fa2 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java
@@ -604,7 +604,7 @@
",tb_batt_rtdata.BattGroupId,tb_batt_rtdata.rec_datetime,mon_num,mon_vol,mon_tmp," +
"mon_res,mon_ser,mon_conn_res,mon_cap" +
",db_battinf.tb_battinf.moncapstd,db_battinf.tb_battinf.monvolstd " +
- ",db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationname1,db_battinf.tb_battinf.BattGroupName,db_battinf.tb_battinf.deviceName " +
+ ",db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationname1,db_battinf.tb_battinf.stationname2,db_battinf.tb_battinf.stationname5,db_battinf.tb_battinf.BattGroupName,db_battinf.tb_battinf.deviceName " +
",max(binary tb_batt_rtdata.mon_vol) as maxmonvol,min(binary tb_batt_rtdata.mon_vol) as minmonvol " +
"FROM db_ram_db.tb_batt_rtstate " +
"LEFT OUTER JOIN db_ram_db.tb_batt_rtdata ON tb_batt_rtstate.BattGroupId = tb_batt_rtdata.BattGroupId " +
@@ -627,7 +627,7 @@
" and db_user.tb_user_inf.uid=? )";
baseSql+=userSql;
//鏈烘埧缁存姢鍖洪�夋嫨
- String stationSql=" AND db_battinf.tb_battinf.stationname like ? AND db_battinf.tb_battinf.stationname1 like ? AND db_battinf.tb_battinf.stationname2 like ? ";
+ String stationSql=" 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.stationname5 like ? ";
baseSql+=stationSql;
//鐢垫睜鐘舵��
String stateSqlT=" AND batt_state=? ";
@@ -643,7 +643,7 @@
String limitSql=" limit ?,?";
sql=baseSql+endSql+limitSql;
//System.out.println(sql);
- List<Batt_State> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%"
+ List<Batt_State> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%"
,binf.getNum(),(page.getPageCurr() - 1)*page.getPageSize(),
page.getPageSize()}, new CallBack() {
@@ -685,7 +685,8 @@
binf.setDeviceName(rs.getString("deviceName"));
binf.setStationName(rs.getString("stationName"));
binf.setStationName1(rs.getString("stationName1"));
-
+ binf.setStationName2(rs.getString("stationName2"));
+ binf.setStationName5(rs.getString("stationName5"));
binf.setStationName9(BattTestData.battState(rs.getInt("batt_state")));
state.setBstate(bstate);
diff --git a/gx_tieta/src/com/fgkj/dto/BattPower_off.java b/gx_tieta/src/com/fgkj/dto/BattPower_off.java
index 4718b23..77b7197 100644
--- a/gx_tieta/src/com/fgkj/dto/BattPower_off.java
+++ b/gx_tieta/src/com/fgkj/dto/BattPower_off.java
@@ -15,6 +15,8 @@
private String StationName;
private String StationName1;
+ private String StationName2;
+ private String StationName5;
public BattPower_off() {
super();
@@ -82,6 +84,18 @@
public void setStationName1(String stationName1) {
StationName1 = stationName1;
}
+ public String getStationName2() {
+ return StationName2;
+ }
+ public void setStationName2(String stationName2) {
+ StationName2 = stationName2;
+ }
+ public String getStationName5() {
+ return StationName5;
+ }
+ public void setStationName5(String stationName5) {
+ StationName5 = stationName5;
+ }
@Override
public String toString() {
return "BattPower_off [num=" + num + ", dev_id=" + dev_id
@@ -90,7 +104,8 @@
+ poweroff_stoptime + ", timelong=" + timelong
+ ", power_state=" + power_state + ", note=" + note
+ ", StationName=" + StationName + ", StationName1="
- + StationName1 + "]";
+ + StationName1 + ", StationName2=" + StationName2
+ + ", StationName5=" + StationName5 + "]";
}
--
Gitblit v1.9.1