From e22fd0bac62d20d94e58409ea15049c67f6ff1eb Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.26>
Date: 星期四, 13 十二月 2018 10:33:35 +0800
Subject: [PATCH] 修改

---
 gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
index f423ae4..2430d17 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
@@ -133,7 +133,7 @@
 	//9.1鏌ヨ宸茬粡娣诲姞鐗╃悊淇℃伅鐨勬満鎴�(鐢ㄦ埛绠$悊鐨�,l鏌ヨ鍏ㄩ儴鎵撳紑椤甸潰)
 	public List serchInBattMapByUid(Object obj) {
 		User_inf uinf=(User_inf) obj;
-		String sql="select distinct tb_battmap_information.num,tb_battmap_information.StationId,tb_battmap_information.StationName,address,longitude,latitude,information,db_battinf.tb_battinf.FBSDeviceId  " +
+		String sql="select distinct tb_battmap_information.num,tb_battmap_information.StationId,tb_battmap_information.StationName,address,longitude,latitude,information,db_battinf.tb_battinf.FBSDeviceId,db_battinf.tb_battinf.monvolstd  " +
 				"  from web_site.tb_battmap_information,db_battinf.tb_battinf " +
 				"  where  tb_battmap_information.StationId=db_battinf.tb_battinf.StationId " +
 				"  and tb_battmap_information.StationId in (" +
@@ -158,6 +158,7 @@
 						binformation.setLatitude(rs.getDouble("latitude"));
 						binformation.setInformation(rs.getString("information"));
 						binformation.setFBSDeviceId(rs.getInt("fBSDeviceId"));
+						binformation.setMonvolstd(rs.getFloat("monvolstd")); //琛ㄦ槑璁惧鏄�2V杩樻槸12V
 						list.add(binformation);
 					}
 				} catch (SQLException e) {
@@ -175,7 +176,7 @@
 		int uid=page.getPageAll();
 		Connection conn=DBUtil.getConn();
 		String numberSql="SELECT FOUND_ROWS() number";//瀛樻斁鎬绘暟
-		String sql="select SQL_CALC_FOUND_ROWS distinct tb_battmap_information.num,tb_battmap_information.StationId,tb_battmap_information.StationName,address,longitude,latitude,information,db_battinf.tb_battinf.FBSDeviceId,db_battinf.tb_battinf.station_install  " +
+		String sql="select SQL_CALC_FOUND_ROWS distinct tb_battmap_information.num,tb_battmap_information.StationId,tb_battmap_information.StationName,address,longitude,latitude,information,db_battinf.tb_battinf.FBSDeviceId,db_battinf.tb_battinf.station_install,db_battinf.tb_battinf.monvolstd  " +
 				"  from web_site.tb_battmap_information,db_battinf.tb_battinf " +
 				"  where  tb_battmap_information.StationId=db_battinf.tb_battinf.StationId " +
 				"  and tb_battmap_information.StationId in (" +
@@ -203,6 +204,7 @@
 						binformation.setInformation(rs.getString("information"));
 						binformation.setFBSDeviceId(rs.getInt("fBSDeviceId"));
 						binformation.setInformation(rs.getString("station_install"));
+						binformation.setMonvolstd(rs.getFloat("monvolstd")); //琛ㄦ槑璁惧鏄�2V杩樻槸12V
 						Page p=new Page();
 						binformation.setPage(p);
 						list.add(binformation);
@@ -225,7 +227,7 @@
 	//9.1鏌ヨ宸茬粡娣诲姞鐗╃悊淇℃伅鐨勬満鎴�(鐢ㄦ埛绠$悊鐨勶紝3.鏍规嵁鍏蜂綋id鏌ヨ鍛婅淇℃伅绛�)
 	public List serchInBattMapByUid3(Object obj) {
 		BattMap_information binfor=(BattMap_information) obj;
-		String sql="select distinct tb_battmap_information.num,tb_battmap_information.StationId,tb_battmap_information.StationName,address,longitude,latitude,information,db_battinf.tb_battinf.FBSDeviceId,tb_battinf.stationName1,tb_battinf.stationName2,tb_battinf.stationName3  " +
+		String sql="select distinct tb_battmap_information.num,tb_battmap_information.StationId,tb_battmap_information.StationName,address,longitude,latitude,information,db_battinf.tb_battinf.FBSDeviceId,tb_battinf.stationName1,tb_battinf.stationName2,tb_battinf.stationName3,tb_battinf.stationName5  " +
 				"  from web_site.tb_battmap_information,db_battinf.tb_battinf " +
 				"  where  tb_battmap_information.StationId=db_battinf.tb_battinf.StationId " +
 				"  and tb_battmap_information.StationId in (" +
@@ -249,6 +251,7 @@
 						binformation.setStationName1(rs.getString("stationName1"));
 						binformation.setStationName2(rs.getString("stationName2"));
 						binformation.setStationName3(rs.getString("stationName3"));
+						binformation.setStationName5(rs.getString("stationName5"));
 						binformation.setAddress(rs.getString("address"));
 						binformation.setLongitude(rs.getDouble("longitude"));
 						binformation.setLatitude(rs.getDouble("latitude"));

--
Gitblit v1.9.1