Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-12-23 e745dd38c5a413eaa000c7c5434621fbcd1800d5

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

@@ -33,6 +33,7 @@
        WebSocketServerNew.deviceService=deviceService;
        BSWebsocketServer.deviceService=deviceService;
        BSAQIWebSocketServer.deviceService=deviceService;
        BSAQIWebSocketServerTest.deviceService=deviceService;
    }
    @Autowired
    public void setMessageService(AccountService accountService){
@@ -43,6 +44,8 @@
        BSWebsocketServer.sensorService=sensorService;
        BSAQIWebSocketServer.sensorService=sensorService;
        ElectronicSWebSocketServer.sensorService=sensorService;
        BSAQIWebSocketServerTest.sensorService=sensorService;
        ElectronicSWebSocketServer.sensorService=sensorService;
    }
    @Autowired
    public void setSensorUnitService( SensorUnitService sensorUnitService){