|
|
@@ -62,12 +62,11 @@ public class AliBridgeServerController implements
|
|
|
@DeleteAction
|
|
|
public Mono<Void> deleteBridge(@PathVariable("bridgeId")String id){
|
|
|
return bridgeService.findById(id)
|
|
|
- .flatMap(bridge->Mono.zip(
|
|
|
+ .concatWith( bridgeService.deleteById(id).then(Mono.empty()))
|
|
|
+ .flatMap(bridge->
|
|
|
bridgeGateway.delBridgeServer(bridge.getNodeId(),bridge.getId())
|
|
|
- ,bridgeService.deleteById(id))
|
|
|
- .concatWith(bridgeDeviceService.createDelete().where(AliIotBridgeDeviceConfig::getBridgeId,id).execute().then(Mono.empty()))
|
|
|
- .then()
|
|
|
- );
|
|
|
+ .flatMap(ignore->bridgeDeviceService.createDelete().where(AliIotBridgeDeviceConfig::getBridgeId,id).execute())
|
|
|
+ ).then();
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -161,6 +160,4 @@ public class AliBridgeServerController implements
|
|
|
.then(Mono.empty())
|
|
|
.then();
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
}
|