ソースを参照

fixed 场景互联

18339543638 4 年 前
コミット
74c443a9c9

+ 2 - 1
jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/enums/RuleSceneState.java

@@ -8,7 +8,8 @@ import org.hswebframework.web.dict.EnumDict;
 @Getter
 public enum RuleSceneState implements EnumDict<String> {
 
-    running("运行中"),
+    disable("已禁用"),
+    started("已启动"),
     stopped("已停止");
 
     private String text;

+ 1 - 1
jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/model/RuleSceneModelParser.java

@@ -1,6 +1,6 @@
 package org.jetlinks.community.rule.engine.model;
 
-import cn.hutool.core.collection.CollectionUtil;
+
 import cn.hutool.json.JSONUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.hswebframework.web.bean.FastBeanCopier;

+ 1 - 1
jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/service/RuleSceneService.java

@@ -34,7 +34,7 @@ public class RuleSceneService extends GenericReactiveCrudService<RuleSceneEntity
             .save(Mono.just(entity.toRuleInstance()))
             .then(instanceService.start(entity.getId()))
             .then(createUpdate()
-                .set(RuleSceneEntity::getState, RuleSceneState.running)
+                .set(RuleSceneEntity::getState, RuleSceneState.started)
                 .where(entity::getId).execute())
             .then();
     }