From 1d7e1b771160dd8b7f25765e402ce25cac676641 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 24 Nov 2020 15:58:33 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/webSocketServer/WebSocketServerNew.java | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/moral/webSocketServer/WebSocketServerNew.java b/src/main/java/com/moral/webSocketServer/WebSocketServerNew.java
index 22e2ef6..1b6f298 100644
--- a/src/main/java/com/moral/webSocketServer/WebSocketServerNew.java
+++ b/src/main/java/com/moral/webSocketServer/WebSocketServerNew.java
@@ -35,11 +35,6 @@
// ������������������������������������������������������������������������������
private Session session;
- private String orgId;
-
- private String accountId;
-
-
private Connection connection;
private Channel channel;
@@ -57,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));
@@ -116,9 +112,7 @@
@OnClose
public void onClose() {
-
//**���������Set��� ������������������������*//**//**//**//**//**//**//**//*
-
webSocketSet.remove(this);
try {
connection.close();
--
Gitblit v1.8.0