From 72b008e0b171acb5f3f6f1494a933a76cf190ca8 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.10>
Date: 星期一, 22 十月 2018 16:29:40 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/index.jsp | 129 +++++++++++++++++++++++++++++++++++-------
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 4 +
gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java | 4 +
gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java | 5 +
gx_tieta/src/com/fgkj/dto/BattMap_information.java | 38 ++++++++++++
5 files changed, 153 insertions(+), 27 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 2ed62dc..6398208 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -1587,8 +1587,13 @@
var pt = new BMap.Point(dotList[i].lng, dotList[i].lat);
var mk = new BMap.Marker(pt, {icon: dotIcon}); // 瀹氫箟marker鐐�
- // addMenu(mk, mapDel);
+
+ // 鍒犻櫎鎸囧畾鐨勭偣(璇ョ偣浼氬湪鏈嚱鏁板悗闈㈤噸鏂板垱寤�)
deletePoint(map, dotList[i].title);
+
+ // 缁欑偣鍙抽敭鑿滃崟娣诲姞鍒犻櫎鎸夐挳
+ addMenu(mk, mapDel);
+
// 鍚憁k鐐规坊鍔爈abel
var home_name = new BMap.Label(dotList[i].title, {offset:new BMap.Size(20,-10)});
home_name.setStyle({display: 'none', padding: '4px 2px'});
@@ -1602,10 +1607,11 @@
this.getLabel().setStyle({display: 'none'});
});
- /* mk.addEventListener('click', function(e) {
+ mk.addEventListener('click', function(e) {
var target = e.target;
- showMapPanel(target, dotList);
- }); */
+ //showMapPanel(target, dotList);
+ searchPanelInfo(target);
+ });
mkList.push(mk);
// 鍚戝湴鍥炬坊鍔犺鐩栫墿
map.addOverlay(mk);
@@ -1762,7 +1768,6 @@
function showMapPanelByPoint(point, dataList) {
var searchInforWin = null;
var opts = {
- //title : warnList[i].title+'<a href="javascript:loadToHomeInfo();" style="margin-left: 1em;text-decoration:none">璇︽儏>></a>', //鏍囬
title : dataList.title+'<a href="javascript:loadToHomeInfo();" style="margin-left: 1em;text-decoration:none;cursor:not-allowed">璇︽儏>></a>', //鏍囬鏈紑鍚�
width : '290', //瀹藉害
height : 140, //楂樺害
@@ -2021,8 +2026,22 @@
function setDots(data) {
dots = data;
}
+
// 灏嗗彉閲忕粦瀹氬埌鍛藉悕绌洪棿涓�
gl.BMap.setDots = setDots;
+
+ // 鏇存柊dots闆嗗悎鐨勬暟鎹�
+ function updateDots(data) {
+ for(var i=0; i<dots.length; i++) {
+ var _dots = dots[i];
+ if(_dots.sId == data.sId) {
+ _dots.msg = data.msg;
+ }
+ }
+ }
+
+ // 灏嗗彉閲忕粦瀹氬埌鍛藉悕绌洪棿涓�
+ gl.BMap.updateDots = updateDots;
// 灏嗗嚱鏁扮粦瀹氬埌鍛藉悕绌洪棿涓�
gl.BMap.queryInRect = queryInRect;
@@ -2064,7 +2083,7 @@
var allStation = [];
var mapPages = {
- pageSize:2, // 姣忛〉鐨勮鏁�
+ pageSize:100, // 姣忛〉鐨勮鏁�
pageCurr:1, // 褰撳墠椤电爜鏁�
pageAll:1, // 鏁扮洰
pageNum: 0,
@@ -2098,7 +2117,7 @@
// 璁剧疆鍒嗛〉淇℃伅
mapPages.pageAll = list.length;
setMapPages();
- console.info(mapPages);
+
// 閬嶅巻鏌ヨ缁撴灉
for(var i=0;i<list.length;i++){
var _list = list[i];
@@ -2107,7 +2126,7 @@
// 鏄剧ず鍖哄煙鐨勫浘鏍�
bmap.setDots(allStation);
- bmap.queryInRect(map,createMapDot);
+ bmap.queryInRect(map, createMapDot);
// 鏄惁绗竴娆℃墽琛�
if(setRect) {
map.addEventListener("moveend", bmap.queryInRect.bind({},map, createMapDot)); // 鎷栧姩
@@ -2130,6 +2149,7 @@
obj.fbsId = list.FBSDeviceId;
obj.addr = list.Address;
obj.msg = "";
+ obj.num = list.num;
return obj;
}
@@ -2137,10 +2157,12 @@
function setMapPages() {
var pageNum = Math.ceil(mapPages.pageAll/mapPages.pageSize);
mapPages.pageNum = pageNum;
+ mapPages.pageNew= true;
}
// 杞鏇存柊鍦板浘鐨勭偣鏌ヨ
function updateStation() {
+ var bmap = GLOBAL.BMap; // BMap鐨勫懡鍚嶇┖闂�
var updateStationData = [];
$.ajax({
type: "post",
@@ -2152,9 +2174,13 @@
var data = JSON.parse(result.result);
for(var i=0; i<data.length; i++) {
var _data = data[i];
- updateStationData.push(formatUpdateStation(_data));
-
+ var _list = formatUpdateStation(_data);
+ updateStationData.push(_list);
+ //_list.msg = 'item-nuclear_cap';
// 鍒ゆ柇鏄惁鏇存柊
+ if(mapPages.pageNew) {
+ bmap.updateDots(_list);
+ }
}
createMapDot(map, updateStationData);
@@ -2183,17 +2209,73 @@
obj.fbsId = data.FBSDeviceId;
obj.addr = data.Address;
obj.msg = list.msg;
+ obj.num = list.num;
return obj;
}
- // 鏇存柊鎵�鏈夋満鎴�
+ // 鏌ヨ鏈烘埧闈㈡澘淇℃伅
+ function searchPanelInfo(data) {
+ var point = data.point;
+ var stationInfo = getStaionByPoint(point);
+ if(!stationInfo) {
+ alert('闈㈡澘淇℃伅鏌ヨ澶辫触锛�');
+ return;
+ }
+
+ var temp = {
+ StationId: stationInfo.sId
+ };
+ // 鏌ヨ闈㈡澘淇℃伅
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: 'BattMap_informationAction!searchUserManageStation3',
+ data: 'json='+JSON.stringify(temp),
+ dataType: 'json',
+ success: function(result) {
+ var rs = JSON.parse(result.result);
+ if(rs.length != 0) {
+ var data = rs[0];
+ //console.info(data);
+ var content = '<div style="padding:6px;"><span>钃勭數姹犵粍鍛婅鏁扮洰锛�</span>'+data.code+'<a style="margin-left: 14px" href="javascript:loadToWarnPage();">璇︽儏>></a></div>'+
+ '<div style="padding:6px;"><span>钃勭數姹犵粍钀藉悗鏁扮洰锛�</span>'+data.sum+'<a style="margin-left: 14px" href="javascript:loadToBehindPage();">璇︽儏>></a></div>'+
+ '<div style="padding:6px;"><span>钃勭數姹犵粍寤舵椂鏁扮洰锛�</span>'+data.newsum+'<a style="margin-left: 14px" href="javascript:loadToDischargeDelay();">璇︽儏>></a></div>'+
+ '<div style="padding:6px"><a href="javascript:loadToRealTime();">瀹炴椂鏁版嵁</a><a style="margin-left: 20px" href="javascript:loadToOldTime();">鍘嗗彶鏁版嵁</a></div>'+
+ '<div style="padding:6px;"><span>鍦板潃锛�</span>'+data.data.Address+'</div>'+
+ '<input type="hidden" class="ipt-hide sid" value="'+data.data.StationId+'">'+
+ '<input type="hidden" class="ipt-hide province" value="'+data.data.stationName1+'">'+
+ '<input type="hidden" class="ipt-hide city" value="'+data.data.stationName2+'">';
+
+ var list = {
+ title: data.data.StationName,
+ content: content
+ };
+
+ showMapPanelByPoint(point, list);
+ }
+
+ }
+ });
+ }
+ // 鏍规嵁缁忕含搴﹁幏鍙栨満鎴跨殑淇℃伅
+ function getStaionByPoint(point) {
+ var stationInfo = false;
+ // 閬嶅巻鎵�鏈夋満鎴�
+ for(var i=0; i<allStation.length; i++) {
+ var info = allStation[i];
+ if(info.lng == point.lng && info.lat == point.lat) {
+ stationInfo = info;
+ }
+ }
+ return stationInfo;
+ }
function setAllStation(obj,allstation){
//console.info(allstation);
var flag = false;
var index = 0;
- for(var i = 0;i < allstation.length;i++){
+ for(var i = 0;i < allStation.length;i++){
//console.info(obj.binformation.num + "==" + allstation[i].binformation.num);
if(obj.binformation.num == allstation[i].binformation.num){
flag = true;
@@ -2300,16 +2382,18 @@
}
// 瀹氫綅鍒板疄鏃舵暟鎹〉闈�
function loadToRealTime() {
- var battgroupId = $('.ipt-hide').eq(0).val();
- var homeId = $('.ipt-hide').eq(1).val();
- window.open('control.jsp?battgroupId='+battgroupId+'&stationId='+homeId);
+ var homeId = $('.ipt-hide.sid').val();
+ var province = $('.ipt-hide.province').val();
+ var city = $('.ipt-hide.city').val();
+ window.open('control.jsp?province='+province+'&city='+city+'&stationId='+homeId);
}
// 瀹氫綅鍒板巻鍙叉暟鎹〉闈�
function loadToOldTime() {
- var battgroupId = $('.ipt-hide').eq(0).val();
- var homeId = $('.ipt-hide').eq(1).val();
- window.open('charge-test.jsp?battgroupId='+battgroupId+'&stationId='+homeId);
+ var homeId = $('.ipt-hide.sid').val();
+ var province = $('.ipt-hide.province').val();
+ var city = $('.ipt-hide.city').val();
+ window.open('charge-test.jsp?province='+province+'&city='+city+'&stationId='+homeId);
}
//瀹氫綅鍒板憡璀﹂〉闈�
@@ -2443,11 +2527,10 @@
text: '鍒犻櫎',
callback: function(e) {
//console.info(allStation);
- console.info(mk);
+ console.info(allStation);
var temp = getStationMap(allStation, mk.point);
- if(confirm("纭浠庡湴鍥句笂鍒犻櫎'"+temp.StationName+"'鐨勪綅缃俊鎭悧锛�")){
+ if(confirm("纭浠庡湴鍥句笂鍒犻櫎'"+temp.title+"'鐨勪綅缃俊鎭悧锛�")){
if(temp != undefined){
- //console.info(temp);
var json = JSON.stringify(temp);
$.ajax({
type: "post",
@@ -2489,8 +2572,8 @@
function getStationMap(list,localposi){
if(list != undefined){
for(var i = 0 ; i < list.length ; i++){
- if(list[i].binformation.latitude == localposi.lat && list[i].binformation.longitude == localposi.lng){
- return list[i].binformation;
+ if(list[i].lat == localposi.lat && list[i].lng == localposi.lng){
+ return list[i];
}
}
}
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index c0b3de1..b8f1bb6 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -3478,7 +3478,7 @@
//鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�(宸︿晶瀵艰埅绗洓灞�,鏍规嵁鏈烘埧鏌ヨ涓嬮潰鐨勭數姹犵粍,num涓瓨鏀緐id)
public List serchBattByStation(Object obj){
BattInf binf=(BattInf) obj;
- String sql="select DISTINCT StationName,StationId,StationIP,FBSDeviceId,BattGroupName,BattGroupName1,BattGroupName2,MonCount,battgroupId,MonCapStd,MonVolStd,MonResStd,MonSerStd,BattProducer,BattInUseDate,GroupIndexInFBSDevice,Load_curr,DisCurrMax " +
+ String sql="select DISTINCT StationName,StationName1,StationName2,StationId,StationIP,FBSDeviceId,BattGroupName,BattGroupName1,BattGroupName2,MonCount,battgroupId,MonCapStd,MonVolStd,MonResStd,MonSerStd,BattProducer,BattInUseDate,GroupIndexInFBSDevice,Load_curr,DisCurrMax " +
"from db_battinf.tb_battinf where StationName1 like ? and StationName2 like ? and StationName like ? ";
//鏈烘埧id
String idSqlT=" and Stationid like ? ";
@@ -3500,6 +3500,8 @@
while (rs.next()) {
BattInf batt = new BattInf();
batt.setStationName(rs.getString("stationName"));
+ batt.setStationName1(rs.getString("stationName1"));
+ batt.setStationName2(rs.getString("stationName2"));
batt.setStationId(rs.getString("StationId"));
batt.setStationIp(rs.getString("StationIP"));
batt.setBattGroupName(rs.getString("BattGroupName").trim());
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..ae67a22 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/dao/impl/ram/Bts_station_stateImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
index d1bd387..090212b 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
@@ -62,7 +62,9 @@
" 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=? ) " +
" and tb_battinf.stationname1 like ? and tb_battinf.stationname2 like ? and tb_battinf.stationname3 like ? " +
- " and stationid like ? limit ? ,? ";
+ " and stationid like ? " +
+ " limit ? ,? ";
+ System.out.println(sql);
List<Bts_station_state> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{binf.getNum(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationId()+"%",(p.getPageCurr()-1)*p.getPageSize(),p.getPageSize()},new CallBack() {
public List getResults(ResultSet rs) {
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