From 6f70d5babbb4291f2f7b3059144368eb407fe7ed Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 01 Jul 2020 15:40:05 +0800
Subject: [PATCH] 无人机应用大屏页面update
---
src/main/java/com/moral/config/WebSocketConfig.java | 14 +++++++++++---
1 files changed, 11 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..71ac2eb 100644
--- a/src/main/java/com/moral/config/WebSocketConfig.java
+++ b/src/main/java/com/moral/config/WebSocketConfig.java
@@ -1,22 +1,30 @@
package com.moral.config;
+import com.moral.service.DeviceService;
+import com.moral.webSocketServer.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();
- }
+ }*/
@Bean
public MessageConverter jsonMessageConverter() {
return new Jackson2JsonMessageConverter();
}
+ @Autowired
+ public void setMessageService(DeviceService deviceService){
+ WebSocketServer.deviceService=deviceService;
+ }
+
}
--
Gitblit v1.8.0