自定义报表 数据库配置更新 创建目录管理 服务

目录功能完成

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockEnumUtil.java

@@ -51,4 +51,45 @@ public class BlockEnumUtil {
         }
 
     }
+
+
+    /**
+     * 报表布局枚举
+     * TABLE(1,"表格"),CHART(2,"图表");
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REPORT_LAYOUT_TYPE{
+
+        TABLE(1,"表格"),CHART(2,"图表");
+
+        private int value;
+        private String description;
+
+        REPORT_LAYOUT_TYPE() {
+        }
+
+        REPORT_LAYOUT_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+    }
 }

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java

@@ -53,11 +53,7 @@ public class BrElement extends BaseBean {
     @ApiParam(value ="元素样式css")
     private String elementStyle;
 
-    @Transient
+    @Column(name="ELEMENT_HTML",columnDefinition = "TEXT")
-    @ApiParam(value ="元素明细列表")
+    @ApiParam(value ="元素html")
-    private List<BrReportElementDetail> brReportElementDetailList;
+    private String elementHtml;
-
-    @Transient
-    @ApiParam(value ="元素所在的列")
-    private BrLayoutColumn brLayoutColumn;
 }

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java

@@ -4,10 +4,10 @@ import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.report.bean.BrMenu;
 
 /**
- * @Description :
+ * @Description : 报表对象封装
  * @Reference :
- * @Author : Adair Peng
+ * @Author : yunhao
- * @CreateDate : 2019-01-17 14:13
+ * @CreateDate : 2019-01-17 15:41
  * @Modify:
  **/
 public class ReportHqlPack {
@@ -33,4 +33,18 @@ public class ReportHqlPack {
         return result.toString();
     }
 
+    /**
+     * 报表元素查询
+     * @param brElement
+     * @return
+     */
+    public static String packHqlBrElement(BrElement brElement){
+        StringBuffer result = new StringBuffer();
+
+        // 查询参数封装
+        HqlPack.getNumEqualPack(brElement.getElementType(),"elementType",result);
+        HqlPack.getStringLikerPack(brElement.getElementName(),"elementName",result);
+
+        return result.toString();
+    }
 }