Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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;
+        }
+
     }
 
     /**

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;

modules/i3plus-pojo-wms/pom.xml

@@ -18,10 +18,10 @@
             <groupId>i3plus.pojo</groupId>
             <artifactId>i3plus-pojo-base</artifactId>
         </dependency>
-        <dependency>
-            <groupId>i3plus.platform</groupId>
-            <artifactId>i3plus-platform-common</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>i3plus.platform</groupId>-->
+            <!--<artifactId>i3plus-platform-common</artifactId>-->
+        <!--</dependency>-->
     </dependencies>
 
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1,14 +1,11 @@
 package cn.estsh.i3plus.pojo.wms.sqlpack;
 
-import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.base.tool.SqlPack;
 import cn.estsh.i3plus.pojo.wms.bean.*;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateUtils;
 
 import java.util.Date;
 import java.util.List;