浏览代码

优化规则实例删除

zhou-hao 5 年之前
父节点
当前提交
1031bc6879

+ 9 - 0
jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/service/RuleInstanceService.java

@@ -14,9 +14,11 @@ import org.jetlinks.rule.engine.api.Rule;
 import org.jetlinks.rule.engine.api.RuleEngine;
 import org.jetlinks.rule.engine.api.RuleInstanceContext;
 import org.jetlinks.rule.engine.api.model.RuleEngineModelParser;
+import org.reactivestreams.Publisher;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 @Service
@@ -69,6 +71,13 @@ public class RuleInstanceService extends GenericReactiveCrudService<RuleInstance
         });
     }
 
+    @Override
+    public Mono<Integer> deleteById(Publisher<String> idPublisher) {
+        return Flux.from(idPublisher)
+            .flatMap(id -> this.stop(id).thenReturn(id))
+            .as(super::deleteById);
+    }
+
     @Override
     public void run(String... args) {
         createQuery()