fix: 数据转换BUG，增加originator fields跟script

@@ -2,6 +2,7 @@ package org.thingsboard.server.dao.yunteng.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
@@ -23,10 +24,7 @@ import org.thingsboard.server.dao.yunteng.mapper.ConvertConfigMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.ConvertConfigService;
 import org.thingsboard.server.dao.yunteng.service.ConvertConfigService;
 
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicInteger;
 
 
 @Slf4j
 @Slf4j
@@ -36,6 +34,9 @@ public class ConvertConfigServiceImpl
     extends AbstractBaseService<ConvertConfigMapper, ConvertConfig>
     extends AbstractBaseService<ConvertConfigMapper, ConvertConfig>
     implements ConvertConfigService {
     implements ConvertConfigService {
   private final String connectionType = "Success";
   private final String connectionType = "Success";
+  private final String originatorType =
+      "org.thingsboard.rule.engine.metadata.TbGetOriginatorFieldsNode";
+  private final String scriptType = "org.thingsboard.rule.engine.transform.TbTransformMsgNode";
 
 
   @Override
   @Override
   public YtPageData<ConvertConfigDTO> page(String tenantId, Map<String, Object> queryMap) {
   public YtPageData<ConvertConfigDTO> page(String tenantId, Map<String, Object> queryMap) {
@@ -292,6 +293,8 @@ public class ConvertConfigServiceImpl
         });
         });
     if (matchNode.get() == 0) {
     if (matchNode.get() == 0) {
       needDelete = false;
       needDelete = false;
+    } else {
+      needDeleteOriginatorFieldsAndScript(ruleChainMetaData);
     }
     }
     return needDelete;
     return needDelete;
   }
   }
@@ -342,15 +345,43 @@ public class ConvertConfigServiceImpl
       }
       }
       seriesIndex++;
       seriesIndex++;
     }
     }
+
+    int scriptIndex = 0;
+    boolean hadScript = false;
+    for (RuleNode ruleNode : ruleChainMetaData.getNodes()) {
+      if (ruleNode.getType().equals(scriptType)) {
+        hadScript = true;
+        break;
+      }
+      scriptIndex++;
+    }
+    if (!hadScript) {
+      // 2. add originator fields and script
+      Map<String, String> types = new HashMap<>();
+      // originator fields start
+      Map<String, Map<String, String>> originator = new HashMap<>();
+      Map<String, String> fields = new HashMap<>();
+      fields.put("id", "deviceId");
+      originator.put("fieldsMapping", fields);
+      types.put(originatorType, JacksonUtil.toString(originator));
+
+      // script start
+      Map<String, String> scriptMap = new HashMap<>();
+      scriptMap.put(
+          "jsScript",
+          "msg.deviceId = metadata.deviceId;\nmsg.deviceName = metadata.deviceName;\nmsg.deviceType = metadata.deviceType;\nmsg.ts = metadata.ts;\nreturn {msg: msg, metadata: metadata, msgType: msgType};");
+      types.put(scriptType, JacksonUtil.toString(scriptMap));
+      scriptIndex = addOriginatorFieldsAndScript(types, ruleChainMetaData, seriesIndex);
+    }
     // 2. SETUP CONNECTION
     // 2. SETUP CONNECTION
     // 3. ADD RULE NODE
     // 3. ADD RULE NODE
-    int finalSeriesIndex = seriesIndex;
     int layoutX = 1140;
     int layoutX = 1140;
     int layoutY = 170;
     int layoutY = 170;
+    int finalScriptIndex = scriptIndex;
     nodes.forEach(
     nodes.forEach(
         ruleNode -> {
         ruleNode -> {
           NodeConnectionInfo nodeConnectionInfo = new NodeConnectionInfo();
           NodeConnectionInfo nodeConnectionInfo = new NodeConnectionInfo();
-          nodeConnectionInfo.setFromIndex(finalSeriesIndex);
+          nodeConnectionInfo.setFromIndex(finalScriptIndex);
           nodeConnectionInfo.setType(connectionType);
           nodeConnectionInfo.setType(connectionType);
           nodeConnectionInfo.setToIndex(ruleChainMetaData.getNodes().size());
           nodeConnectionInfo.setToIndex(ruleChainMetaData.getNodes().size());
           ObjectNode objectNode = setAdditionalInfo(layoutX, layoutY);
           ObjectNode objectNode = setAdditionalInfo(layoutX, layoutY);
@@ -360,6 +391,90 @@ public class ConvertConfigServiceImpl
         });
         });
   }
   }
 
 
