From a0d0ad8de7ac244aa29d1ca84d13b90e74729e33 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 19 Oct 2020 13:16:04 +0800
Subject: [PATCH] 增加获取六参五分钟平均值接口
---
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 6426c78..dd57a2a 100644
--- a/src/main/java/com/moral/config/WebSocketConfig.java
+++ b/src/main/java/com/moral/config/WebSocketConfig.java
@@ -1,6 +1,9 @@
package com.moral.config;
import com.moral.service.DeviceService;
+import com.moral.service.SensorService;
+import com.moral.webSocketServer.BSTestWebsocketServer;
+import com.moral.webSocketServer.BSWebsocketServer;
import com.moral.webSocketServer.WebSocketServer;
import com.moral.webSocketServer.WebSocketServerNew;
@@ -14,10 +17,11 @@
@Configuration
public class WebSocketConfig {
- @Bean
+ //���������������������������������
+ /*@Bean
public ServerEndpointExporter serverEndpointExporter() {
return new ServerEndpointExporter();
- }
+ }*/
@Bean
public MessageConverter jsonMessageConverter() {
@@ -28,6 +32,13 @@
public void setMessageService(DeviceService deviceService){
WebSocketServer.deviceService=deviceService;
WebSocketServerNew.deviceService=deviceService;
+ BSWebsocketServer.deviceService=deviceService;
+ BSTestWebsocketServer.deviceService=deviceService;
+ }
+ @Autowired
+ public void setSensorService( SensorService sensorService){
+ BSTestWebsocketServer.sensorService=sensorService;
+ BSWebsocketServer.sensorService=sensorService;
}
}
--
Gitblit v1.8.0