fix(场景联动):修复设备选择器条件会无线叠加问题

jetlinks-components/rule-engine-component/src/main/java/org/jetlinks/community/rule/engine/executor/device/CompositeDeviceSelectorProvider.java

@@ -7,6 +7,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.function.BiFunction;
 
 public class CompositeDeviceSelectorProvider implements DeviceSelectorProvider {
 
@@ -49,4 +50,28 @@ public <T extends Conditional<T>> Mono<NestConditional<T>> applyCondition(Device
         }
         return handler == null ? Mono.just(conditional) : handler;
     }
+
+    @Override
+    public <T extends Conditional<T>> BiFunction<
+        NestConditional<T>,
+        Map<String, Object>,
+        Mono<NestConditional<T>>> createLazy(DeviceSelectorSpec source) {
+
+        BiFunction<NestConditional<T>, Map<String, Object>, Mono<NestConditional<T>>> function = null;
+
+        for (SelectorValue selectorValue : source.getSelectorValues()) {
+            DeviceSelectorSpec spec = FastBeanCopier.copy(selectorValue.getValue(), new DeviceSelectorSpec());
+            DeviceSelectorProvider provider = DeviceSelectorProviders.getProviderNow(spec.getSelector());
+
+            BiFunction<NestConditional<T>, Map<String, Object>, Mono<NestConditional<T>>> that = provider.createLazy(spec);
+            if (function == null) {
+                function = that;
+            } else {
+                BiFunction<NestConditional<T>, Map<String, Object>, Mono<NestConditional<T>>> temp = function;
+
+                function = (condition, ctx) -> temp.apply(condition, ctx).flatMap(ctd -> that.apply(condition, ctx));
+            }
+        }
+        return function == null ? (condition, ignore) -> Mono.just(condition) : function;
+    }
 }

jetlinks-components/rule-engine-component/src/main/java/org/jetlinks/community/rule/engine/executor/device/DeviceSelectorProvider.java

@@ -7,6 +7,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
@@ -24,10 +25,9 @@ <T extends Conditional<T>> Mono<NestConditional<T>> applyCondition(DeviceSelecto
                                                                        NestConditional<T> conditional);
 
 
-    default <T extends Conditional<T>> Function<Map<String, Object>, Mono<NestConditional<T>>> createLazy(
-        DeviceSelectorSpec source,
-        Supplier<NestConditional<T>> conditionalSupplier) {
-        return ctx -> applyCondition(source, ctx, conditionalSupplier.get());
+    default <T extends Conditional<T>> BiFunction<NestConditional<T>, Map<String, Object>, Mono<NestConditional<T>>> createLazy(
+        DeviceSelectorSpec source) {
+        return (condition, ctx) -> applyCondition(source, ctx, condition);
     }
 
     @Override

jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/function/ReactorQLDeviceSelectorBuilder.java

@@ -21,6 +21,7 @@
 import reactor.core.publisher.Mono;
 
 import java.util.Map;
+import java.util.function.BiFunction;
 import java.util.function.Function;
 
 /**
@@ -62,15 +63,19 @@ public DeviceSelector createSelector(DeviceSelectorSpec spec) {
                     .flatMap(registry::getDevice);
             };
         }
-        Function<Map<String, Object>, Mono<NestConditional<ReactiveQuery<DeviceInstanceEntity>>>> lazy = provider
-            .createLazy(spec,
-                        Lazy.of(() -> deviceRepository
-                            .createQuery()
-                            .select(DeviceInstanceEntity::getId)
-                            .nest()));
 
-        return context -> lazy
-            .apply(context)
+        BiFunction<NestConditional<ReactiveQuery<DeviceInstanceEntity>>,
+            Map<String, Object>,
+            Mono<NestConditional<ReactiveQuery<DeviceInstanceEntity>>>> function = provider
+            .createLazy(spec);
+
+        return context -> function
+            .apply(deviceRepository
+                       .createQuery()
+                       .select(DeviceInstanceEntity::getId)
+                       .nest(),
+                   context
+            )
             .flatMapMany(ctd -> ctd.end().fetch().map(DeviceInstanceEntity::getId))
             .flatMap(registry::getDevice);
     }

jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/function/RelationDeviceSelectorProvider.java

@@ -1,7 +1,7 @@
 package org.jetlinks.community.device.function;
 
 import lombok.AllArgsConstructor;
-import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections.CollectionUtils;
 import org.hswebframework.ezorm.core.Conditional;
 import org.hswebframework.ezorm.core.NestConditional;
 import org.jetlinks.core.things.relation.ObjectSpec;
@@ -81,8 +81,13 @@ public <T extends Conditional<T>> Mono<NestConditional<T>> applyCondition(Flux<S
                 }))
             .map(RelationObject::getId)
             .collectList()
-            .filter(CollectionUtils::isNotEmpty)
-            .doOnNext(deviceIdList -> conditional.in(DeviceInstanceEntity::getId, deviceIdList))
+            .doOnNext(deviceIdList -> {
+                if (CollectionUtils.isNotEmpty(deviceIdList)){
+                    conditional.in(DeviceInstanceEntity::getId, deviceIdList);
+                }else {
+                    conditional.isNull(DeviceInstanceEntity::getId);
+                }
+            })
             .thenReturn(conditional);
     }
 }