From 65007f6811e580d8660340b8216296e68fae598c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 01 Dec 2020 16:04:18 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/webSocketServer/WebSocketServerNew.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/webSocketServer/WebSocketServerNew.java b/src/main/java/com/moral/webSocketServer/WebSocketServerNew.java
index deac7a4..1b6f298 100644
--- a/src/main/java/com/moral/webSocketServer/WebSocketServerNew.java
+++ b/src/main/java/com/moral/webSocketServer/WebSocketServerNew.java
@@ -52,12 +52,13 @@
this.session = session;
//������������������������������������������������
webSocketSet.add(this);
+ //������
String[] flag=param.split("&");
-
String orgId = flag[0];
String accountId = flag[1];
String monitPointId = flag[2];
String p=flag[3];
+
String QUEUE_NAME = "deviceData_" + accountId;
Map<String, Object> paramMap = new HashMap<String, Object>();
List<Device> deviceList = deviceService.getDeviceById2(Integer.parseInt(monitPointId));
--
Gitblit v1.8.0