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

fixed #79

This commit is contained in:
zhou-hao 2021-07-27 10:00:40 +08:00
parent aefcbec026
commit 68af4adc4b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/service/DeviceMessageBusinessHandler.java
View File

@ -127,10 +127,13 @@ public class DeviceMessageBusinessHandler {
@Subscribe("/device/*/*/message/children/*/register")
@Transactional(propagation = Propagation.NEVER)
public Mono<Void> autoBindChildrenDevice(ChildDeviceMessage message) {
String childId = message.getChildDeviceId();
Message childMessage = message.getChildDeviceMessage();
if (childMessage instanceof DeviceRegisterMessage) {
String childId = ((DeviceRegisterMessage) childMessage).getDeviceId();
if (message.getDeviceId().equals(childId)) {
log.warn("子设备注册消息循环依赖:{}", message);
return Mono.empty();
}
return registry
.getDevice(childId)
.switchIfEmpty(Mono.defer(() -> doAutoRegister(((DeviceRegisterMessage) childMessage))))
@ -157,10 +160,9 @@ public class DeviceMessageBusinessHandler {
*/
@Subscribe("/device/*/*/message/children/*/unregister")
public Mono<Void> autoUnbindChildrenDevice(ChildDeviceMessage message) {
String childId = message.getChildDeviceId();
Message childMessage = message.getChildDeviceMessage();
if (childMessage instanceof DeviceUnRegisterMessage) {
String childId = ((DeviceUnRegisterMessage) childMessage).getDeviceId();
return registry
.getDevice(childId)
.flatMap(dev -> dev