From 57ac79239ce487db3447345a349296e9493248ce Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 01 Dec 2020 11:02:22 +0800
Subject: [PATCH] 恢复大屏调用接口
---
src/main/java/com/moral/config/WebSocketConfig.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/config/WebSocketConfig.java b/src/main/java/com/moral/config/WebSocketConfig.java
index 71ac2eb..df8b756 100644
--- a/src/main/java/com/moral/config/WebSocketConfig.java
+++ b/src/main/java/com/moral/config/WebSocketConfig.java
@@ -1,18 +1,24 @@
package com.moral.config;
import com.moral.service.DeviceService;
+import com.moral.service.SensorService;
+import com.moral.webSocketServer.BSAQIWebSocketServer;
+import com.moral.webSocketServer.BSWebsocketServer;
import com.moral.webSocketServer.WebSocketServer;
+import com.moral.webSocketServer.WebSocketServerNew;
import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
import org.springframework.amqp.support.converter.MessageConverter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
@Configuration
public class WebSocketConfig {
- /* @Bean
+ //���������������������������������
+ /*@Bean
public ServerEndpointExporter serverEndpointExporter() {
return new ServerEndpointExporter();
}*/
@@ -25,6 +31,14 @@
@Autowired
public void setMessageService(DeviceService deviceService){
WebSocketServer.deviceService=deviceService;
+ WebSocketServerNew.deviceService=deviceService;
+ BSWebsocketServer.deviceService=deviceService;
+ BSAQIWebSocketServer.deviceService=deviceService;
+ }
+ @Autowired
+ public void setSensorService( SensorService sensorService){
+ BSWebsocketServer.sensorService=sensorService;
+ BSAQIWebSocketServer.sensorService=sensorService;
}
}
--
Gitblit v1.8.0