Merge branch '20200307' into 'master'

feat: 设备配置编辑异常

See merge request huang/thingsboard3.3.2!61

 package org.thingsboard.server.common.data.yunteng.dto;
 package org.thingsboard.server.common.data.yunteng.dto;
 
 
+import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
@@ -22,7 +23,7 @@ public class DoActionDTO  extends  TenantDTO{
 
 
 
 
     @ApiModelProperty(value = "场景联动内容")
     @ApiModelProperty(value = "场景联动内容")
-    private String doContext;
+    private JsonNode doContext;
 
 
     @ApiModelProperty(value = "输出目标:设备,场景,其他")
     @ApiModelProperty(value = "输出目标:设备,场景,其他")
     private ActionTypeEnum outTarget;
     private ActionTypeEnum outTarget;

@@ -2,6 +2,8 @@ package org.thingsboard.server.dao.yunteng.entities;
 
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import org.apache.ibatis.type.EnumTypeHandler;
 import org.apache.ibatis.type.EnumTypeHandler;
@@ -24,7 +26,8 @@ public class DoAction extends TenantBaseEntity {
     /**
     /**
      * 场景联动内容
      * 场景联动内容
      */
      */
-    private String doContext;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private JsonNode doContext;
 
 
     /**
     /**
      * 场景联动id
      * 场景联动id

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -219,9 +220,10 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
                         .map(doActionDTO -> {
                         .map(doActionDTO -> {
                             doActionDTO.setTenantId(sceneLinkageDTO.getTenantId());
                             doActionDTO.setTenantId(sceneLinkageDTO.getTenantId());
                             doActionDTO.setSceneLinkageId(sceneLinkageDTO.getId());
                             doActionDTO.setSceneLinkageId(sceneLinkageDTO.getId());
-                            StringBuilder contextBuilder = new StringBuilder("{\"method\": \"methodThingskit\",\"params\": ");
-                            contextBuilder.append(doActionDTO.getDoContext());
-                            doActionDTO.setDoContext(contextBuilder.toString());
+                            ObjectNode doContext = JacksonUtil.newObjectNode();
+                            doContext.put("method","methodThingskit");
+                            doContext.put("params",doActionDTO.getDoContext());
+                            doActionDTO.setDoContext(doContext);
                             return doActionDTO.getEntity(DoAction.class);
                             return doActionDTO.getEntity(DoAction.class);
                         })
                         })
                         .collect(Collectors.toList());
                         .collect(Collectors.toList());

@@ -84,7 +84,9 @@ public class YtDeviceProfileServiceImpl
                         alarmProfileMapper.insert(alarmProfile);
                         alarmProfileMapper.insert(alarmProfile);
                     }
                     }
                 });
                 });
-        Optional.ofNullable(oldIds).ifPresent(item -> alarmProfileMapper.deleteBatchIds(item));
+        if(!oldIds.isEmpty()){
+            alarmProfileMapper.deleteBatchIds(oldIds);
+        }
         return deviceProfileDTO;
         return deviceProfileDTO;
     }
     }
 
 

@@ -5,7 +5,7 @@
     <resultMap id="actionDTO" type="org.thingsboard.server.common.data.yunteng.dto.DoActionDTO">
     <resultMap id="actionDTO" type="org.thingsboard.server.common.data.yunteng.dto.DoActionDTO">
         <result property="id" column="id"/>
         <result property="id" column="id"/>
         <result property="deviceId" column="device_id"/>
         <result property="deviceId" column="device_id"/>
-        <result property="doContext" column="do_context"/>
+        <result property="doContext" column="do_context" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
         <result property="outTarget" column="out_target" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
         <result property="outTarget" column="out_target" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
         <result property="sceneLinkageId" column="scene_linkage_id"/>
         <result property="sceneLinkageId" column="scene_linkage_id"/>
         <result property="description" column="description"/>
         <result property="description" column="description"/>

@@ -3,6 +3,7 @@
  */
  */
 package org.thingsboard.rule.engine.yunteng.scene;
 package org.thingsboard.rule.engine.yunteng.scene;
 
 
+import com.fasterxml.jackson.databind.JsonNode;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.NotNull;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.api.TbContext;
@@ -12,6 +13,7 @@ import org.thingsboard.server.common.data.device.profile.AlarmConditionFilter;
 import org.thingsboard.server.common.data.device.profile.AlarmConditionFilterKey;
 import org.thingsboard.server.common.data.device.profile.AlarmConditionFilterKey;
 import org.thingsboard.server.common.data.rule.RuleNodeState;
 import org.thingsboard.server.common.data.rule.RuleNodeState;
 import org.thingsboard.server.common.data.yunteng.dto.TriggerDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TriggerDTO;
+import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
@@ -176,7 +178,7 @@ class ReactState {
         }
         }
     }
     }
 
 
-    private TbMsg rpcMsg(TbContext ctx, TbMsg msg,String context){
+    private TbMsg rpcMsg(TbContext ctx, TbMsg msg, JsonNode context){
         String lastMsgQueueName = msg.getQueueName();
         String lastMsgQueueName = msg.getQueueName();
         TbMsgMetaData metaData = msg.getMetaData();
         TbMsgMetaData metaData = msg.getMetaData();
                 metaData.putValue(DataConstants.IS_CLEARED_ALARM, Boolean.TRUE.toString());
                 metaData.putValue(DataConstants.IS_CLEARED_ALARM, Boolean.TRUE.toString());
@@ -185,7 +187,7 @@ class ReactState {
                 , msg.getOriginator()
                 , msg.getOriginator()
                 , msg != null ? msg.getCustomerId() : null
                 , msg != null ? msg.getCustomerId() : null
                 , metaData
                 , metaData
-                , context);
+                , JacksonUtil.toString(context));
         return newMsg;
         return newMsg;
     }
     }
 }
 }