提交

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

@@ -49,7 +49,7 @@ public class FetchItem extends DataObj {
         return this;
     }
 
-    public String getMetricId1() {
+    public String getMetricId() {
         return this.getStringValue("metricId");
     }
 

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

@@ -72,7 +72,7 @@ public class FetchResult {
         return listBox;
     }
 
-    public int getListBoxHeaders(List<VMConfig> vmConfigs,Map<Integer,VMConfig> set,int layer)
+    public int getListBoxHeaders(List<VMConfig> vmConfigs,Map<Integer,VMConfig> set,List<FetchItem> newRows,int layer)
     {
         int maxlayer=layer;
         if(!set.containsKey(layer)) {
@@ -80,12 +80,21 @@ public class FetchResult {
             set.put(layer,header);
         }
         for(VMConfig config:vmConfigs){
-            if(ObjectUtils.isEmpty(config.getChildren()))
+
+            if(!ObjectUtils.isEmpty(config.getChildren()))
             {
-                int sublayer=getListBoxHeaders(config.getChildren(),set,layer+1);
+                int sublayer=getListBoxHeaders(config.getChildren(),set,newRows,layer+1);
                 if(sublayer>maxlayer)
                     maxlayer=sublayer;
             }
+            else if(!StringUtils.isEmpty(config.getField()))
+            {
+                FetchItem fetchItem=new FetchItem().setNo(newRows.size()+1).setMetricId(config.getField()).setMetricName(config.getHeaderName()).setDisplayType(this.getDisplayType());
+                rows.forEach(row->{
+                    fetchItem.setVal(row.getDimId(),row.getVal(config.getField()));
+                });
+                newRows.add(fetchItem);
+            }
         }
         return maxlayer;
     }