From e6a8f8388901749b66a36c0b5e5f2984efcea7e6 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 15 Dec 2020 14:03:46 +0800
Subject: [PATCH] 增加新的websocket，取消中文转化参数功能。
---
src/main/java/com/moral/config/WebSocketConfig.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/config/WebSocketConfig.java b/src/main/java/com/moral/config/WebSocketConfig.java
index 513e2d7..a021668 100644
--- a/src/main/java/com/moral/config/WebSocketConfig.java
+++ b/src/main/java/com/moral/config/WebSocketConfig.java
@@ -1,14 +1,21 @@
package com.moral.config;
+import com.moral.service.DeviceService;
+import com.moral.service.SensorService;
+import com.moral.webSocketServer.*;
+
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();
}*/
@@ -18,4 +25,19 @@
return new Jackson2JsonMessageConverter();
}
+ @Autowired
+ public void setMessageService(DeviceService deviceService){
+ WebSocketServer.deviceService=deviceService;
+ WebSocketServerNew.deviceService=deviceService;
+ BSWebsocketServer.deviceService=deviceService;
+ BSAQIWebSocketServer.deviceService=deviceService;
+ BSAQIWebSocketServerTest.deviceService=deviceService;
+ }
+ @Autowired
+ public void setSensorService( SensorService sensorService){
+ BSWebsocketServer.sensorService=sensorService;
+ BSAQIWebSocketServer.sensorService=sensorService;
+ BSAQIWebSocketServerTest.sensorService=sensorService;
+ }
+
}
--
Gitblit v1.8.0