Forráskód Böngészése

fix 媒体设备集群下线监听

18339543638 3 éve
szülő
commit
96ca2cf71a

+ 1 - 1
jetlinks-manager/media-manager/src/main/java/org/jetlinks/community/media/service/LocalMediaDeviceService.java

@@ -213,7 +213,7 @@ public class LocalMediaDeviceService extends GenericReactiveCrudService<MediaDev
             .flatMap(node->{
                 Set<Object> members = redisUtil.members("session_" + node.getId());
                 redisUtil.del("session_"+ node.getId());
-                return Mono.just(members);
+                return Mono.justOrEmpty(members);
             })
             .flatMap(ids->{
                 if(CollectionUtil.isNotEmpty(ids)){

+ 4 - 1
jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/device/DeviceAlarmRule.java

@@ -190,8 +190,11 @@ public class DeviceAlarmRule implements Serializable {
         timer(Arrays.asList(
             MessageType.properties,
             MessageType.function
-        ));
+        )),
 
+        manual(Arrays.asList(
+            MessageType.values()
+              ));
         final List<MessageType> supportMessageTypes;
 
     }

+ 1 - 5
jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/device/RuleSceneTaskExecutorProvider.java

@@ -19,21 +19,17 @@ import org.jetlinks.rule.engine.api.task.Task;
 import org.jetlinks.rule.engine.api.task.TaskExecutor;
 import org.jetlinks.rule.engine.api.task.TaskExecutorProvider;
 import org.jetlinks.rule.engine.defaults.AbstractTaskExecutor;
-import org.jetlinks.supports.event.BrokerEventBus;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 import reactor.core.Disposable;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Scheduler;
-import reactor.core.scheduler.Schedulers;
 import reactor.util.function.Tuples;
 
 import java.time.Duration;
 import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @Slf4j
 @AllArgsConstructor