fix:场景联动执行条件转换异常

 package org.thingsboard.server.common.data.yunteng.dto.scene;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.List;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.thingsboard.server.common.data.device.profile.AlarmRule;
 import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum;
-import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 
 /**
  * @Description 场景联动执行条件数据传输表 @Author cxy @Date 2021/11/24 17:33
@@ -34,13 +33,9 @@ public class DoConditionDTO extends TenantDTO {
   private List<String> entityId;
 
   @ApiModelProperty(value = "触发条件")
-  private AlarmRule triggerCondition;
+  private JsonNode triggerCondition;
 
   @ApiModelProperty(value = "场景联动id")
   private String sceneLinkageId;
 
-  public AlarmRule getTriggerCondition() {
-    return JacksonUtil.convertValue(triggerCondition,AlarmRule.class);
-  }
-
 }

@@ -338,7 +338,7 @@ public class TkSceneLinkageServiceImpl
                                 doConditionDTO.setTenantId(sceneLinkageDTO.getTenantId());
                                 doConditionDTO.setSceneLinkageId(sceneLinkageDTO.getId());
                                 TkDoConditionEntity entity = doConditionDTO.getEntity(TkDoConditionEntity.class);
-                                entity.setTriggerCondition(JacksonUtil.convertValue(doConditionDTO.getTriggerCondition(), JsonNode.class));
+                                entity.setTriggerCondition(doConditionDTO.getTriggerCondition());
                                 return entity;
                               })
                       .collect(Collectors.toList());