From 44676161adea0c99713cb641b7c0aed69e7cbe84 Mon Sep 17 00:00:00 2001
From: "wei.peng" <pengwei940613@163.com>
Date: Thu, 7 Mar 2019 09:48:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20echarts=20=E5=B7=A5=E5=85=B7=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/base/enumutil/BlockReportEnumUtil.java    | 30 +++++++++++++++++++++-
 .../estsh/i3plus/pojo/report/bean/BrPojoAttr.java  | 14 ++++++----
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java
index 833fbeb..cddf4cd 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java
@@ -365,7 +365,11 @@ public class BlockReportEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TEMPLATE_TYPE {
-        TABLE(1, "表格", "表格模板");
+        TABLE(1, "表格", "表格模板"),
+        ECHARTS_PIE(10, "饼图", "实芯饼图"),
+        ECHARTS_BAR(20, "柱状图", "柱状图-向上具状图"),
+        ECHARTS_LINE(30, "折线图", "向右折线条图"),
+        ECHARTS_TREEMAP(40, "矩形图", "矩形图");
 
         private int value;
         private String name;
@@ -419,6 +423,30 @@ public class BlockReportEnumUtil {
             }
             return tmp;
         }
+
+        public static String[] getChartAttrs(TEMPLATE_TYPE type){
+            if(type != null){
+
+//                TABLE(1, "表格", "表格模板"),
+//                        ECHARTS_PIE(10, "饼图", "实芯饼图"),
+//                        ECHARTS_BAR(20, "柱状图", "柱状图-向上具状图"),
+//                        ECHARTS_LINE(30, "折线图", "向右折线条图"),
+//                        ECHARTS_TREEMAP(40, "矩形图", "矩形图");
+                if(type.equals(TEMPLATE_TYPE.TABLE)){       // Table 是可以编辑的 所以不需要指定列
+                    return null;
+                }else if(type.equals(TEMPLATE_TYPE.ECHARTS_PIE)){       // 饼图  只需要名称 和值
+                    return new String[]{"name","value"};
+                }else if(type.equals(TEMPLATE_TYPE.ECHARTS_BAR)){       // 饼图  只需要名称 和值
+                    return new String[]{"name","value"};
+                }else if(type.equals(TEMPLATE_TYPE.ECHARTS_LINE)){       // 饼图  只需要名称 和值
+                    return new String[]{"name","value","xAxis"};
+                }else if(type.equals(TEMPLATE_TYPE.ECHARTS_TREEMAP)){       // 饼图  只需要名称 和值
+                    return new String[]{"name","value"};
+                }
+            }
+            return null;
+        }
+
     }
 
     /**
diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java
index b804f90..f23b1c1 100644
--- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java
+++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java
@@ -64,6 +64,11 @@ public class BrPojoAttr extends BaseBean {
     @ApiParam(value ="属性别名")
     private String attrNameAlias;
 
+    @Column(name="PARENT_ID")
+    @ApiParam(value ="上级ID",example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long parentId;
+
     @Column(name="ATTR_TYPE")
     @ApiParam(value ="属性类型",example = "-1")
     private Integer attrType;
@@ -76,15 +81,14 @@ public class BrPojoAttr extends BaseBean {
     @ApiParam(value ="数据类型",example = "-1")
     private Integer dataType;
 
+    @Column(name="CHART_ATTR_NAME")
+    @ApiParam(value ="图标属性名称")
+    private String chartAttrName;
+
     @Column(name="AGGREGATION_TYPE")
     @ApiParam(value ="聚合类型",example = "-1")
     private Integer aggregationType;
 
-    @Column(name="AGGREGATION_ID")
-    @ApiParam(value ="聚合类型",example = "-1")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long aggregationId;
-
     @Column(name="ATTR_SORT")
     @ApiParam(value ="字段排序")
     private Integer attrSort;