From c4f146427762bc62e063db2cf0156f74b4f56aa4 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.25>
Date: 星期一, 22 十月 2018 15:26:22 +0800
Subject: [PATCH] 修改加机房省市信息
---
gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java | 5 ++++-
gx_tieta/src/com/fgkj/dto/BattMap_information.java | 38 +++++++++++++++++++++++++++++++++++++-
2 files changed, 41 insertions(+), 2 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 2e3088f..6dd6bae 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
@@ -224,7 +224,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 " +
+ 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, " +
" 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 (" +
@@ -245,6 +245,9 @@
binformation.setNum(rs.getInt("num"));
binformation.setStationId(rs.getString("stationId"));
binformation.setStationName(rs.getString("stationName"));
+ binformation.setStationName1(rs.getString("stationName1"));
+ binformation.setStationName2(rs.getString("stationName2"));
+ binformation.setStationName3(rs.getString("stationName3"));
binformation.setAddress(rs.getString("address"));
binformation.setLongitude(rs.getDouble("longitude"));
binformation.setLatitude(rs.getDouble("latitude"));
diff --git a/gx_tieta/src/com/fgkj/dto/BattMap_information.java b/gx_tieta/src/com/fgkj/dto/BattMap_information.java
index 919e00c..111b6f0 100644
--- a/gx_tieta/src/com/fgkj/dto/BattMap_information.java
+++ b/gx_tieta/src/com/fgkj/dto/BattMap_information.java
@@ -12,6 +12,9 @@
private String information; //澶囨敞
private Integer FBSDeviceId; //璁惧id
private Page page;
+ private String stationName1;
+ private String stationName2;
+ private String stationName3;
public BattMap_information() {
super();
@@ -113,10 +116,43 @@
+ ", StationName=" + StationName + ", Address=" + Address
+ ", longitude=" + longitude + ", latitude=" + latitude
+ ", information=" + information + ", FBSDeviceId="
- + FBSDeviceId + ", page=" + page + "]";
+ + FBSDeviceId + ", page=" + page + ", stationName1="
+ + stationName1 + ", stationName2=" + stationName2
+ + ", stationName3=" + stationName3 + "]";
}
+ public String getStationName1() {
+ return stationName1;
+ }
+
+
+ public void setStationName1(String stationName1) {
+ this.stationName1 = stationName1;
+ }
+
+
+ public String getStationName2() {
+ return stationName2;
+ }
+
+
+ public void setStationName2(String stationName2) {
+ this.stationName2 = stationName2;
+ }
+
+
+ public String getStationName3() {
+ return stationName3;
+ }
+
+
+ public void setStationName3(String stationName3) {
+ this.stationName3 = stationName3;
+ }
+
+
+
--
Gitblit v1.9.1