suguo
/
jetlinks-community
mirror of https://gitee.com/jetlinks/jetlinks-community.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

优化deviceId为空的情况处理

This commit is contained in:
zhou-hao 2020-08-04 18:24:10 +08:00
parent 107cb8295d
commit 6993271eb6
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
jetlinks-components/network-component/mqtt-component/src/main/java/org/jetlinks/community/network/mqtt/gateway/device/MqttServerDeviceGateway.java
View File

@ -101,7 +101,7 @@ class MqttServerDeviceGateway implements DeviceGateway, MonitorSupportDeviceGate
.publishOn(Schedulers.parallel())
.flatMap(this::handleConnection)
.flatMap(tuple3 -> handleAuthResponse(tuple3.getT1(), tuple3.getT2(), tuple3.getT3()))
.flatMap(tp -> handleAcceptedMqttConnection(tp.getT1(), tp.getT2(), tp.getT3()) , Integer.MAX_VALUE)
.flatMap(tp -> handleAcceptedMqttConnection(tp.getT1(), tp.getT2(), tp.getT3()), Integer.MAX_VALUE)
.onErrorContinue((err, obj) -> log.error("处理MQTT连接失败", err))
.subscriberContext(ReactiveLogger.start("network", mqttServer.getId()))
.subscribe();
@ -231,24 +231,26 @@ class MqttServerDeviceGateway implements DeviceGateway, MonitorSupportDeviceGate
sink.next(msg);
}
String deviceId = msg.getDeviceId();
//返回了其他设备的消息,则自动创建会话
if (!deviceId.equals(operator.getDeviceId())) {
DeviceSession anotherSession = sessionManager.getSession(msg.getDeviceId());
if (anotherSession == null) {
if (!StringUtils.isEmpty(deviceId)) {
//返回了其他设备的消息,则自动创建会话
if (!deviceId.equals(operator.getDeviceId())) {
DeviceSession anotherSession = sessionManager.getSession(msg.getDeviceId());
if (anotherSession == null) {
connection.onClose(c -> sessionManager.unregister(deviceId));
connection.onClose(c -> sessionManager.unregister(deviceId));
return registry
.getDevice(msg.getDeviceId())
.doOnNext(device -> sessionManager.register(
new MqttConnectionSession(msg.getDeviceId(), device, getTransport(), connection) {
@Override
public Mono<Boolean> send(EncodedMessage encodedMessage) {
return super.send(encodedMessage).doOnSuccess(s -> gatewayMonitor.sentMessage());
}
}))
.then(messageHandler.handleMessage(operator, msg))
;
return registry
.getDevice(msg.getDeviceId())
.doOnNext(device -> sessionManager.register(
new MqttConnectionSession(msg.getDeviceId(), device, getTransport(), connection) {
@Override
public Mono<Boolean> send(EncodedMessage encodedMessage) {
return super.send(encodedMessage).doOnSuccess(s -> gatewayMonitor.sentMessage());
}
}))
.then(messageHandler.handleMessage(operator, msg))
;
}
}
}
//丢给默认的消息处理逻辑