|
@@ -32,19 +32,15 @@ public class AliBridgeService extends GenericReactiveCacheSupportCrudService<Ali
|
|
|
public void run(String... args) {
|
|
public void run(String... args) {
|
|
|
this.createQuery()
|
|
this.createQuery()
|
|
|
.where(AliIotBridgeEntity::getState, BridgeStatus.running)
|
|
.where(AliIotBridgeEntity::getState, BridgeStatus.running)
|
|
|
- .where(AliIotBridgeEntity::getNodeId,clusterManager.getClusterName())
|
|
|
|
|
|
|
+ .where(AliIotBridgeEntity::getNodeId,clusterManager.getCurrentServerId())
|
|
|
.fetch()
|
|
.fetch()
|
|
|
.flatMap(bridgeParam->bridgeGateway.initBridge(bridgeParam)
|
|
.flatMap(bridgeParam->bridgeGateway.initBridge(bridgeParam)
|
|
|
.concatWith(bridgeDeviceService.createQuery()
|
|
.concatWith(bridgeDeviceService.createQuery()
|
|
|
.where(AliIotBridgeDeviceConfig::getBridgeId,bridgeParam.getId())
|
|
.where(AliIotBridgeDeviceConfig::getBridgeId,bridgeParam.getId())
|
|
|
.fetch()
|
|
.fetch()
|
|
|
.flatMap(deviceConfig->
|
|
.flatMap(deviceConfig->
|
|
|
- bridgeGateway.getBridgeServer()
|
|
|
|
|
- .flatMap(bridgeServe->
|
|
|
|
|
- bridgeServe
|
|
|
|
|
- .register(deviceConfig.getOriginalIdentity(),deviceConfig.getProductKey(),deviceConfig.getDeviceName(),deviceConfig.getDeviceSecret()))
|
|
|
|
|
- .then(Mono.empty()))
|
|
|
|
|
- ))
|
|
|
|
|
|
|
+ bridgeGateway.registerDevice(clusterManager.getCurrentServerId(),deviceConfig)
|
|
|
|
|
+ )))
|
|
|
.subscribe();
|
|
.subscribe();
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|