提交

ibzdst-core/src/main/java/cn/ibizlab/core/extensions/dto/FetchResult.java

@@ -11,6 +11,7 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.Accessors;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 import java.sql.Timestamp;
@@ -48,18 +49,47 @@ public class FetchResult {
     {
         FetchResult listBox=new FetchResult();
 
-        List<VMConfig> vms=new ArrayList<>();
+        List<VMConfig> newVms=new ArrayList<>();
 
         rows.forEach(row->{
             VMConfig config=new VMConfig();
             config.setHeaderName(row.getDimName()).setEntity("item").setField(row.getDimId()).setWidth(80);
-            vms.add(config);
+            newVms.add(config);
         });
-        this.setVmConfigs(vms);
 
+        headers = new ArrayList<>();
+        headers.add(new VMConfig().setHeaderName("序号").setEntity("item").setField("no").setPinned("left"));
+
+        List<FetchItem> newRows=new ArrayList<>();
+        for(FetchItem item:rows)
+        {
+
+        }
+
+
+
+        this.setVmConfigs(newVms);
         return listBox;
     }
 
+    public int getListBoxHeaders(List<VMConfig> vmConfigs,Map<Integer,VMConfig> set,int layer)
+    {
+        int maxlayer=layer;
+        if(!set.containsKey(layer)) {
+            VMConfig header=new VMConfig().setLayer(layer).setPinned("left").setEntity("item").setField("item_" + layer).setHeaderName("栏目" + layer);
+            set.put(layer,header);
+        }
+        for(VMConfig config:vmConfigs){
+            if(ObjectUtils.isEmpty(config.getChildren()))
+            {
+                int sublayer=getListBoxHeaders(config.getChildren(),set,layer+1);
+                if(sublayer>maxlayer)
+                    maxlayer=sublayer;
+            }
+        }
+        return maxlayer;
+    }
+
     @JsonIgnore
     @JSONField(serialize = false)
     private List<VMConfig> vmConfigs;

ibzdst-core/src/main/java/cn/ibizlab/core/extensions/dto/VMConfig.java

@@ -31,13 +31,43 @@ public class VMConfig {
     private String pinned;
     private List<VMConfig> children;
 
+    public void setChildren(List<VMConfig> children) {
+        if(children!=null)
+            children.forEach(item->{
+                if(this.getLayer()!=null)
+                    item.setLayer(this.getLayer()+1);
+                item.setParent(this);
+            });
+        this.children = children;
+    }
+    @JsonIgnore
+    @JSONField(serialize = false)
+    private VMConfig parent;
+
+    @JsonIgnore
+    @JSONField(serialize = false)
+    private Integer layer;
+    @JsonIgnore
+    @JSONField(serialize = false)
+    public Integer getLayer() {
+        if(layer==null&&parent==null)
+            layer=1;
+        return layer;
+    }
+
     public Map<String, Set<String>> getBuilds(Map<String,Set<String>> builds)
     {
         if(builds == null)
         {
             builds = new LinkedHashMap<>();
         }
-        if((!StringUtils.isEmpty(entity)) && (!StringUtils.isEmpty(field)))
+
+        if(!ObjectUtils.isEmpty(children))
+        {
+            for(VMConfig item:children)
+                item.getBuilds(builds);
+        }
+        else if((!StringUtils.isEmpty(entity)) && (!StringUtils.isEmpty(field)))
         {
             if(builds.containsKey(entity))
             {
@@ -50,11 +80,7 @@ public class VMConfig {
                 builds.put(entity,metricIds);
             }
         }
-        if(!ObjectUtils.isEmpty(children))
-        {
-            for(VMConfig item:children)
-                item.getBuilds(builds);
-        }
+
         return builds;
     }