|
@@ -31,13 +31,9 @@ public class WebSocketCheckThread extends Thread {
|
|
|
*/
|
|
|
@Scheduled(initialDelay = 60000, fixedDelay = 5000)
|
|
|
public void holderConneted() {
|
|
|
- if (iot_websocket_reconnect) {
|
|
|
+ for (IOTWebSocketClient client : IOTWebSocketClient.clientList) {
|
|
|
try {
|
|
|
- WebSocketClient outCallWebSocketClientHolder = IOTWebSocketClient.client;
|
|
|
- if (null == outCallWebSocketClientHolder) {
|
|
|
- log.debug("IOT当前连接还未建立");
|
|
|
- return;
|
|
|
- }
|
|
|
+ WebSocketClient outCallWebSocketClientHolder = client;
|
|
|
if (!outCallWebSocketClientHolder.isOpen()) {
|
|
|
log.error("IOT连接已经断开,正在重新连接,当前状态为[{}]", outCallWebSocketClientHolder.getReadyState());
|
|
|
if (outCallWebSocketClientHolder.getReadyState().equals(WebSocket.READYSTATE.CLOSING)
|
|
@@ -50,16 +46,15 @@ public class WebSocketCheckThread extends Thread {
|
|
|
log.error("IOT连接发生异常,尝试重新连接", e);
|
|
|
// 重连异常后删除旧的连接并重新连接
|
|
|
try {
|
|
|
- if (!IOTWebSocketClient.client.isOpen()) {
|
|
|
- IOTWebSocketClient.client.close();
|
|
|
+ if (!client.isOpen()) {
|
|
|
+ client.close();
|
|
|
}
|
|
|
} catch (Exception e2) {
|
|
|
log.error(e2.getMessage(), e2);
|
|
|
}
|
|
|
try {
|
|
|
- IOTWebSocketClient.client = new IOTWebSocketClient(new URI(Constant.iot_websocket_url + "?projectId="
|
|
|
- + RepositoryContainer.RepositoryProject.projectId.substring(2) + "&type=iot,text,pointset"));
|
|
|
- IOTWebSocketClient.client.connect();
|
|
|
+ // IOTWebSocketClient.client = new IOTWebSocketClient(serverUri);
|
|
|
+ client.connect();
|
|
|
} catch (Exception e2) {
|
|
|
log.error(e2.getMessage(), e2);
|
|
|
}
|
|
@@ -77,7 +72,7 @@ public class WebSocketCheckThread extends Thread {
|
|
|
log.error("Alarm连接已经断开,正在重新连接,当前状态为[{}]", outCallWebSocketClientHolder.getReadyState());
|
|
|
if (outCallWebSocketClientHolder.getReadyState().equals(WebSocket.READYSTATE.CLOSING)
|
|
|
|| outCallWebSocketClientHolder.getReadyState().equals(WebSocket.READYSTATE.CLOSED)
|
|
|
- ||outCallWebSocketClientHolder.getReadyState().equals(WebSocket.READYSTATE.NOT_YET_CONNECTED)) {
|
|
|
+ || outCallWebSocketClientHolder.getReadyState().equals(WebSocket.READYSTATE.NOT_YET_CONNECTED)) {
|
|
|
outCallWebSocketClientHolder.reconnect();
|
|
|
}
|
|
|
}
|