优化地图-添加地图页面以及设备树

648540858

2022-04-08 ba8633e99a27b90c55b47e8f7d6225f1f0efc6bb

 src/main/java/com/genersoft/iot/vmp/utils/node/ForestNodeMerger.java

@@ -25,7 +25,7 @@
            if (node != null) {
               node.getChildren().add(forestNode);
            } else {
               forestNodeManager.addParentId(forestNode.getId());
               forestNodeManager.addParentId(forestNode.getChannelId());
            }
         }
      });
@@ -37,8 +37,8 @@
      items.forEach(forestNode -> {
         if (forestNode.getParentId() != null) {
            INode<T> node = forestNodeManager.getTreeNodeAt(forestNode.getParentId());
            if (CollectionUtil.contains(parentIds, forestNode.getId())){
               forestNodeManager.addParentId(forestNode.getId());
            if (CollectionUtil.contains(parentIds, forestNode.getChannelId())){
               forestNodeManager.addParentId(forestNode.getChannelId());
            } else {
               if (node != null){
                  node.getChildren().add(forestNode);