From 8fb013a6d6707929799e9f7a8a82f311cbca29ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Dec 2020 14:47:04 +0800
Subject: [PATCH] update大屏年，月数据查询接口
---
src/main/java/com/moral/config/WebSocketConfig.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/config/WebSocketConfig.java b/src/main/java/com/moral/config/WebSocketConfig.java
index 565181b..5bb5e61 100644
--- a/src/main/java/com/moral/config/WebSocketConfig.java
+++ b/src/main/java/com/moral/config/WebSocketConfig.java
@@ -1,11 +1,11 @@
package com.moral.config;
+import com.moral.service.AccountService;
import com.moral.service.DeviceService;
import com.moral.service.SensorService;
-import com.moral.webSocketServer.BSWebsocketServer;
-import com.moral.webSocketServer.WebSocketServer;
+import com.moral.service.SensorUnitService;
+import com.moral.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;
@@ -17,10 +17,10 @@
public class WebSocketConfig {
//���������������������������������
- @Bean
+ /*@Bean
public ServerEndpointExporter serverEndpointExporter() {
return new ServerEndpointExporter();
- }
+ }*/
@Bean
public MessageConverter jsonMessageConverter() {
@@ -32,10 +32,26 @@
WebSocketServer.deviceService=deviceService;
WebSocketServerNew.deviceService=deviceService;
BSWebsocketServer.deviceService=deviceService;
+ BSAQIWebSocketServer.deviceService=deviceService;
+ BSAQIWebSocketServerTest.deviceService=deviceService;
+ }
+ @Autowired
+ public void setMessageService(AccountService accountService){
+ ElectronicSWebSocketServer.accountService=accountService;
}
@Autowired
public void setSensorService( SensorService sensorService){
BSWebsocketServer.sensorService=sensorService;
+ BSAQIWebSocketServer.sensorService=sensorService;
+ ElectronicSWebSocketServer.sensorService=sensorService;
+ BSAQIWebSocketServerTest.sensorService=sensorService;
+ ElectronicSWebSocketServer.sensorService=sensorService;
}
+ @Autowired
+ public void setSensorUnitService( SensorUnitService sensorUnitService){
+ ElectronicSWebSocketServer.sensorUnitService=sensorUnitService;
+ }
+
+
}
--
Gitblit v1.8.0