From 2bc319c2c241d7646cb6805f9364cb7416edfa0a Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 22 Jun 2020 17:31:09 +0800
Subject: [PATCH] add websocket实时发送设备数据，显示风向等信息
---
src/main/webapp/view/newmap.jsp | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/view/newmap.jsp b/src/main/webapp/view/newmap.jsp
index 89b9c76..9ff1067 100644
--- a/src/main/webapp/view/newmap.jsp
+++ b/src/main/webapp/view/newmap.jsp
@@ -14,6 +14,8 @@
<script type="text/javascript"
src="http://api.map.baidu.com/api?v=2.0&ak=rER1sgBIcQxkfNSlm2wmBGZGgEERrooM"></script>
<script type="text/javascript" src="/js/jquery.min.js"></script>
+ <script type="text/javascript" src="/js/sockjs.min.js"></script>
+ <script type="text/javascript" src="/js/stomp.min.js"></script>
<script type="text/javascript" src="/js/utils.js"></script>
<script type="text/javascript">
if (typeof (JSON) == 'undefined') {
@@ -345,10 +347,10 @@
<div class="charts_btn">
</div>
</div>
- <%-- <div class="search_box">
- <button id="searchBtn" type="button">������</button>
- <textarea style="width: 200px;height:200px;" id="searchParam"></textarea>
- </div>--%>
+ <div class="search_box">
+ <button id="searchBtn" type="button">������</button>
+ <textarea style="width: 300px;height:400px;" id="searchParam"></textarea>
+ </div>
<!-- <div id="popup_box">
<div id="equ_list" class="listview">
</div>
@@ -367,6 +369,7 @@
var moralMap = window.moralMap;
var params = $.parseJSON($("#mapParams").html());
moralMap['params'] = params;
+ var orgId = params["orgId"];
var regionCode = params["regionCode"];
var provinceCode = regionCode.toString().substring(0, 2) + "0000";
var mapType = getUrlParam("mapType");
@@ -422,7 +425,10 @@
function loadOverlays(url, callback) {
//������������
var oldMarkerList = moralMap.getHorizonMarkers();
+ var oldWindMarkerList = moralMap.getHorizonWindMarkers();
+
moralMap.addOverlays(oldMarkerList);
+ moralMap.addOverlays(oldWindMarkerList);
//������������
//������������������������,������������������
if (moralMap.isOverBounds() || moralMap.getOverlays().length == 0) {
@@ -480,7 +486,9 @@
}
}
var moralMask = new moralMap.Equipment(obj);
+ var moralDeviceWind = new moralMap.Device(obj);
moralMap.addOverlay(moralMask);
+ moralMap.addOverlay(moralDeviceWind);
}
}
}
@@ -629,7 +637,31 @@
}
}
);
- //������������
+
+ var ws;
+ if (typeof (WebSocket) === "undefined") {
+ alert("������������������������WebSocket");
+ } else {
+ ws = new WebSocket('ws://47.96.15.25:8080/screen/webSocket/' + orgId + '&' + regionCode);
+ ws.onopen = function () {
+ };
+
+ //������������������
+ ws.onmessage = function (msg) {
+ // $("#searchParam").val(JSON.parse(msg.data));
+ moralMap.refreshWindDir(JSON.parse(JSON.parse(msg.data)));
+ if (moralMap.showSensors && typeof (moralMap.showSensors) == "function") {
+ moralMap.showSensors(JSON.parse(JSON.parse(msg.data)));
+ }
+ };
+
+ //������������
+ ws.onclose = function () {
+ };
+ //���������������������
+ ws.onerror = function () {
+ };
+ }
})(jQuery);
var _intervalNum = -1;
@@ -738,14 +770,14 @@
function callJS(jsonData) {
var jsonData = JSON.parse(jsonData);
var methodName = jsonData.methodName;
- // $("#searchParam").val(JSON.stringify(jsonData));
+ $("#searchParam").val(JSON.stringify(jsonData));
if ("JumpBaiduMap" == methodName) {
moralMap.callJS(jsonData);
} else if ("RefreshState" == methodName) {
var states = jsonData.states;
moralMap.refreshState(states);
} else if ("DeliverSensors" == methodName) {
- moralMap.showSensors(jsonData);
+ // moralMap.showSensors(jsonData);
}
}
</script>
--
Gitblit v1.8.0