From a13506f193f38720ae2729f9c2ceb35bf9fdb898 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 28 Sep 2020 11:50:05 +0800
Subject: [PATCH] 更新获取风向和设备信息，添加经纬度，修改rabbit MQ代码。
---
src/main/java/com/moral/config/WebSocketConfig.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/config/WebSocketConfig.java b/src/main/java/com/moral/config/WebSocketConfig.java
index 71ac2eb..565181b 100644
--- a/src/main/java/com/moral/config/WebSocketConfig.java
+++ b/src/main/java/com/moral/config/WebSocketConfig.java
@@ -1,21 +1,26 @@
package com.moral.config;
import com.moral.service.DeviceService;
+import com.moral.service.SensorService;
+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();
- }*/
+ }
@Bean
public MessageConverter jsonMessageConverter() {
@@ -25,6 +30,12 @@
@Autowired
public void setMessageService(DeviceService deviceService){
WebSocketServer.deviceService=deviceService;
+ WebSocketServerNew.deviceService=deviceService;
+ BSWebsocketServer.deviceService=deviceService;
+ }
+ @Autowired
+ public void setSensorService( SensorService sensorService){
+ BSWebsocketServer.sensorService=sensorService;
}
}
--
Gitblit v1.8.0