|
@@ -70,7 +70,8 @@ public class DeviceDirectiveController implements
|
|
|
registry.getDevice(directive.getDeviceId())
|
|
registry.getDevice(directive.getDeviceId())
|
|
|
.flatMap(operator -> Mono.just(operator.messageSender()))
|
|
.flatMap(operator -> Mono.just(operator.messageSender()))
|
|
|
.flatMap(sender->{
|
|
.flatMap(sender->{
|
|
|
- directive.getDownstream().addHeader(Headers.async,true);
|
|
|
|
|
|
|
+ //同步进行
|
|
|
|
|
+ directive.getDownstream().addHeader(Headers.async,false);
|
|
|
( (CommonDeviceMessage)directive.getDownstream()).setMessageId(IdUtils.newUUID());
|
|
( (CommonDeviceMessage)directive.getDownstream()).setMessageId(IdUtils.newUUID());
|
|
|
( (CommonDeviceMessage)directive.getDownstream()).setTimestamp(System.currentTimeMillis());
|
|
( (CommonDeviceMessage)directive.getDownstream()).setTimestamp(System.currentTimeMillis());
|
|
|
return sender.send(directive.getDownstream())
|
|
return sender.send(directive.getDownstream())
|
|
@@ -94,6 +95,7 @@ public class DeviceDirectiveController implements
|
|
|
return Flux.fromStream(t2.stream())
|
|
return Flux.fromStream(t2.stream())
|
|
|
.flatMap(operator -> Mono.just(operator.messageSender()))
|
|
.flatMap(operator -> Mono.just(operator.messageSender()))
|
|
|
.flatMap(sender->{
|
|
.flatMap(sender->{
|
|
|
|
|
+ //同步进行
|
|
|
message.addHeader(Headers.async,false);
|
|
message.addHeader(Headers.async,false);
|
|
|
return sender.send(message)
|
|
return sender.send(message)
|
|
|
.onErrorContinue((e,obj)->log.warn("指令下发失败{}",message))
|
|
.onErrorContinue((e,obj)->log.warn("指令下发失败{}",message))
|