+  private void needDeleteOriginatorFieldsAndScript(RuleChainMetaData ruleChainMetaData) {
+    // 如果script下面节点全部删除完了，就删除originator fields 和 script
+    int findOriginatorIndex = 0;
+    for (RuleNode ruleNode : ruleChainMetaData.getNodes()) {
+      // 先找originator fields
+      if (ruleNode.getType().equals(originatorType)) {
+        break;
+      }
+      findOriginatorIndex++;
+    }
+    int findScriptIndex = 0;
+    for (NodeConnectionInfo nodeConnectionInfo : ruleChainMetaData.getConnections()) {
+      if (nodeConnectionInfo.getFromIndex() == findOriginatorIndex) {
+        findScriptIndex = nodeConnectionInfo.getToIndex();
+        break;
+      }
+    }
+    int findSons = 0;
+    for (NodeConnectionInfo nodeConnectionInfo : ruleChainMetaData.getConnections()) {
+      if (nodeConnectionInfo.getFromIndex() == findScriptIndex) {
+        findSons++;
+      }
+    }
+    if (findSons == 0) {
+      deleteOriginatorFieldsAndScript(findOriginatorIndex, findScriptIndex, ruleChainMetaData);
+    }
+  }
+
+  private void deleteOriginatorFieldsAndScript(
+      int deleteOriginatorIndex, int deleteScriptIndex, RuleChainMetaData ruleChainMetaData) {
+    ruleChainMetaData.getNodes().remove(deleteScriptIndex);
+    ruleChainMetaData.getNodes().remove(deleteOriginatorIndex);
+    ruleChainMetaData.setFirstNodeIndex(
+        ruleChainMetaData.getFirstNodeIndex() - 2 < 0
+            ? 0
+            : ruleChainMetaData.getFirstNodeIndex() - 2);
+    List<NodeConnectionInfo> newNodeConnectionInfo = new ArrayList<>();
+    for (NodeConnectionInfo nodeConnectionInfo : ruleChainMetaData.getConnections()) {
+      if (nodeConnectionInfo.getFromIndex() != deleteOriginatorIndex
+          && nodeConnectionInfo.getToIndex() != deleteOriginatorIndex) {
+        nodeConnectionInfo.setFromIndex(
+            nodeConnectionInfo.getFromIndex() - 2 < 0 ? 0 : nodeConnectionInfo.getFromIndex() - 2);
+        nodeConnectionInfo.setToIndex(
+            nodeConnectionInfo.getToIndex() - 2 < 0 ? 0 : nodeConnectionInfo.getToIndex() - 2);
+        newNodeConnectionInfo.add(nodeConnectionInfo);
+      }
+    }
+    ruleChainMetaData.setConnections(newNodeConnectionInfo);
+  }
+
+  private int addOriginatorFieldsAndScript(
+      Map<String, String> types, RuleChainMetaData ruleChainMetaData, int timeSeriesIndex) {
+    AtomicInteger scriptIndex = new AtomicInteger();
+    types
+        .keySet()
+        .forEach(
+            type -> {
+              NodeConnectionInfo nodeConnectionInfo = new NodeConnectionInfo();
+              int fromIndex;
+              int toIndex = ruleChainMetaData.getNodes().size();
+              if (type.equals(originatorType)) {
+                fromIndex = timeSeriesIndex;
+              } else {
+                scriptIndex.set(toIndex);
+                fromIndex = ruleChainMetaData.getNodes().size() - 1;
+              }
+              int layoutX = 1240;
+              int layoutY = 160;
+              nodeConnectionInfo.setFromIndex(fromIndex);
+              nodeConnectionInfo.setType(connectionType);
+              nodeConnectionInfo.setToIndex(toIndex);
+              ruleChainMetaData.getConnections().add(nodeConnectionInfo);
+              RuleNode ruleNode = new RuleNode();
+              ruleNode.setName("dataConvert");
+              ruleNode.setType(type);
+              JsonNode jsonNode = JacksonUtil.toJsonNode(types.get(type));
+              ruleNode.setConfiguration(jsonNode);
+              ObjectNode objectNode = setAdditionalInfo(layoutX, layoutY);
+              ruleNode.setAdditionalInfo(objectNode);
+              ruleChainMetaData.getNodes().add(ruleNode);
+            });
+    return scriptIndex.get();
+  }
+
   private void addConvertJSRuleNode(List<RuleNode> nodes, RuleChainMetaData ruleChainMetaData) {
   private void addConvertJSRuleNode(List<RuleNode> nodes, RuleChainMetaData ruleChainMetaData) {
     // 1. Get Device Profile nodeIndex
     // 1. Get Device Profile nodeIndex
     int firstNodeIndex = ruleChainMetaData.getFirstNodeIndex();
     int firstNodeIndex = ruleChainMetaData.getFirstNodeIndex();

@@ -198,7 +198,8 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     if (StringUtils.isEmpty(id)) {
     if (StringUtils.isEmpty(id)) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
     }
-    return baseMapper.selectById(id).getDTO(UserDTO.class);
+    User user = baseMapper.selectById(id);
+    return null !=user?user.getDTO(UserDTO.class):null;
   }
   }
 
 
   @Override
   @Override