Преглед изворни кода

add 网桥设备新增设备

18339543638 пре 4 година
родитељ
комит
5036fc2098

+ 9 - 9
jetlinks-manager/bridge-manager/src/main/java/org/jetlinks/community/bridge/web/AliBridgeServerController.java

@@ -155,15 +155,15 @@ public class AliBridgeServerController implements
         return bridgeService.findById(id)
             .defaultIfEmpty(bridge)
             .flatMap(oldBridge-> bridgeGateway.replaceBridgeServer(oldBridge.getNodeId(),oldBridge.getId(),bridge))
-            .flatMap(nowBridge->
-                bridgeService.save(bridge)
-                    .concatWith(bridgeDeviceService.createQuery()
-                        .where(AliIotBridgeDeviceConfig::getBridgeId,bridge.getId())
-                        .fetch()
-                        .flatMap(deviceConfig->
-                            bridgeGateway.registerDevice(bridge.getNodeId(),bridge.getId(),deviceConfig).then(Mono.empty())
-                        )).then()
-            );
+            .concatWith(  bridgeService.save(bridge).then(Mono.empty()))
+            .concatWith(bridgeDeviceService.createQuery()
+                .where(AliIotBridgeDeviceConfig::getBridgeId,bridge.getId())
+                .fetch()
+                .flatMap(deviceConfig->
+                    bridgeGateway.registerDevice(bridge.getNodeId(),bridge.getId(),deviceConfig).then(Mono.empty())
+                ))
+            .then(Mono.empty())
+            .then();
     }