From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 6dd6bae..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 " +
+ 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 (" +
@@ -184,7 +192,7 @@
" left outer join db_user.tb_user_battgroup_baojigroup_battgroup on db_user.tb_user_battgroup_baojigroup_battgroup.stationid=db_battinf.tb_battinf.stationid " +
" left outer join db_user.tb_user_battgroup_baojigroup_usr on db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
" left outer join db_user.tb_user_inf on tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
- " where db_user.tb_user_inf.uid=? ) " +
+ " where db_user.tb_user_inf.uid=? and tb_battinf.station_install=true) " +
" order by tb_battmap_information.StationId "+
" limit ?,? " ;
List<BattMap_information> list=DAOHelper.executeQueryLimit(sql, conn,new Object[]{uid,(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
@@ -202,6 +210,8 @@
binformation.setLatitude(rs.getDouble("latitude"));
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);
@@ -224,7 +234,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 (" +
@@ -248,6 +258,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