From 28f0818ba47d9d3f0f3c187356fa89cba2db748a Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Mon, 26 Oct 2020 16:06:58 +0800
Subject: [PATCH] 设备图标增加和风场风向计算更新
---
src/main/java/com/moral/config/WebSocketConfig.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/config/WebSocketConfig.java b/src/main/java/com/moral/config/WebSocketConfig.java
index dc2b9eb..5f40f0d 100644
--- a/src/main/java/com/moral/config/WebSocketConfig.java
+++ b/src/main/java/com/moral/config/WebSocketConfig.java
@@ -1,22 +1,40 @@
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() {
return new Jackson2JsonMessageConverter();
}
+ @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