Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-12-23 e745dd38c5a413eaa000c7c5434621fbcd1800d5

 src/main/java/com/moral/config/WebSocketConfig.java

@@ -1,7 +1,9 @@
package com.moral.config;

import com.moral.service.AccountService;
import com.moral.service.DeviceService;
import com.moral.service.SensorService;
import com.moral.service.SensorUnitService;
import com.moral.webSocketServer.*;

import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
@@ -34,10 +36,22 @@
        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;
    }



}