From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:30:50 +0800
Subject: [PATCH] 未审批可更改

---
 gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java |   15 ++++++++++++---
 1 files changed, 12 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 f7606c3..de58699 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
@@ -51,7 +51,14 @@
 			binformation.getAddress(),binformation.getLongitude(),binformation.getLatitude()});
 		return bl;
 	}
-
+	 //9.1褰曞叆鏈烘埧淇℃伅(鎵嬫満绔�)
+	public boolean replace(Object obj) {
+		BattMap_information binformation=(BattMap_information) obj;
+		String sql="replace into web_site.tb_battmap_information(StationId,StationName,address,longitude,latitude) values(?,?,?,?,?)";
+		Boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{binformation.getStationId(),binformation.getStationName(),
+			binformation.getAddress(),binformation.getLongitude(),binformation.getLatitude()});
+		return bl;
+	}
 	public boolean update(Object obj) {
 		BattMap_information binformation=(BattMap_information) obj;
 		String sql="update web_site.tb_battmap_information set StationId=?,StationName=?,address=?,longitude=?,latitude=?,information=? where num=?";
@@ -133,7 +140,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 +165,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 +183,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 +211,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);

--
Gitblit v1.9.1