优化规则引擎

jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/entity/RuleInstanceEntity.java

@@ -10,6 +10,7 @@ import org.jetlinks.community.rule.engine.enums.RuleInstanceState;
 import org.jetlinks.rule.engine.api.Rule;
 import org.jetlinks.rule.engine.api.model.RuleEngineModelParser;
 import org.jetlinks.rule.engine.api.model.RuleModel;
+import org.springframework.util.StringUtils;
 
 import javax.persistence.Column;
 import javax.persistence.GeneratedValue;
@@ -64,6 +65,8 @@ public class RuleInstanceEntity extends GenericEntity<String> implements RecordC
 
     public Rule toRule(RuleEngineModelParser parser) {
         RuleModel model = parser.parse(modelType, modelMeta);
+        model.setId(StringUtils.hasText(modelId)?modelId:getId());
+        model.setName(name);
         Rule rule = new Rule();
         rule.setModel(model);
         rule.setVersion(modelVersion);