Переглянути джерело

fixed 设备删除
add 集群消息回复
add 集群id不可重复

18339543638 4 роки тому
батько
коміт
ddf4f0dc31

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

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