|
|
@@ -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();
|
|
|
}
|
|
|
|
|
|
|