From 3b7b374b23b84feacbdc444d31b0b13a984d92cf Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 27 Dec 2019 19:55:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E6=8A=A5=E8=A1=A8=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E6=A8=A1=E5=9E=8B=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockFormEnumUtil.java | 443 -------------------- .../pojo/base/enumutil/BlockReportEnumUtil.java | 295 +++++++++++--- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 453 +++++++++++++++++++++ .../pojo/lac/bean/LacCommandStackRecord.java | 5 + .../cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java | 5 + .../i3plus/pojo/model/common/ClassFieldModel.java | 13 +- .../i3plus/pojo/model/form/SqlColumnModel.java | 3 +- .../pojo/model/report/BeanBrPojoAttrModel.java | 70 ++-- .../pojo/model/report/BrDataSourceModel.java | 47 +++ .../i3plus/pojo/model/report/TemplateModel.java | 78 +++- .../pojo/platform/platbean/SysLogException.java | 2 +- .../pojo/platform/platbean/SysLogSystem.java | 1 + .../estsh/i3plus/pojo/report/bean/BrElement.java | 3 - .../cn/estsh/i3plus/pojo/report/bean/BrLayout.java | 12 +- .../i3plus/pojo/report/bean/BrLayoutColumn.java | 10 +- .../estsh/i3plus/pojo/report/bean/BrLayoutRow.java | 8 +- .../cn/estsh/i3plus/pojo/report/bean/BrPojo.java | 137 +++++++ .../i3plus/pojo/report/bean/BrPojoFilter.java | 46 +++ .../i3plus/pojo/report/bean/BrPojoFilterAttr.java | 129 ++++++ .../estsh/i3plus/pojo/report/bean/BrPojoView.java | 79 ++++ .../i3plus/pojo/report/bean/BrPojoViewAttr.java | 112 +++++ .../estsh/i3plus/pojo/report/bean/BrRefPojo.java | 154 +++---- .../pojo/report/bean/BrRefReportTypeset.java | 15 +- .../i3plus/pojo/report/bean/BrRefServerPojo.java | 230 +++++------ .../pojo/report/bean/BrRefTemplateServer.java | 100 ++--- .../cn/estsh/i3plus/pojo/report/bean/BrReport.java | 2 - .../i3plus/pojo/report/bean/BrReportTemplate.java | 112 ++--- .../estsh/i3plus/pojo/report/bean/BrTemplate.java | 330 +++++++-------- .../pojo/report/bean/BrTemplateCustomHql.java | 98 ++--- .../repository/BrLayoutColumnRepository.java | 1 - .../repository/BrPojoFilterAttrRepository.java | 15 + .../report/repository/BrPojoFilterRepository.java | 15 + .../pojo/report/repository/BrPojoRepository.java | 15 + .../repository/BrPojoViewAttrRepository.java | 14 + .../report/repository/BrPojoViewRepository.java | 14 + .../report/repository/BrRefPojoRepository.java | 30 +- .../repository/BrRefServerPojoRepository.java | 30 +- .../repository/BrRefTemplateServerRepository.java | 30 +- .../repository/BrReportTemplateRepository.java | 28 +- .../repository/BrTemplateCustomHqlRepository.java | 30 +- .../report/repository/BrTemplateRepository.java | 28 +- .../i3plus/pojo/report/sqlpack/ReportHqlPack.java | 94 +++-- 42 files changed, 2140 insertions(+), 1196 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilter.java create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoView.java create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoFilterAttrRepository.java create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoFilterRepository.java create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoRepository.java create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoViewAttrRepository.java create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoViewRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index e19e6e5..2beae15 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -2071,447 +2071,4 @@ public class BlockFormEnumUtil { } } - /** - * 元素控件类型信息 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum PROPERTY_CONTROL_TYPE { - RADIO(100, "RADIO", "单选"), - CHECKBOX(110, "CHECKBOX", "复选"), - TEXT(200, "TEXT", "文本"), - NUMBER(210, "NUMBER", "数字"), - PASSWORD(230, "PASSWORD", "密码"), - DATE_TIME(300, "DATE", "日期",SQL_WHERE.BETWEEN), - // DATE(300, "DATE", "日期(yyyy-MM-dd)"), -// DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"), - // ELEMENT(700, "DICT_SELECT", "元素"), - DICTIONARY(800, "DICT_SELECT", "字典"), - CASCADE(900, "CASCADE", "级联"); - //FILE(400, "file", "文件"), - //IMAGE(410, "image", "image"), - //OFF(500, "color", "颜色"), - - private int value; - private String code; - private String description; - - /** - * 默认查询关系 - */ - private SQL_WHERE defaultWhere; - - PROPERTY_CONTROL_TYPE(int value, String code, String description) { - this.value = value; - this.code = code; - this.description = description; - } - - PROPERTY_CONTROL_TYPE(int value, String code, String description, SQL_WHERE defaultWhere) { - this.value = value; - this.code = code; - this.description = description; - this.defaultWhere = defaultWhere; - } - - public int getValue() { - return value; - } - - public String getCode() { - return code; - } - - public String getDescription() { - return description; - } - - public SQL_WHERE getDefaultWhere() { - return defaultWhere; - } - - public static String valueOfCode(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].code; - } - } - return tmp; - } - - public static int codeOfValue(String code) { - int tmp = 1; - for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code)) { - tmp = values()[i].value; - } - } - return tmp; - } - - 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; - } - - public static PROPERTY_CONTROL_TYPE valueOf(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - return values()[i]; - } - } - return null; - } - - public static String codeOfDescription(String code) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code)) { - tmp = values()[i].description; - } - } - return tmp; - } - } - - /** - * 条件运算符 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SQL_WHERE { - EQUAL(1, "=", "等于"), - NOT_EQUAL(2, "<>", "不等于"), - MORE(3, ">", "大于"), - LESS(4, "<", "小于"), - MORE_OR_EQUAL(5, ">=", "大于等于"), - LESS_OR_EQUAL (6, "<=", "小于等于"), - LIKE(7, "LIKE", "全模糊"), - START_LIKE(7, "LIKE", "前模糊"), - END_LIKE(7, "LIKE", "后模糊"), - IN(8, "in", "in"), - BETWEEN(9, "BETWEEN", "区间查询(逗号区分)"),; - - private int value; - private String code; - private String description; - - private SQL_WHERE(int value, String code, String description) { - this.value = value; - this.code = code; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getCode() { - return code; - } - - public String getDescription() { - return description; - } - - public static String valueOfCode(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].code; - } - } - return tmp; - } - - public static int codeOfValue(String code) { - int tmp = 1; - for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code.toLowerCase())) { - tmp = values()[i].value; - } - } - return tmp; - } - - 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; - } - - public static SQL_WHERE valueOf(int val) { - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - return values()[i]; - } - } - return null; - } - - public static String codeOfDescription(String code) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code)) { - tmp = values()[i].description; - } - } - return tmp; - } - } - - /** - * 属性类型信息(属性转换器) - * - *
Form 核心转换器 - *
数据库字段类型转换Java 属性类型 - *
Java 属性 转换为控件类型 - * - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum PROPERTY_TYPE { - STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.LIKE,""), - CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,""), - INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0"), - LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0"), - DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"), - FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"), - BIG_DECIMAL(32, "BigDecimal", "大浮点型", "java.math.BigDecimal", BigDecimal.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"), - BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null), - BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null), - DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,SQL_WHERE.BETWEEN,null,"yyyy-MM-dd hh:mm:ss"); - - /** - * 属性类型值 - */ - private int value; - /** - * 属性类型代码 - */ - private String code; - /** - * 属性类型描述 - */ - private String description; - /** - * 属性类型ClassPath - */ - private String classPath; - /** - * 属性类型 Class - */ - private Class clzFullName; - /** - * 属性类型 对应的 控件类型 - */ - private PROPERTY_CONTROL_TYPE controlType; - - /** - * 默认查询关系 - */ - private SQL_WHERE defaultWhere; - - /** - * 默认 格式化 方式 - */ - private String defaultFormat; - - /** - * 默认查询关系 - */ - private String defaultValue; - - private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName, - PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere) { - this.value = value; - this.code = code; - this.description = description; - this.classPath = classPath; - this.clzFullName = clzFullName; - this.controlType = controlType; - this.defaultWhere = defaultWhere; - } - - private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName, - PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue) { - this.value = value; - this.code = code; - this.description = description; - this.classPath = classPath; - this.clzFullName = clzFullName; - this.controlType = controlType; - this.defaultWhere = defaultWhere; - this.defaultValue = defaultValue; - this.defaultFormat = defaultFormat; - } - - private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName, - PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue,String defaultFormat) { - this.value = value; - this.code = code; - this.description = description; - this.classPath = classPath; - this.clzFullName = clzFullName; - this.controlType = controlType; - this.defaultWhere = defaultWhere; - this.defaultValue = defaultValue; - this.defaultFormat = defaultFormat; - } - - public int getValue() { - return value; - } - - public String getCode() { - return code; - } - - public String getDescription() { - return description; - } - - public String getClassPath() { - return classPath; - } - - public Class getClzFullName() { - return clzFullName; - } - - public PROPERTY_CONTROL_TYPE getControlType() { - return controlType; - } - - public SQL_WHERE getDefaultWhere() { - return defaultWhere; - } - - public String getDefaultFormat() { - return defaultFormat; - } - - public String getDefaultValue() { - return defaultValue; - } - - public static String valueOfCode(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].code; - } - } - return tmp; - } - - public static PROPERTY_TYPE valueOfClzFullName(int val) { - PROPERTY_TYPE tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i]; - } - } - return tmp; - } - - - public static PROPERTY_CONTROL_TYPE valueOfControlType(int val) { - PROPERTY_CONTROL_TYPE tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].controlType; - } - } - return tmp; - } - - public static int codeOfValue(String code) { - int tmp = 1; - for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code)) { - tmp = values()[i].value; - } - } - return tmp; - } - - public static int codeOfClzFullName(Class clzFullName) { - int tmp = 1; - for (int i = 0; i < values().length; i++) { - if (values()[i].clzFullName.equals(clzFullName)) { - tmp = values()[i].value; - } - } - return tmp; - } - - public static int codeOfClassPath(String classPath) { - int tmp = 1; - for (int i = 0; i < values().length; i++) { - if (values()[i].classPath.equals(classPath)) { - tmp = values()[i].value; - } - } - return tmp; - } - - 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; - } - - public static PROPERTY_TYPE valueOfClassPath(String classPath) { - PROPERTY_TYPE tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].classPath.equals(classPath)) { - tmp = values()[i]; - } - } - return tmp; - } - - public static PROPERTY_TYPE valueOf(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - return values()[i]; - } - } - return null; - } - - public static PROPERTY_TYPE indexOf(String val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (val.indexOf(values()[i].value) >= 0) { - return values()[i]; - } - } - return null; - } - - public static String codeOfDescription(String code) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code)) { - tmp = values()[i].description; - } - } - return tmp; - } - } } 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 6a9c5f6..a39c5d4 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 @@ -55,7 +55,6 @@ public class BlockReportEnumUtil { } - /** * 报表布局枚举 * TABLE(1,"表格"),CHART(2,"图表"); @@ -95,8 +94,6 @@ public class BlockReportEnumUtil { } } - - /** * 功能级别 */ @@ -277,7 +274,6 @@ public class BlockReportEnumUtil { } } - /** * 数据状态 * 1 启用 @@ -446,20 +442,21 @@ public class BlockReportEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum HQL_WHERE{ - GT(1, ">", "大于"), - GT_EQUAL(2, ">=", "大于等于"), - LT(3, "<", "小于等于"), - LT_EQUAL(4, "<=", "小于等于"), - LIKE(5, "LIKE", "模糊"), - LIKE_LEFT(6, "LIKE", "左模糊"), - LIKE_RIGHT(7, "LIKE", "右模糊"), - EQUAL(8, "=", "等于"), - EQUAL_NOT(9, "<>", "不等于"), -// AND(10, "AND", "AND"), -// OR(11, "OR", "OR"), -// NOT(12, "NOT", "NOT"), - IS_NULL(13, "IS NULL", "IS NULL"), - IS_NOT_NULL(14, "IS NOT NULL", "IS NOT NULL"); + GT(1, " > ", "大于"), + GT_EQUAL(2, " >= ", "大于等于"), + LT(3, " < ", "小于等于"), + LT_EQUAL(4, " <= ", "小于等于"), + LIKE(5, " LIKE ", "模糊"), + LIKE_LEFT(6, " LIKE ", "左模糊"), + LIKE_RIGHT(7, " LIKE ", "右模糊"), + EQUAL(8, " = ", "等于"), + EQUAL_NOT(9, " <> ", "不等于"), +// AND(10, " AND ", "AND"), +// OR(11, " OR ", "OR"), +// NOT(12, " NOT ", "NOT"), + IN(8, " IN ", "IN"), + IS_NULL(13, " IS NULL ", "IS NULL"), + IS_NOT_NULL(14, " IS NOT NULL ", "IS NOT NULL"); private int value; private String name; @@ -495,6 +492,74 @@ public class BlockReportEnumUtil { return null; } + public static String valueOfDescription(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i].getDescription(); + } + } + return null; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum HQL_WHERE_REF{ + AND(10, " AND ", "AND"), + OR(11, " OR ", "OR"); + + private int value; + private String name; + private String description; + + HQL_WHERE_REF() { + } + + HQL_WHERE_REF(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getName() { + return name; + } + + public static HQL_WHERE_REF valueOf(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String valueOfDescription(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i].getDescription(); + } + } + return null; + } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { @@ -511,9 +576,9 @@ public class BlockReportEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum HQL_REF{ - LEFT_JOIN(1, "left join", "左连接"), - RIGHT_JOIN(2, "right join", "右连接"), - INNER_JOIN(3, "inner join", "内连接"); + LEFT_JOIN(1, " LEFT JOIN ", "左连接"), + RIGHT_JOIN(2, " RIGHT JOIN ", "右连接"), + INNER_JOIN(3, " INNER JOIN ", "内连接"); private int value; private String name; @@ -550,6 +615,16 @@ public class BlockReportEnumUtil { return null; } + public static String valueOfDescription(int val) { + HQL_REF tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i].getDescription(); + } + } + return null; + } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { @@ -567,11 +642,11 @@ public class BlockReportEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum HQL_AGGREGATION{ - AVG(1, "avg", "平均值"), - MIN(2, "min", "最小值"), - MAX(3, "max", "最大值"), - SUM(4, "sum", "总和"), - COUNT(5, "count", "计数"); + AVG(1, "AVG", "平均值"), + MIN(2, "MIN", "最小值"), + MAX(3, "MAX", "最大值"), + SUM(4, "SUM", "总和"), + COUNT(5, "COUNT", "计数"); private int value; private String name; @@ -632,11 +707,11 @@ public class BlockReportEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum HQL_ATTR_DATA_TYPE{ - SHOW(1, "show", "显示"), WHERE(2, "where", "查询"), GROUP(3, "group", "分组"), - AGGREGATION(4, "聚合", "聚合"); + AGGREGATION(4, "聚合", "聚合"), + ORDER(5, "order", "排序"); private int value; private String name; @@ -684,6 +759,17 @@ public class BlockReportEnumUtil { return null; } + public static String valueOfDescription(Integer val) { + if(val != null){ + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val.intValue()) { + return values()[i].description; + } + } + } + return null; + } + public static int descOf(String desc) { int tmp = 1; @@ -697,22 +783,62 @@ public class BlockReportEnumUtil { } /** - * 表单聚合 + * 报表排版枚举 + * ELEMENT(1,"元素"),TEMPLATE(2,"模板"); */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum HQL_ORDER{ + public enum REPORT_TYPESET_TYPE{ + + ELEMENT(1,"元素"),TEMPLATE(2,"模板"); + + private int value; + private String description; + + REPORT_TYPESET_TYPE() { + } + + REPORT_TYPESET_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; + } + + } - ASC(1, "ASC", "升序"), - DESC(2, "DESC", "降序"); + + /** + * Echarts Pie + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum VIEW_ECHARTS_PIE_OPTION{ + OPTION_NAME(1,"ECHARTS_PIE_NAME","显示名称"), + OPTION_VALUE(2,"ECHARTS_PIE_VALUE","显示内容"); private int value; private String name; private String description; - HQL_ORDER() { + VIEW_ECHARTS_PIE_OPTION() { } - HQL_ORDER(int value, String name, String description) { + VIEW_ECHARTS_PIE_OPTION(int value,String name, String description) { this.value = value; this.name = name; this.description = description; @@ -726,48 +852,119 @@ public class BlockReportEnumUtil { return description; } - public String getName() { - return name; + 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; } - public static String valueOf(int val) { + } + + /** + * Echarts Line + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum VIEW_ECHARTS_LINE_OPTION{ + OPTION_NAME(1,"ECHARTS_LINE_NAME","显示名称"), + OPTION_VALUE(2,"ECHARTS_LINE_VALUE","显示内容"), + OPTION_X_AXIS(3,"ECHARTS_LINE_X_AXIS","显示内容xAxis"); + + private int value; + private String name; + private String description; + + VIEW_ECHARTS_LINE_OPTION() { + } + + VIEW_ECHARTS_LINE_OPTION(int value,String name, String description) { + this.value = value; + this.name = name; + 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].getName(); + tmp = values()[i].description; } } return tmp; } - public static int descOf(String desc) { - int tmp = 1; + } + + /** + * Echarts Bar + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum VIEW_ECHARTS_BAR_OPTION{ + OPTION_NAME(1,"ECHARTS_BAR_NAME","显示名称"), + OPTION_VALUE(2,"ECHARTS_BAR_VALUE","显示内容"); + + private int value; + private String name; + private String description; + + VIEW_ECHARTS_BAR_OPTION() { + } + + VIEW_ECHARTS_BAR_OPTION(int value,String name, String description) { + this.value = value; + this.name = name; + 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].name.equals(desc)) { - tmp = values()[i].value; + if (values()[i].value == val) { + tmp = values()[i].description; } } return tmp; } + } /** - * 报表排版枚举 - * ELEMENT(1,"元素"),TEMPLATE(2,"模板"); + * Echarts TreeMap */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum REPORT_TYPESET_TYPE{ - - ELEMENT(1,"元素"),TEMPLATE(2,"模板"); + public enum VIEW_ECHARTS_TREEMAP_OPTION{ + OPTION_NAME(1,"ECHARTS_TREEMAP_NAME","显示名称"), + OPTION_VALUE(2,"ECHARTS_TREEMAP_VALUE","显示内容"); private int value; + private String name; private String description; - REPORT_TYPESET_TYPE() { + VIEW_ECHARTS_TREEMAP_OPTION() { } - REPORT_TYPESET_TYPE(int value, String description) { + VIEW_ECHARTS_TREEMAP_OPTION(int value,String name, String description) { this.value = value; + this.name = name; this.description = description; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 46172c2..e6202e0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.StringUtils; +import java.math.BigDecimal; + /** * @Description : * @Reference : @@ -221,6 +223,15 @@ public class CommonEnumUtil { return desc == 0 ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue(); } + public static TRUE_OR_FALSE valueOfEnum(int value){ + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + public static String valueOfDescription(int val) {return valueOf(val);} public static int descriptionOfValue(String desc) {return descOf(desc);} @@ -1258,4 +1269,446 @@ public class CommonEnumUtil { } } + + /** + * 元素控件类型信息 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PROPERTY_CONTROL_TYPE { + RADIO(100, "RADIO", "单选"), + CHECKBOX(110, "CHECKBOX", "复选"), + TEXT(200, "TEXT", "文本"), + NUMBER(210, "NUMBER", "数字"), + PASSWORD(230, "PASSWORD", "密码"), + DATE_TIME(300, "DATE", "日期",SQL_WHERE.BETWEEN), + // DATE(300, "DATE", "日期(yyyy-MM-dd)"), +// DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"), + // ELEMENT(700, "DICT_SELECT", "元素"), + DICTIONARY(800, "DICT_SELECT", "字典"), + CASCADE(900, "CASCADE", "级联"); + //FILE(400, "file", "文件"), + //IMAGE(410, "image", "image"), + //OFF(500, "color", "颜色"), + + private int value; + private String code; + private String description; + + /** + * 默认查询关系 + */ + private SQL_WHERE defaultWhere; + + PROPERTY_CONTROL_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + PROPERTY_CONTROL_TYPE(int value, String code, String description, SQL_WHERE defaultWhere) { + this.value = value; + this.code = code; + this.description = description; + this.defaultWhere = defaultWhere; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public SQL_WHERE getDefaultWhere() { + return defaultWhere; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + 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; + } + + public static PROPERTY_CONTROL_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 条件运算符 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SQL_WHERE { + EQUAL(1, " = ", "等于"), + NOT_EQUAL(2, " <> ", "不等于"), + MORE(3, " > ", "大于"), + LESS(4, " < ", "小于"), + MORE_OR_EQUAL(5, " >= ", "大于等于"), + LESS_OR_EQUAL (6, " <= ", "小于等于"), + LIKE(7, " LIKE ", "全模糊"), + START_LIKE(7, " LIKE ", "前模糊"), + END_LIKE(7, " LIKE ", "后模糊"), + IN(8, " IN ", "in"), + BETWEEN(9, " BETWEEN ", "区间查询(逗号区分)"),; + + private int value; + private String code; + private String description; + + private SQL_WHERE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code.toLowerCase())) { + tmp = values()[i].value; + } + } + return tmp; + } + + 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; + } + + public static SQL_WHERE valueOf(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 属性类型信息(属性转换器) + * + *
Form 核心转换器 + *
数据库字段类型转换Java 属性类型 + *
Java 属性 转换为控件类型 + * + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PROPERTY_TYPE { + STRING(10, "String", "字符串", "java.lang.String", String.class, PROPERTY_CONTROL_TYPE.TEXT, SQL_WHERE.LIKE, ""), + CHAR(11, "Character", "单字符", "java.lang.Character", Character.class, PROPERTY_CONTROL_TYPE.TEXT, SQL_WHERE.EQUAL, ""), + INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class, PROPERTY_CONTROL_TYPE.NUMBER, SQL_WHERE.EQUAL, "0"), + LONG(21, "Long", "长整型", "java.lang.Long", Long.class, PROPERTY_CONTROL_TYPE.NUMBER, SQL_WHERE.EQUAL, "0"), + DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class, PROPERTY_CONTROL_TYPE.NUMBER, SQL_WHERE.EQUAL, "0.0"), + FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class, PROPERTY_CONTROL_TYPE.NUMBER, SQL_WHERE.EQUAL, "0.0"), + BIG_DECIMAL(32, "BigDecimal", "大浮点型", "java.math.BigDecimal", BigDecimal.class, PROPERTY_CONTROL_TYPE.NUMBER, SQL_WHERE.EQUAL, "0.0"), + BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class, PROPERTY_CONTROL_TYPE.RADIO, SQL_WHERE.EQUAL, null), + BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class, PROPERTY_CONTROL_TYPE.TEXT, SQL_WHERE.EQUAL, null), + DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", String.class, PROPERTY_CONTROL_TYPE.DATE_TIME, SQL_WHERE.BETWEEN, null, "yyyy-MM-dd hh:mm:ss"); + + /** + * 属性类型值 + */ + private int value; + /** + * 属性类型代码 + */ + private String code; + /** + * 属性类型描述 + */ + private String description; + /** + * 属性类型ClassPath + */ + private String classPath; + /** + * 属性类型 Class + */ + private Class clzFullName; + /** + * 属性类型 对应的 控件类型 + */ + private PROPERTY_CONTROL_TYPE controlType; + /** + * 默认查询关系 + */ + private SQL_WHERE defaultWhere; + /** + * 默认 格式化 方式 + */ + private String defaultFormat; + /** + * 默认查询关系 + */ + private String defaultValue; + + private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName, + PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere) { + this.value = value; + this.code = code; + this.description = description; + this.classPath = classPath; + this.clzFullName = clzFullName; + this.controlType = controlType; + this.defaultWhere = defaultWhere; + } + + private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName, + PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue) { + this.value = value; + this.code = code; + this.description = description; + this.classPath = classPath; + this.clzFullName = clzFullName; + this.controlType = controlType; + this.defaultWhere = defaultWhere; + this.defaultValue = defaultValue; + this.defaultFormat = defaultFormat; + } + + private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName, + PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue,String defaultFormat) { + this.value = value; + this.code = code; + this.description = description; + this.classPath = classPath; + this.clzFullName = clzFullName; + this.controlType = controlType; + this.defaultWhere = defaultWhere; + this.defaultValue = defaultValue; + this.defaultFormat = defaultFormat; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public String getClassPath() { + return classPath; + } + + public Class getClzFullName() { + return clzFullName; + } + + public PROPERTY_CONTROL_TYPE getControlType() { + return controlType; + } + + public SQL_WHERE getDefaultWhere() { + return defaultWhere; + } + + public String getDefaultFormat() { + return defaultFormat; + } + + public String getDefaultValue() { + return defaultValue; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static PROPERTY_TYPE valueOfClzFullName(int val) { + PROPERTY_TYPE tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i]; + } + } + return tmp; + } + + + public static PROPERTY_CONTROL_TYPE valueOfControlType(int val) { + PROPERTY_CONTROL_TYPE tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].controlType; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static int codeOfClzFullName(Class clzFullName) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].clzFullName.equals(clzFullName)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static int codeOfClassPath(String classPath) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].classPath.equals(classPath)) { + tmp = values()[i].value; + } + } + return tmp; + } + + 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; + } + + public static PROPERTY_TYPE valueOfClassPath(String classPath) { + PROPERTY_TYPE tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].classPath.equals(classPath)) { + tmp = values()[i]; + } + } + return tmp; + } + + public static PROPERTY_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static PROPERTY_TYPE indexOf(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (val.indexOf(values()[i].value) >= 0) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java index c4eada8..01c70ae 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.lac.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.LacEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -89,6 +90,10 @@ public class LacCommandStackRecord extends BaseBean { @ApiParam(value ="执行状态") private Integer stackStatus; + public String getStackStatusTxt(){ + return LacEnumUtil.STACK_STATUS.valueOfDescription(stackStatus == null ? 0 : stackStatus); + } + @Column(name="EXECUTION_DESCRIPTION") @ApiParam(value ="执行说明") private String executionDescription; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java index 9b32ffa..e85fb26 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.lac.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.LacEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -120,6 +121,10 @@ public class LacLogTask extends BaseBean { @ApiParam(value ="任务状态") private Integer taskStatus; + public String getTaskStatusTxt(){ + return LacEnumUtil.STACK_STATUS.valueOfDescription(taskStatus == null ? 0 : taskStatus); + } + @Column(name="EXECUTION_DESCRIPTION") @ApiParam(value ="执行说明") private String executionDescription; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java index a7575d5..f03e4f7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java @@ -30,15 +30,26 @@ public class ClassFieldModel implements Serializable { @ApiParam(value ="属性名") private String fieldName; + @ApiParam(value ="属性类型名称") + private String fieldTypeName; + @ApiParam(value ="属性别名") private String fieldNameAlias; @ApiParam(value ="属性描述") private String fieldDesc; - @Column(name="AGGREGATION_TYPE") @ApiParam(value ="聚合ID") @JsonSerialize(using = ToStringSerializer.class) private Long aggregationId; +// "clzFullName": "cn.estsh.i3plus.pojo.report.bean.BrRefRoleMenu", +// "fieldName": "menuNameRdd", + + + @ApiParam(value ="属性全路径") + public String getFieldNameInfo(){ + return this.clzFullName + "." + this.fieldName; + } + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java index 0cd99b7..ae774f8 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.model.form; import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -64,7 +65,7 @@ public class SqlColumnModel { public SqlColumnModel() { } - public SqlColumnModel(String columnName, BlockFormEnumUtil.PROPERTY_TYPE type) { + public SqlColumnModel(String columnName, CommonEnumUtil.PROPERTY_TYPE type) { this.columnName = columnName; this.columnClassType = type.getValue(); this.columnTypeName = type.getDescription(); diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BeanBrPojoAttrModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BeanBrPojoAttrModel.java index 83aeee0..391e347 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BeanBrPojoAttrModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BeanBrPojoAttrModel.java @@ -1,35 +1,35 @@ -package cn.estsh.i3plus.pojo.model.report; - -import cn.estsh.i3plus.pojo.report.bean.BrPojoAttr; -import cn.estsh.i3plus.pojo.report.bean.BrTemplateCustomHql; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.util.List; - -/** - * @Description :// - * @Reference : - * @Author : Adair Peng - * @CreateDate : 2019-01-25 18:19 - * @Modify: - **/ -@Data -public class BeanBrPojoAttrModel { - - @ApiParam(value = "表单模板ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long templateId; - - @ApiParam(value = "数据类型") - private Integer dataType; - - @ApiParam(value = "对象属性") - private List attrList; - - @ApiParam(value = "自定义HQL") - private BrTemplateCustomHql customHql; - -} +//package cn.estsh.i3plus.pojo.model.report; +// +//import cn.estsh.i3plus.pojo.report.bean.BrPojoAttr; +//import cn.estsh.i3plus.pojo.report.bean.BrTemplateCustomHql; +//import com.fasterxml.jackson.databind.annotation.JsonSerialize; +//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +//import io.swagger.annotations.ApiParam; +//import lombok.Data; +// +//import java.util.List; +// +///** +// * @Description :// +// * @Reference : +// * @Author : Adair Peng +// * @CreateDate : 2019-01-25 18:19 +// * @Modify: +// **/ +//@Data +//public class BeanBrPojoAttrModel { +// +// @ApiParam(value = "表单模板ID") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long templateId; +// +// @ApiParam(value = "数据类型") +// private Integer dataType; +// +// @ApiParam(value = "对象属性") +// private List attrList; +// +// @ApiParam(value = "自定义HQL") +// private BrTemplateCustomHql customHql; +// +//} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java new file mode 100644 index 0000000..e3dc2fc --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.model.report; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : + * 自定义报表数据源传输对象 ， 单纯数据传输使用并不做保存使用 + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-12-5 下午4:02 + * @Modify: + **/ +@Data +public class BrDataSourceModel { + + /** + * 默认数据源信息 + */ + public static final BrDataSourceModel DEFAULT_DATA_SOURCE = new BrDataSourceModel("默认数据源", "DEFAULT", null, null, "使用默认数据源"); + + @ApiParam(value ="数据源名称") + private String sourceName; + + @ApiParam(value ="数据源编码") + private String sourceCode; + + @ApiParam(value ="数据源类型",name = "BlockFormEnumUtil.DATA_SOURCE_TYPE") + private Integer sourceType; + + @ApiParam(value ="数据库名称") + private String sourceDataBaseName; + + @ApiParam(value ="数据源描述") + private String sourceDescription; + + public BrDataSourceModel() { + } + + public BrDataSourceModel(String sourceName, String sourceCode, Integer sourceType, String sourceDataBaseName, String sourceDescription) { + this.sourceName = sourceName; + this.sourceCode = sourceCode; + this.sourceType = sourceType; + this.sourceDataBaseName = sourceDataBaseName; + this.sourceDescription = sourceDescription; + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java index a78d077..67bd9b5 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java @@ -1,10 +1,16 @@ package cn.estsh.i3plus.pojo.model.report; +import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; +import cn.estsh.i3plus.pojo.report.bean.*; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; +import java.util.List; +import java.util.Map; + /** * @Description : * @Reference : @@ -13,22 +19,70 @@ import lombok.Data; * @Modify: **/ @Data -public class TemplateModel { +public class TemplateModel implements Serializable { - @ApiParam("数据源ID") + private static final long serialVersionUID = -6385070202088819367L; + @ApiParam(value ="视图ID") @JsonSerialize(using = ToStringSerializer.class) - private Long sourceId; + private Long viewId; - @ApiParam("模板ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long templateId; + @ApiParam(value ="视图类型") + private Integer viewType; - @ApiParam("执行 HQL ") - private String hql; + @ApiParam(value ="视图名称") + private String viewName; + + @ApiParam(value ="返回信息") + private String resultMessage; + + @ApiParam(value = "查询对象") + private BrPojo pojo; + + @ApiParam(value = "对象连接") + private List joinList; + + @ApiParam(value = "对象晒算信息") + private BrPojoFilter filter; + + @ApiParam(value = "查询条件") + private List whereAttrList; + + @ApiParam(value = "分组条件") + private List groupAttrList; - @ApiParam("执行 HQL 参数名称 ") - private String[] paramName; + @ApiParam(value = "排序条件") + private BrPojoView view; + + @ApiParam(value = "排序条件") + private List orderAttrList; + + @ApiParam(value = "显示属性") + private List viewAttrList; + + @ApiParam(value = "显示属性别名") + private List viewAttrAliasList; + + @ApiParam(value = "跨服务调用返回数据") + private BaseResultBean cloudResultBean; + + @ApiParam(value = "跨服务调用解析后数据") + private List> rows; + + @ApiParam(value = "跨服务调用解析后数据") + private Object option; + + @ApiParam(value = "页面查询条件") + private Map findParam; + + @ApiParam("执行 HQL ") + private String selectHql; - @ApiParam("执行 HQL 参数值 ") - private Object[] paramValue; + @ApiParam("执行 HQL 返回数量") + private String countHql; +// +// @ApiParam("执行 HQL 参数名称 ") +// private String[] paramName; +// +// @ApiParam("执行 HQL 参数值 ") +// private Object[] paramValue; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java index f277ace..62dab28 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java @@ -27,7 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_EXCEPTION", +@Table(name="sys_log_exception", indexes = { @Index(columnList = "CREATE_DATE_TIME DESC", name = "LOG_INDEX_CREATE_DATE_TIME"), @Index(columnList = "EXC_MODULE_ID DESC", name = "LOG_INDEX_EXC_MODULE_ID") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java index f4fdc54..287e9df 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java @@ -55,6 +55,7 @@ public class SysLogSystem extends BaseBean { @ApiParam(value ="请求IP" , access ="请求IP") private String remoteIp; + @Column(name="REQUEST_URL") @ApiParam(value ="请求路径" , access ="请求路径") private String requestUrl; diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java index 8662f2b..6a28634 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java @@ -16,9 +16,6 @@ import java.util.List; /** * @Description : 数据元素 - * @Reference : Jenkins 自动合并代码测试 - * @Reference : Jenkins 自动合并代码测试 - * @Reference : Jenkins 自动合并代码测试 * @Author : alwaysfrin * @CreateDate : 2018-12-25 19:54 * @Modify: diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java index 6351b74..8f74c2a 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java @@ -52,12 +52,12 @@ public class BrLayout extends BaseBean { @ApiParam(value ="引用报表数量") private Integer layoutReportCount; - @Lob - @Column(name="LAYOUT_HTML") - @ApiParam(value ="布局html") - private String layoutHtml; - - @Lob +// @Lob +// @Column(name="LAYOUT_HTML") +// @ApiParam(value ="布局html") +// private String layoutHtml; +// +// @Lob @Column(name = "LAYOUT_DESCRIPTION") @ApiParam(value ="布局描述") private String layoutDescription; diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java index 9665e99..19ca013 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java @@ -68,13 +68,13 @@ public class BrLayoutColumn extends BaseBean { @ApiParam(value ="排序，降序") private Integer columnSort; - @Lob +// @Lob @Column(name = "COLUMN_DESCRIPTION") @ApiParam(value ="列描述") private String columnDescription; - @Lob - @Column(name="COLUMN_HTML") - @ApiParam(value ="列html") - private String columnHtml; +// @Lob +// @Column(name="COLUMN_HTML") +// @ApiParam(value ="列html") +// private String columnHtml; } diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java index 9b23fb0..bf6eaa1 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java @@ -56,10 +56,10 @@ public class BrLayoutRow extends BaseBean { @ApiParam(value ="行所关联列数") private Integer rowColNum; - @Lob - @Column(name="ROW_HTML") - @ApiParam(value ="行html") - private String rowHtml; +// @Lob +// @Column(name="ROW_HTML") +// @ApiParam(value ="行html") +// private String rowHtml; @Transient @ApiParam(value ="行所包含的列") diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java new file mode 100644 index 0000000..3b6b98f --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java @@ -0,0 +1,137 @@ +package cn.estsh.i3plus.pojo.report.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockReportEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-12-3 下午4:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BR_POJO") +@Api(value="报表对象",description = "报表对象") +public class BrPojo extends BaseBean { + + @Column(name="MASTER_ID") + @ApiParam(value ="主对象ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long masterId; + + @Column(name="POJO_TYPE") + @ApiParam(value ="对象类型") + private Integer pojoType; + + @Column(name="SOFT_TYPE") + @ApiParam(value ="产品类型") + private Integer softType; + + public String getSoftTypeTxt(){ + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); + } + + @Column(name="SOURCE_CODE") + @ApiParam(value ="数据源编码") + private String sourceCode; + + @Column(name="SOURCE_NAME") + @ApiParam(value ="数据源名称") + private String sourceName; + + @Column(name="POJO_PACKAGE_CODE") + @ApiParam(value ="对象全路径") + private String pojoPackageCode; + + @Column(name="POJO_CODE") + @ApiParam(value ="对象代码") + private String pojoCode; + + @Column(name="POJO_CODE_ALIAS") + @ApiParam(value ="对象别名") + private String pojoCodeAlias; + + @Column(name="pojo_name") + @ApiParam(value ="对象名称") + private String pojoName; + + @Column(name="POJO_SORT") + @ApiParam(value ="对象排序") + private Integer pojoSort; + + @Column(name="POJO_ATTR") + @ApiParam(value ="连接属性") + private String pojoAttr; + + @Column(name="JOIN_TYPE") + @ApiParam(value ="连接关系") + private Integer joinType; + public String getJoinTypeTxt(){ + return joinType == null ? null : BlockReportEnumUtil.HQL_REF.valueOfDescription(joinType); + } + + @Column(name="WHERE_TYPE") + @ApiParam(value ="连接类型") + private Integer whereType; + public String getWhereTypeTxt(){ + return whereType == null ? null : BlockReportEnumUtil.HQL_WHERE.valueOfDescription(whereType); + } + + @Column(name="JOIN_POJO_ID") + @ApiParam(value ="连接对象ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long joinPojoId; + + @Column(name="JOIN_POJO_NAME_RDD") + @ApiParam(value ="连接对象名称") + private String joinPojoNameRdd; + + @Column(name="JOIN_POJO_CODE_RDD") + @ApiParam(value ="连接对象代码") + private String joinPojoCodeRdd; + + @Column(name="JOIN_POJO_CODE_ALIAS_RDD") + @ApiParam(value ="连接对象别名") + private String joinPojoCodeAliasRdd; + + @Column(name="JOIN_POJO_ATTR") + @ApiParam(value ="连接对象属性") + private String joinPojoAttr; + + @Column(name="POJO_HQL") + @ApiParam(value ="对象名称") + private String pojoHql; + + @Column(name="POJO_DESCRIPTION") + @ApiParam(value ="对象描述") + private String pojoDescription; + + @Transient + @ApiParam(value = "主对象Pojo 信息") + private BrPojo masterPojo; + + @Transient + @ApiParam(value = "连接对象集合") + private List joinList; + +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilter.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilter.java new file mode 100644 index 0000000..bd1739c --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilter.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.report.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-12-3 下午5:10 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BR_POJO_FILTER") +@Api(value="对象筛选器",description = "对象筛选器") +public class BrPojoFilter extends BaseBean { + + @Column(name="MASTER_ID") + @ApiParam(value ="主对象ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long masterId; + + @Column(name="FILTER_NAME") + @ApiParam(value ="筛选器名称") + private String filterName; + + @Column(name="FILTER_DESCRIPTION") + @ApiParam(value ="筛选器描述") + private String filterDescription; + +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java new file mode 100644 index 0000000..fa78d8b --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java @@ -0,0 +1,129 @@ +package cn.estsh.i3plus.pojo.report.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockReportEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-12-3 下午5:10 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BR_POJO_FILTER_ATTR") +@Api(value="对象筛选器",description = "对象筛选器") +public class BrPojoFilterAttr extends BaseBean { + + @Column(name="FILTER_ID") + @ApiParam(value ="筛选器ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long filterId; + + @Column(name="MASTER_ID") + @ApiParam(value ="主对象ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long masterId; + /************************************** 对象信息 **************************************/ + + @Column(name="POJO_ID") + @ApiParam(value ="对象ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long pojoId; + + @Column(name="POJO_NAME_RDD") + @ApiParam(value ="对象名称") + private String pojoNameRdd; + + @Column(name="POJO_CODE_RDD") + @ApiParam(value ="对象代码") + private String pojoCodeRdd; + + @Column(name="POJO_CODE_ALIAS_RDD") + @ApiParam(value ="对象别名") + private String pojoCodeAliasRdd; + + @Column(name="POJO_ATTR") + @ApiParam(value ="对象属性") + private String pojoAttr; + + @Column(name="PACKAGE_POJO_ATTR") + @ApiParam(value ="对象属性全路径") + private String packagePojoAttr; + + + /************************************** 属性信息 **************************************/ + + + @Column(name="ATTR_NAME") + @ApiParam(value ="属性显示名称") + private String attrName; + + @Column(name="ATTR_SHOW") + @ApiParam(value ="属性是否显示") + private Integer attrShow; + public String getAttrShowTxt(){ + return attrShow == null ? null : CommonEnumUtil.TRUE_OR_FALSE.valueOfDescription(attrShow); + } + + + @Column(name="ATTR_TYPE") + @ApiParam(value ="属性类型") // 查询条件 ， 分组 + private Integer attrType; + public String getAttrTypeTxt(){ + return attrType == null ? null : BlockReportEnumUtil.HQL_ATTR_DATA_TYPE.valueOfDescription(attrType); + } + + + @Column(name="FILTER_JOIN_TYPE") // AND OR 与 或 非 + @ApiParam(value ="属性连接类型") + private Integer filterJoinType; + public String getFilterJoinTypeTxt(){ + return filterJoinType == null ? null : BlockReportEnumUtil.HQL_WHERE_REF.valueOfDescription(filterJoinType); + } + + @Column(name="FILTER_ATTR_TYPE") // = ,like,in + @ApiParam(value ="属性筛选类型") + private Integer filterAttrType; + public String getFilterAttrTypeTxt(){ + return filterAttrType == null ? null : CommonEnumUtil.SQL_WHERE.valueOfDescription(filterAttrType); + } + + @Column(name="ATTR_SORT") + @ApiParam(value ="属性筛选排序") + private Integer attrSort; + + @Column(name="ATTR_DEFAULT_VALUE") + @ApiParam(value ="属性默认值") + private String attrDefaultValue; + + @Column(name="ATTR_DESCRIPTION") + @ApiParam(value ="属性描述") + private String attrDescription; + + @Column(name="ATTR_HQL") + @ApiParam(value ="属性HQL") + private String attrHql; + + @Transient + @ApiParam(value ="表单查询内容") + private String attrFormValue; +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoView.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoView.java new file mode 100644 index 0000000..58ce06c --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoView.java @@ -0,0 +1,79 @@ +package cn.estsh.i3plus.pojo.report.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockReportEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-12-3 下午5:10 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BR_POJO_VIEW") +@Api(value="对象视图",description = "对象视图") +public class BrPojoView extends BaseBean { + + @Column(name="POJO_ID") + @ApiParam(value ="主对象ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long pojoId; + + @Column(name="MASTER_ID") + @ApiParam(value ="主对象ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long masterId; + + @Column(name="VIEW_NAME") + @ApiParam(value ="视图名称") + private String viewName; + + @Column(name="FILTER_ID") + @ApiParam(value ="筛选器ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long filterId; + + @Column(name="POJO_NAME_RDD") + @ApiParam(value ="对象名称") + private String pojoNameRdd; + + @Column(name="FILTER_NAME_RDD") + @ApiParam(value ="筛选器名称") + private String filterNameRdd; + + @Column(name="VIEW_TYPE") + @ApiParam(value ="视图类型") + private Integer viewType; + public String getViewTypeTxt(){ + return viewType == null ? null : BlockReportEnumUtil.TEMPLATE_TYPE.valueOf(viewType); + } + + @Column(name="VIEW_DESCRIPTION") + @ApiParam(value ="视图描述") + private String viewDescription; + + @Transient + @ApiParam(value ="显示属性集合") + private List viewAttrList; + +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java new file mode 100644 index 0000000..e4cbcd3 --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java @@ -0,0 +1,112 @@ +package cn.estsh.i3plus.pojo.report.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-12-3 下午5:10 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BR_POJO_VIEW_ATTR") +@Api(value = "对象视图", description = "对象视图") +public class BrPojoViewAttr extends BaseBean { + + @Column(name = "VIEW_ID") + @ApiParam(value = "视图ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long viewId; + + /************************************** 对象信息 **************************************/ + + @Column(name = "POJO_ID") + @ApiParam(value = "对象ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long pojoId; + + @Column(name = "POJO_NAME_RDD") + @ApiParam(value = "对象名称") + private String pojoNameRdd; + + @Column(name = "POJO_CODE_RDD") + @ApiParam(value = "对象代码") + private String pojoCodeRdd; + + @Column(name = "POJO_CODE_ALIAS_RDD") + @ApiParam(value = "对象别名") + private String pojoCodeAliasRdd; + + @Column(name="POJO_ATTR") + @ApiParam(value ="对象属性") + private String pojoAttr; + + @Column(name="PACKAGE_POJO_ATTR") + @ApiParam(value ="对象属性全路径") + private String packagePojoAttr; + + @Column(name="VIEW_ATTR_ALIAS") + @ApiParam(value ="视图属性别名") + private String viewAttrAlias; + + /************************************** 属性信息 **************************************/ + + @Column(name = "AGGREGATION_TYPE") + @ApiParam(value = "聚合类型") + private Integer aggregationType; + + @Column(name = "VIEW_ATTR_NAME") + @ApiParam(value = "显示名称") + private String viewAttrName; + + @Column(name = "VIEW_DIMENSION") + @ApiParam(value = "视图维度") + private String viewDimension; + + @Column(name = "ATTR_SORT") + @ApiParam(value = "属性显示排序") + private Integer attrSort; + + @Column(name="ATTR_SORT_TYPE") + @ApiParam(value ="排序规则") + private Integer attrSortType; + public String getAttrSortTypeTxt(){ + return attrSortType == null ? null : CommonEnumUtil.ASC_OR_DESC.valueOf(attrSortType); + } + + @Column(name="ATTR_SHOW") + @ApiParam(value ="属性是否显示") + private Integer attrShow; + public String getAttrShowTxt(){ + return attrShow == null ? null : CommonEnumUtil.TRUE_OR_FALSE.valueOfDescription(attrShow); + } + + @Column(name="ATTR_HQL") + @ApiParam(value ="属性HQL") + private String attrHql; + + @Column(name = "VIEW_DESCRIPTION") + @ApiParam(value = "视图描述") + private String viewDescription; + + +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefPojo.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefPojo.java index ae634ed..a6caca8 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefPojo.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefPojo.java @@ -1,77 +1,77 @@ -package cn.estsh.i3plus.pojo.report.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -/** - * @Description : - * @Reference : - * @Author : Adair Peng - * @CreateDate : 2019-01-18 11:32 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="BR_REF_POJO") -@Api(value="对象关系",description = "对象关系") -public class BrRefPojo extends BaseBean { - - @Column(name="TEMPLATE_ID") - @ApiParam(value ="模板编号" ,example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long templateId; - - @Column(name="REF_TYPE") - @ApiParam(value ="关系类型") - private Integer refType; - - @Column(name="REF_SORT") - @ApiParam(value ="关系排序") - private Integer refSort; - - @Column(name="MASTER_SERVER_ID") - @ApiParam(value ="主服务编号" ,example = "-1") - private Integer masterServerId; - - @Column(name="MASTER_POJO_NAME") - @ApiParam(value ="副对象名称") - private String masterPojoName; - - @Column(name="MASTER_POJO_NAME_ALIAS") - @ApiParam(value ="主对象别名") - private String masterPojoNameAlias; - - @Column(name="MASTER_POJO_NAME_ATTR_NAME") - @ApiParam(value ="主对象属性名称" ) - private String masterPojoAttName; - - @Column(name="SECONDARY_SERVER_ID") - @ApiParam(value ="主服务编号") - private Integer secondaryServerId; - - @Column(name="SECONDARY_POJO_NAME") - @ApiParam(value ="副对象名称") - private String secondaryPojoName; - - @Column(name="SECONDARY_POJO_NAME_ALIAS") - @ApiParam(value ="副对象别名" ) - private String secondaryPojoNameAlias; - - @Column(name="SECONDARY_POJO_ATTR_NAME") - @ApiParam(value ="副对象属性名称") - private String secondaryPojoAttrName; -} +//package cn.estsh.i3plus.pojo.report.bean; +// +//import cn.estsh.i3plus.pojo.base.bean.BaseBean; +//import com.fasterxml.jackson.databind.annotation.JsonSerialize; +//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiParam; +//import lombok.Data; +//import lombok.EqualsAndHashCode; +//import org.hibernate.annotations.DynamicInsert; +//import org.hibernate.annotations.DynamicUpdate; +// +//import javax.persistence.Column; +//import javax.persistence.Entity; +//import javax.persistence.Table; +// +///** +// * @Description : +// * @Reference : +// * @Author : Adair Peng +// * @CreateDate : 2019-01-18 11:32 +// * @Modify: +// **/ +//@Data +//@Entity +//@DynamicInsert +//@DynamicUpdate +//@EqualsAndHashCode(callSuper = true) +//@Table(name="BR_REF_POJO") +//@Api(value="对象关系",description = "对象关系") +//public class BrRefPojo extends BaseBean { +// +// @Column(name="TEMPLATE_ID") +// @ApiParam(value ="模板编号" ,example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long templateId; +// +// @Column(name="REF_TYPE") +// @ApiParam(value ="关系类型") +// private Integer refType; +// +// @Column(name="REF_SORT") +// @ApiParam(value ="关系排序") +// private Integer refSort; +// +// @Column(name="MASTER_SERVER_ID") +// @ApiParam(value ="主服务编号" ,example = "-1") +// private Integer masterServerId; +// +// @Column(name="MASTER_POJO_NAME") +// @ApiParam(value ="副对象名称") +// private String masterPojoName; +// +// @Column(name="MASTER_POJO_NAME_ALIAS") +// @ApiParam(value ="主对象别名") +// private String masterPojoNameAlias; +// +// @Column(name="MASTER_POJO_NAME_ATTR_NAME") +// @ApiParam(value ="主对象属性名称" ) +// private String masterPojoAttName; +// +// @Column(name="SECONDARY_SERVER_ID") +// @ApiParam(value ="主服务编号") +// private Integer secondaryServerId; +// +// @Column(name="SECONDARY_POJO_NAME") +// @ApiParam(value ="副对象名称") +// private String secondaryPojoName; +// +// @Column(name="SECONDARY_POJO_NAME_ALIAS") +// @ApiParam(value ="副对象别名" ) +// private String secondaryPojoNameAlias; +// +// @Column(name="SECONDARY_POJO_ATTR_NAME") +// @ApiParam(value ="副对象属性名称") +// private String secondaryPojoAttrName; +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java index 2c32625..286e9ef 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java @@ -9,7 +9,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.Type; import javax.persistence.Column; import javax.persistence.Entity; @@ -58,13 +57,13 @@ public class BrRefReportTypeset extends BaseBean { @JsonSerialize (using = ToStringSerializer.class) private Long refId; - /** - * 关联元素或模板html - */ - @Lob - @Column(name = "REF_HTML") - @ApiParam(value = "关联对象html") - private String refHtml; +// /** +// * 关联元素或模板html +// */ +// @Lob +// @Column(name = "REF_HTML") +// @ApiParam(value = "关联对象html") +// private String refHtml; @Lob @Column(name = "TYPESET_DESCRIPTION") diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefServerPojo.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefServerPojo.java index f6bc656..a92088e 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefServerPojo.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefServerPojo.java @@ -1,115 +1,115 @@ -package cn.estsh.i3plus.pojo.report.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.util.List; - -/** - * @Description : - * @Reference : - * @Author : Adair Peng - * @CreateDate : 2019-01-18 11:31 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="BR_REF_SERVER_POJO") -@Api(value="报表模板服务对象",description = "报表模板服务对象") -public class BrRefServerPojo extends BaseBean { - - @Column(name="TEMPLATE_ID") - @ApiParam(value ="模板编号" ,example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long templateId; - - @Column(name="TEMPLATE_NAME_RDD") - @ApiParam(value ="模板名称" , access ="模板名称") - private String templateNameRdd; - - @Column(name="POJO_REF_TYPE") - @ApiParam(value ="关系类型") - private Integer pojoRefType; - - @Column(name="POJO_WHERE_TYPE") - @ApiParam(value ="连接关系") - private Integer pojoWhereType; - - @Column(name="POJO_SORT") - @ApiParam(value ="主服务编号" ,example = "-1") - private Integer pojoSort; - - @Column(name="MASTER_SERVER_ID") - @ApiParam(value ="主服务编号" ,example = "-1") - private Integer masterServerId; - - @Column(name="MASTER_SERVER_NAME_RDD") - @ApiParam(value ="主服务名称" ,example = "-1") - private String masterServerNameRdd; - - @Column(name="MASTER_POJO_NAME") - @ApiParam(value ="副对象名称") - private String masterPojoName; - - @Column(name="MASTER_PACKAGE_NAME_RDD") - @ApiParam(value ="主服务对象包名称" , access ="服务对象包名称") - private String masterPackageNameRdd; - - @Column(name="MASTER_POJO_NAME_ALIAS") - @ApiParam(value ="主对象别名") - private String masterPojoNameAlias; - - @Column(name="MASTER_POJO_NAME_DESC") - @ApiParam(value ="主对象中文名称") - private String masterPojoNameDesc; - - @Column(name="MASTER_POJO_NAME_ATTR_NAME") - @ApiParam(value ="主对象属性名称" ) - private String masterPojoAttrName; - - @Column(name="SECONDARY_SERVER_ID") - @ApiParam(value ="主服务编号") - private Integer secondaryServerId; - - @Column(name="SECONDARY_SERVER_NAME") - @ApiParam(value ="主服务编号") - private String secondaryServerName; - - @Column(name="SECONDARY_POJO_NAME") - @ApiParam(value ="副对象名称") - private String secondaryPojoName; - - @Column(name="SECONDARY_PACKAGE_NAME") - @ApiParam(value ="主服务对象包名称" , access ="服务对象包名称") - private String secondaryPackageName; - - @Column(name="SECONDARY_POJO_NAME_ALIAS") - @ApiParam(value ="副对象别名" ) - private String secondaryPojoNameAlias; - - @Column(name="SECONDARY_POJO_NAME_DESC") - @ApiParam(value ="副对象中文名称") - private String secondaryPojoNameDesc; - - @Column(name="SECONDARY_POJO_ATTR_NAME") - @ApiParam(value ="副对象属性名称") - private String secondaryPojoAttrName; - - @Transient - @ApiParam(value ="模板服务对象属性") - private List pojoAttrList; -} +//package cn.estsh.i3plus.pojo.report.bean; +// +//import cn.estsh.i3plus.pojo.base.bean.BaseBean; +//import com.fasterxml.jackson.databind.annotation.JsonSerialize; +//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiParam; +//import lombok.Data; +//import lombok.EqualsAndHashCode; +//import org.hibernate.annotations.DynamicInsert; +//import org.hibernate.annotations.DynamicUpdate; +// +//import javax.persistence.Column; +//import javax.persistence.Entity; +//import javax.persistence.Table; +//import javax.persistence.Transient; +//import java.util.List; +// +///** +// * @Description : +// * @Reference : +// * @Author : Adair Peng +// * @CreateDate : 2019-01-18 11:31 +// * @Modify: +// **/ +//@Data +//@Entity +//@DynamicInsert +//@DynamicUpdate +//@EqualsAndHashCode(callSuper = true) +//@Table(name="BR_REF_SERVER_POJO") +//@Api(value="报表模板服务对象",description = "报表模板服务对象") +//public class BrRefServerPojo extends BaseBean { +// +// @Column(name="TEMPLATE_ID") +// @ApiParam(value ="模板编号" ,example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long templateId; +// +// @Column(name="TEMPLATE_NAME_RDD") +// @ApiParam(value ="模板名称" , access ="模板名称") +// private String templateNameRdd; +// +// @Column(name="POJO_REF_TYPE") +// @ApiParam(value ="关系类型") +// private Integer pojoRefType; +// +// @Column(name="POJO_WHERE_TYPE") +// @ApiParam(value ="连接关系") +// private Integer pojoWhereType; +// +// @Column(name="POJO_SORT") +// @ApiParam(value ="主服务编号" ,example = "-1") +// private Integer pojoSort; +// +// @Column(name="MASTER_SERVER_ID") +// @ApiParam(value ="主服务编号" ,example = "-1") +// private Integer masterServerId; +// +// @Column(name="MASTER_SERVER_NAME_RDD") +// @ApiParam(value ="主服务名称" ,example = "-1") +// private String masterServerNameRdd; +// +// @Column(name="MASTER_POJO_NAME") +// @ApiParam(value ="副对象名称") +// private String masterPojoName; +// +// @Column(name="MASTER_PACKAGE_NAME_RDD") +// @ApiParam(value ="主服务对象包名称" , access ="服务对象包名称") +// private String masterPackageNameRdd; +// +// @Column(name="MASTER_POJO_NAME_ALIAS") +// @ApiParam(value ="主对象别名") +// private String masterPojoNameAlias; +// +// @Column(name="MASTER_POJO_NAME_DESC") +// @ApiParam(value ="主对象中文名称") +// private String masterPojoNameDesc; +// +// @Column(name="MASTER_POJO_NAME_ATTR_NAME") +// @ApiParam(value ="主对象属性名称" ) +// private String masterPojoAttrName; +// +// @Column(name="SECONDARY_SERVER_ID") +// @ApiParam(value ="主服务编号") +// private Integer secondaryServerId; +// +// @Column(name="SECONDARY_SERVER_NAME") +// @ApiParam(value ="主服务编号") +// private String secondaryServerName; +// +// @Column(name="SECONDARY_POJO_NAME") +// @ApiParam(value ="副对象名称") +// private String secondaryPojoName; +// +// @Column(name="SECONDARY_PACKAGE_NAME") +// @ApiParam(value ="主服务对象包名称" , access ="服务对象包名称") +// private String secondaryPackageName; +// +// @Column(name="SECONDARY_POJO_NAME_ALIAS") +// @ApiParam(value ="副对象别名" ) +// private String secondaryPojoNameAlias; +// +// @Column(name="SECONDARY_POJO_NAME_DESC") +// @ApiParam(value ="副对象中文名称") +// private String secondaryPojoNameDesc; +// +// @Column(name="SECONDARY_POJO_ATTR_NAME") +// @ApiParam(value ="副对象属性名称") +// private String secondaryPojoAttrName; +// +// @Transient +// @ApiParam(value ="模板服务对象属性") +// private List pojoAttrList; +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefTemplateServer.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefTemplateServer.java index 059881a..d06783d 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefTemplateServer.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefTemplateServer.java @@ -1,50 +1,50 @@ -package cn.estsh.i3plus.pojo.report.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -/** - * @Description : - * @Reference : - * @Author : Adair Peng - * @CreateDate : 2019-01-18 11:31 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="BR_REF_TEMPLATE_SERVER") -@Api(value="报表模板-服务",description = "报表模板-服务") -public class BrRefTemplateServer extends BaseBean { - - @Column(name="TEMPLATE_ID") - @ApiParam(value ="模板编号" ,example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long templateId; - - @Column(name="TEMPLATE_NAME_RDD") - @ApiParam(value ="模板名称" , access ="模板名称") - private String templateNameRdd; - - @Column(name="SERVER_ID") - @ApiParam(value ="服务编号" ,example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Integer serverId; - - @Column(name="SERVER_NAME_RDD") - @ApiParam(value ="服务名称" , access ="模板名称") - private String serverNameRdd; -} +//package cn.estsh.i3plus.pojo.report.bean; +// +//import cn.estsh.i3plus.pojo.base.bean.BaseBean; +//import com.fasterxml.jackson.databind.annotation.JsonSerialize; +//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiParam; +//import lombok.Data; +//import lombok.EqualsAndHashCode; +//import org.hibernate.annotations.DynamicInsert; +//import org.hibernate.annotations.DynamicUpdate; +// +//import javax.persistence.Column; +//import javax.persistence.Entity; +//import javax.persistence.Table; +// +///** +// * @Description : +// * @Reference : +// * @Author : Adair Peng +// * @CreateDate : 2019-01-18 11:31 +// * @Modify: +// **/ +//@Data +//@Entity +//@DynamicInsert +//@DynamicUpdate +//@EqualsAndHashCode(callSuper = true) +//@Table(name="BR_REF_TEMPLATE_SERVER") +//@Api(value="报表模板-服务",description = "报表模板-服务") +//public class BrRefTemplateServer extends BaseBean { +// +// @Column(name="TEMPLATE_ID") +// @ApiParam(value ="模板编号" ,example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long templateId; +// +// @Column(name="TEMPLATE_NAME_RDD") +// @ApiParam(value ="模板名称" , access ="模板名称") +// private String templateNameRdd; +// +// @Column(name="SERVER_ID") +// @ApiParam(value ="服务编号" ,example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Integer serverId; +// +// @Column(name="SERVER_NAME_RDD") +// @ApiParam(value ="服务名称" , access ="模板名称") +// private String serverNameRdd; +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java index 7debebc..f424ef0 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java @@ -4,13 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.Type; import javax.persistence.*; import java.util.List; diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplate.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplate.java index 8c3ead4..5fb16dc 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplate.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplate.java @@ -1,56 +1,56 @@ -package cn.estsh.i3plus.pojo.report.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.util.List; - -/** - * @Description : 自定义报表模板 - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-12-25 19:54 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="BrReportTemplate") -@Api(value="自定义报表模板",description = "报表模板，实现对应的报表生成方法") -public class BrReportTemplate extends BaseBean { - - @Column(name="LAYOUT_ID") - @ApiParam(value ="布局主键") - @JsonSerialize(using = ToStringSerializer.class) - private Long layoutId; - - @Column(name="LAYOUT_COLUMN_ID") - @ApiParam(value ="列主键") - @JsonSerialize(using = ToStringSerializer.class) - private Long layoutColumnId; - - @Column(name="TEMPLATE_NAME") - @ApiParam(value ="模板名称") - private String templateName; - - @Transient - @ApiParam(value ="报表模板列表") - private List brRefReportTypesetList; - - @Transient - @ApiParam(value ="元素所在的列") - private BrLayoutColumn brLayoutColumn; -} +//package cn.estsh.i3plus.pojo.report.bean; +// +//import cn.estsh.i3plus.pojo.base.bean.BaseBean; +//import com.fasterxml.jackson.databind.annotation.JsonSerialize; +//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiParam; +//import lombok.Data; +//import lombok.EqualsAndHashCode; +//import org.hibernate.annotations.DynamicInsert; +//import org.hibernate.annotations.DynamicUpdate; +// +//import javax.persistence.Column; +//import javax.persistence.Entity; +//import javax.persistence.Table; +//import javax.persistence.Transient; +//import java.util.List; +// +///** +// * @Description : 自定义报表模板 +// * @Reference : +// * @Author : alwaysfrin +// * @CreateDate : 2018-12-25 19:54 +// * @Modify: +// **/ +//@Data +//@Entity +//@DynamicInsert +//@DynamicUpdate +//@EqualsAndHashCode(callSuper = true) +//@Table(name="BrReportTemplate") +//@Api(value="自定义报表模板",description = "报表模板，实现对应的报表生成方法") +//public class BrReportTemplate extends BaseBean { +// +// @Column(name="LAYOUT_ID") +// @ApiParam(value ="布局主键") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long layoutId; +// +// @Column(name="LAYOUT_COLUMN_ID") +// @ApiParam(value ="列主键") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long layoutColumnId; +// +// @Column(name="TEMPLATE_NAME") +// @ApiParam(value ="模板名称") +// private String templateName; +// +// @Transient +// @ApiParam(value ="报表模板列表") +// private List brRefReportTypesetList; +// +// @Transient +// @ApiParam(value ="元素所在的列") +// private BrLayoutColumn brLayoutColumn; +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplate.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplate.java index 0d7819a..96ead90 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplate.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplate.java @@ -1,165 +1,165 @@ -package cn.estsh.i3plus.pojo.report.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.Type; - -import javax.persistence.*; -import java.util.ArrayList; -import java.util.List; - -/** - * @Description : - * @Reference : - * @Author : Adair Peng - * @CreateDate : 2019-01-18 11:23 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="BR_TEMPLATE") -@Api(value="报表模板",description = "报表模板") -public class BrTemplate extends BaseBean { - - @Column(name = "DATA_SOURCE_ID") - @ApiParam(value = "数据源ID", example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long dataSourceId = 0L; - - @Column(name="NAME") - @ApiParam(value ="模板名称" , access ="模板名称") - private String name; - - @Column(name="TEMPLATE_TYPE") - @ApiParam(value ="模板类型" , example ="-1",access="表格，图表") - private Integer templateType; - - @Column(name="TEMPLATE_STATUS") - @ApiParam(value ="模板状态" , example ="-1",access="模板状态") - private Integer templateStatus; - - @Column(name="NUM_POJO") - @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") - private Integer numPojo; - - @Lob - @Column(name="TEMPLATE_POJO_NAMES_RDD") - @ApiParam(value ="对象名称" , access ="对象名称") - private String templatePojoNamesRdd; - - @Column(name="NUM_SERVER") - @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") - private Integer numServer; - - @Lob - @Column(name="TEMPLATE_SERVER_ID_LIST") - @ApiParam(value ="数据服务ID集合" , access ="服务名称") - private String templateServerIdList; - - @Lob - @Column(name="TEMPLATE_SERVER_NAMES_RDD") - @ApiParam(value ="服务名称" , access ="服务名称") - private String templateServerNamesRdd; - - @Column(name="NUM_TEMPLATE_ATTR_FILTER") - @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") - private Integer numTemplateAttrFilter; - - @Lob - @Column(name="template_attr_filter_list") - @ApiParam(value ="模板查询条件" , access ="模板查询条件") - private String templateAttrFilterList; - - @Column(name="NUM_TEMPLATE_ATTR_FILTER_GROUP") - @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") - private Integer numTemplateAttrFilterGroup; - - @Lob - @Column(name="TEMPLATE_ATTR_FILTER_GROUP_LIST") - @ApiParam(value ="模板分组条件" , access ="模板分組条件") - private String templateAttrFilterGroupList; - - @Column(name="NUM_TEMPLATE_ATTR_SHOW") - @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") - private Integer numTemplateAttrShow; - - @Lob - @Column(name="TEMPLATE_ATTR_SHOW_LIST") - @ApiParam(value ="模板显示属性" , access ="模板显示属性") - private String templateAttrShowList; - - @Column(name="NUM_TEMPLATE_AGGREGATION") - @ApiParam(value ="对象聚集数量" , example ="0" , access ="对象聚集数量") - private Integer numTemplateAggregation; - - @Lob - @Column(name="TEMPLATE_ATTR_AGGREGATION_LIST") - @ApiParam(value ="模板聚集属性" , access ="模板聚集属性") - private String templateAttrAggregationList; - - @Column(name="TEMPLATE_DESCRIPTION") - @ApiParam(value ="模板描述" , access ="模板描述") - private String templateDescription; - - @Lob - @Column(name="TEMPLATE_HQL") - @ApiParam(value ="模板执行HQL" , access ="模板执行HQL") - private String templateHql; - - @Lob - @Column(name="TEMPLATE_HTML") - @ApiParam(value ="模板HTML" , access ="模板HTML") - private String templateHtml; - - @Transient - @ApiParam(value ="模板服务编号集合") - private List serverIdList = new ArrayList<>(); - - @Transient - @ApiParam(value ="模板服务") - private List serverList = new ArrayList<>(); - - @Transient - @ApiParam(value ="模板服务对象") - private List serverPojoList = new ArrayList<>(); - - @Transient - @ApiParam(value ="模板服务对象关系") - private List serverPojoRefList = new ArrayList<>(); - - @Transient - @ApiParam(value ="模板服务对象关联属性") - private List pojoAttrList = new ArrayList<>(); - - - @Transient - @ApiParam(value ="模板服务对象查询条件") - private List pojoAttrWhereList = new ArrayList<>(); - - @Transient - @ApiParam(value ="模板服务对象分组条件") - private List pojoAttrGroupList = new ArrayList<>(); - - @Transient - @ApiParam(value ="模板服务对象聚合条件") - private List pojoAttrAggregationList = new ArrayList<>(); - - @Transient - @ApiParam(value ="模板服务对象显示属性") - private List pojoAttrShowList = new ArrayList<>(); - - @Transient - @ApiParam(value ="模板服务集合") - private List serverNameList = new ArrayList<>(); - -} +//package cn.estsh.i3plus.pojo.report.bean; +// +//import cn.estsh.i3plus.pojo.base.bean.BaseBean; +//import com.fasterxml.jackson.databind.annotation.JsonSerialize; +//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiParam; +//import lombok.Data; +//import lombok.EqualsAndHashCode; +//import org.hibernate.annotations.DynamicInsert; +//import org.hibernate.annotations.DynamicUpdate; +//import org.hibernate.annotations.Type; +// +//import javax.persistence.*; +//import java.util.ArrayList; +//import java.util.List; +// +///** +// * @Description : +// * @Reference : +// * @Author : Adair Peng +// * @CreateDate : 2019-01-18 11:23 +// * @Modify: +// **/ +//@Data +//@Entity +//@DynamicInsert +//@DynamicUpdate +//@EqualsAndHashCode(callSuper = true) +//@Table(name="BR_TEMPLATE") +//@Api(value="报表模板",description = "报表模板") +//public class BrTemplate extends BaseBean { +// +// @Column(name = "DATA_SOURCE_ID") +// @ApiParam(value = "数据源ID", example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long dataSourceId = 0L; +// +// @Column(name="NAME") +// @ApiParam(value ="模板名称" , access ="模板名称") +// private String name; +// +// @Column(name="TEMPLATE_TYPE") +// @ApiParam(value ="模板类型" , example ="-1",access="表格，图表") +// private Integer templateType; +// +// @Column(name="TEMPLATE_STATUS") +// @ApiParam(value ="模板状态" , example ="-1",access="模板状态") +// private Integer templateStatus; +// +// @Column(name="NUM_POJO") +// @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") +// private Integer numPojo; +// +// @Lob +// @Column(name="TEMPLATE_POJO_NAMES_RDD") +// @ApiParam(value ="对象名称" , access ="对象名称") +// private String templatePojoNamesRdd; +// +// @Column(name="NUM_SERVER") +// @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") +// private Integer numServer; +// +// @Lob +// @Column(name="TEMPLATE_SERVER_ID_LIST") +// @ApiParam(value ="数据服务ID集合" , access ="服务名称") +// private String templateServerIdList; +// +// @Lob +// @Column(name="TEMPLATE_SERVER_NAMES_RDD") +// @ApiParam(value ="服务名称" , access ="服务名称") +// private String templateServerNamesRdd; +// +// @Column(name="NUM_TEMPLATE_ATTR_FILTER") +// @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") +// private Integer numTemplateAttrFilter; +// +// @Lob +// @Column(name="template_attr_filter_list") +// @ApiParam(value ="模板查询条件" , access ="模板查询条件") +// private String templateAttrFilterList; +// +// @Column(name="NUM_TEMPLATE_ATTR_FILTER_GROUP") +// @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") +// private Integer numTemplateAttrFilterGroup; +// +// @Lob +// @Column(name="TEMPLATE_ATTR_FILTER_GROUP_LIST") +// @ApiParam(value ="模板分组条件" , access ="模板分組条件") +// private String templateAttrFilterGroupList; +// +// @Column(name="NUM_TEMPLATE_ATTR_SHOW") +// @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") +// private Integer numTemplateAttrShow; +// +// @Lob +// @Column(name="TEMPLATE_ATTR_SHOW_LIST") +// @ApiParam(value ="模板显示属性" , access ="模板显示属性") +// private String templateAttrShowList; +// +// @Column(name="NUM_TEMPLATE_AGGREGATION") +// @ApiParam(value ="对象聚集数量" , example ="0" , access ="对象聚集数量") +// private Integer numTemplateAggregation; +// +// @Lob +// @Column(name="TEMPLATE_ATTR_AGGREGATION_LIST") +// @ApiParam(value ="模板聚集属性" , access ="模板聚集属性") +// private String templateAttrAggregationList; +// +// @Column(name="TEMPLATE_DESCRIPTION") +// @ApiParam(value ="模板描述" , access ="模板描述") +// private String templateDescription; +// +// @Lob +// @Column(name="TEMPLATE_HQL") +// @ApiParam(value ="模板执行HQL" , access ="模板执行HQL") +// private String templateHql; +// +// @Lob +// @Column(name="TEMPLATE_HTML") +// @ApiParam(value ="模板HTML" , access ="模板HTML") +// private String templateHtml; +// +// @Transient +// @ApiParam(value ="模板服务编号集合") +// private List serverIdList = new ArrayList<>(); +// +// @Transient +// @ApiParam(value ="模板服务") +// private List serverList = new ArrayList<>(); +// +// @Transient +// @ApiParam(value ="模板服务对象") +// private List serverPojoList = new ArrayList<>(); +// +// @Transient +// @ApiParam(value ="模板服务对象关系") +// private List serverPojoRefList = new ArrayList<>(); +// +// @Transient +// @ApiParam(value ="模板服务对象关联属性") +// private List pojoAttrList = new ArrayList<>(); +// +// +// @Transient +// @ApiParam(value ="模板服务对象查询条件") +// private List pojoAttrWhereList = new ArrayList<>(); +// +// @Transient +// @ApiParam(value ="模板服务对象分组条件") +// private List pojoAttrGroupList = new ArrayList<>(); +// +// @Transient +// @ApiParam(value ="模板服务对象聚合条件") +// private List pojoAttrAggregationList = new ArrayList<>(); +// +// @Transient +// @ApiParam(value ="模板服务对象显示属性") +// private List pojoAttrShowList = new ArrayList<>(); +// +// @Transient +// @ApiParam(value ="模板服务集合") +// private List serverNameList = new ArrayList<>(); +// +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplateCustomHql.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplateCustomHql.java index 8e5e68a..2d040ec 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplateCustomHql.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplateCustomHql.java @@ -1,49 +1,49 @@ -package cn.estsh.i3plus.pojo.report.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.Type; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; - -/** - * @Description : - * @Reference : - * @Author : Adair Peng - * @CreateDate : 2019-01-18 11:23 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="BR_TEMPLATE_CUSTOM_HQL") -@Api(value="模板自定义语句",description = "模板自定义语句") -public class BrTemplateCustomHql extends BaseBean { - - @Column(name="TEMPLATE_ID") - @ApiParam(value ="模板编号" , example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long templateId; - - @Column(name="DATA_TYPE") - @ApiParam(value ="自定义类型" , example ="-1") - private Integer dataType; - - @Lob - @Column(name="CUSTOM_CONTENT") - @ApiParam(value ="自定义语句内容" , access ="自定义语句内容") - private String customContent; - -} +//package cn.estsh.i3plus.pojo.report.bean; +// +//import cn.estsh.i3plus.pojo.base.bean.BaseBean; +//import com.fasterxml.jackson.databind.annotation.JsonSerialize; +//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiParam; +//import lombok.Data; +//import lombok.EqualsAndHashCode; +//import org.hibernate.annotations.DynamicInsert; +//import org.hibernate.annotations.DynamicUpdate; +//import org.hibernate.annotations.Type; +// +//import javax.persistence.Column; +//import javax.persistence.Entity; +//import javax.persistence.Lob; +//import javax.persistence.Table; +// +///** +// * @Description : +// * @Reference : +// * @Author : Adair Peng +// * @CreateDate : 2019-01-18 11:23 +// * @Modify: +// **/ +//@Data +//@Entity +//@DynamicInsert +//@DynamicUpdate +//@EqualsAndHashCode(callSuper = true) +//@Table(name="BR_TEMPLATE_CUSTOM_HQL") +//@Api(value="模板自定义语句",description = "模板自定义语句") +//public class BrTemplateCustomHql extends BaseBean { +// +// @Column(name="TEMPLATE_ID") +// @ApiParam(value ="模板编号" , example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long templateId; +// +// @Column(name="DATA_TYPE") +// @ApiParam(value ="自定义类型" , example ="-1") +// private Integer dataType; +// +// @Lob +// @Column(name="CUSTOM_CONTENT") +// @ApiParam(value ="自定义语句内容" , access ="自定义语句内容") +// private String customContent; +// +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutColumnRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutColumnRepository.java index 395f0ca..83eab7d 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutColumnRepository.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutColumnRepository.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.report.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.report.bean.BrElement; import cn.estsh.i3plus.pojo.report.bean.BrLayoutColumn; /** diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoFilterAttrRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoFilterAttrRepository.java new file mode 100644 index 0000000..52660fd --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoFilterAttrRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.report.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.report.bean.BrPojo; +import cn.estsh.i3plus.pojo.report.bean.BrPojoFilterAttr; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-12-4 下午4:04 + * @Modify: + **/ +public interface BrPojoFilterAttrRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoFilterRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoFilterRepository.java new file mode 100644 index 0000000..266042e --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoFilterRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.report.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.report.bean.BrPojoFilter; +import cn.estsh.i3plus.pojo.report.bean.BrPojoView; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-12-4 下午4:04 + * @Modify: + **/ +public interface BrPojoFilterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoRepository.java new file mode 100644 index 0000000..f95a73f --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.report.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.report.bean.BrPojo; +import cn.estsh.i3plus.pojo.report.bean.BrPojoViewAttr; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-12-4 下午4:04 + * @Modify: + **/ +public interface BrPojoRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoViewAttrRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoViewAttrRepository.java new file mode 100644 index 0000000..cf9dd41 --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoViewAttrRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.report.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.report.bean.BrPojoViewAttr; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-12-4 下午4:04 + * @Modify: + **/ +public interface BrPojoViewAttrRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoViewRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoViewRepository.java new file mode 100644 index 0000000..af19376 --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoViewRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.report.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.report.bean.BrPojoView; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-12-4 下午4:04 + * @Modify: + **/ +public interface BrPojoViewRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefPojoRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefPojoRepository.java index febaf03..5df3c2f 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefPojoRepository.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefPojoRepository.java @@ -1,15 +1,15 @@ -package cn.estsh.i3plus.pojo.report.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.report.bean.BrRefPojo; - -/** - * @Description : - * @Reference : - * @Author : Adair Peng - * @CreateDate : 2019-01-18 15:04 - * @Modify: - **/ -public interface BrRefPojoRepository extends BaseRepository { - -} +//package cn.estsh.i3plus.pojo.report.repository; +// +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import cn.estsh.i3plus.pojo.report.bean.BrRefPojo; +// +///** +// * @Description : +// * @Reference : +// * @Author : Adair Peng +// * @CreateDate : 2019-01-18 15:04 +// * @Modify: +// **/ +//public interface BrRefPojoRepository extends BaseRepository { +// +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefServerPojoRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefServerPojoRepository.java index fbf9382..3d39e7c 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefServerPojoRepository.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefServerPojoRepository.java @@ -1,15 +1,15 @@ -package cn.estsh.i3plus.pojo.report.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.report.bean.BrMenu; -import cn.estsh.i3plus.pojo.report.bean.BrRefServerPojo; - -/** - * @Description : - * @Reference : - * @Author : Adair Peng - * @CreateDate : 2019-01-18 15:05 - * @Modify: - **/ -public interface BrRefServerPojoRepository extends BaseRepository { -} +//package cn.estsh.i3plus.pojo.report.repository; +// +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import cn.estsh.i3plus.pojo.report.bean.BrMenu; +//import cn.estsh.i3plus.pojo.report.bean.BrRefServerPojo; +// +///** +// * @Description : +// * @Reference : +// * @Author : Adair Peng +// * @CreateDate : 2019-01-18 15:05 +// * @Modify: +// **/ +//public interface BrRefServerPojoRepository extends BaseRepository { +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefTemplateServerRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefTemplateServerRepository.java index c2d14d4..007702b 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefTemplateServerRepository.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefTemplateServerRepository.java @@ -1,15 +1,15 @@ -package cn.estsh.i3plus.pojo.report.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.report.bean.BrMenu; -import cn.estsh.i3plus.pojo.report.bean.BrRefTemplateServer; - -/** - * @Description : - * @Reference : - * @Author : Adair Peng - * @CreateDate : 2019-01-18 15:05 - * @Modify: - **/ -public interface BrRefTemplateServerRepository extends BaseRepository { -} +//package cn.estsh.i3plus.pojo.report.repository; +// +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import cn.estsh.i3plus.pojo.report.bean.BrMenu; +//import cn.estsh.i3plus.pojo.report.bean.BrRefTemplateServer; +// +///** +// * @Description : +// * @Reference : +// * @Author : Adair Peng +// * @CreateDate : 2019-01-18 15:05 +// * @Modify: +// **/ +//public interface BrRefTemplateServerRepository extends BaseRepository { +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrReportTemplateRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrReportTemplateRepository.java index c6fef7c..5e0e034 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrReportTemplateRepository.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrReportTemplateRepository.java @@ -1,14 +1,14 @@ -package cn.estsh.i3plus.pojo.report.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.report.bean.BrReportTemplate; - -/** - * @Description : - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-12-26 20:23 - * @Modify: - **/ -public interface BrReportTemplateRepository extends BaseRepository { -} +//package cn.estsh.i3plus.pojo.report.repository; +// +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import cn.estsh.i3plus.pojo.report.bean.BrReportTemplate; +// +///** +// * @Description : +// * @Reference : +// * @Author : alwaysfrin +// * @CreateDate : 2018-12-26 20:23 +// * @Modify: +// **/ +//public interface BrReportTemplateRepository extends BaseRepository { +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrTemplateCustomHqlRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrTemplateCustomHqlRepository.java index 617f010..91121a2 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrTemplateCustomHqlRepository.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrTemplateCustomHqlRepository.java @@ -1,15 +1,15 @@ -package cn.estsh.i3plus.pojo.report.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.report.bean.BrMenu; -import cn.estsh.i3plus.pojo.report.bean.BrTemplateCustomHql; - -/** - * @Description : - * @Reference : - * @Author : Adair Peng - * @CreateDate : 2019-01-18 15:05 - * @Modify: - **/ -public interface BrTemplateCustomHqlRepository extends BaseRepository { -} +//package cn.estsh.i3plus.pojo.report.repository; +// +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import cn.estsh.i3plus.pojo.report.bean.BrMenu; +//import cn.estsh.i3plus.pojo.report.bean.BrTemplateCustomHql; +// +///** +// * @Description : +// * @Reference : +// * @Author : Adair Peng +// * @CreateDate : 2019-01-18 15:05 +// * @Modify: +// **/ +//public interface BrTemplateCustomHqlRepository extends BaseRepository { +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrTemplateRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrTemplateRepository.java index fec3f05..9b43984 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrTemplateRepository.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrTemplateRepository.java @@ -1,14 +1,14 @@ -package cn.estsh.i3plus.pojo.report.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.report.bean.BrTemplate; - -/** - * @Description : - * @Reference : - * @Author : Adair Peng - * @CreateDate : 2019-01-18 15:05 - * @Modify: - **/ -public interface BrTemplateRepository extends BaseRepository { -} +//package cn.estsh.i3plus.pojo.report.repository; +// +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import cn.estsh.i3plus.pojo.report.bean.BrTemplate; +// +///** +// * @Description : +// * @Reference : +// * @Author : Adair Peng +// * @CreateDate : 2019-01-18 15:05 +// * @Modify: +// **/ +//public interface BrTemplateRepository extends BaseRepository { +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java index 22e016a..025e496 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.report.sqlpack; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.BlockReportEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.report.bean.*; import org.apache.commons.lang3.StringUtils; @@ -67,31 +69,31 @@ public class ReportHqlPack { return result.toString(); } - /** - * 目录查询封装 - * @param template - * @return - */ - public static String packHqlBrTemplate(BrTemplate template){ - StringBuffer result = new StringBuffer(); - - // 查询参数封装 - HqlPack.getNumEqualPack(template.getTemplateType(),"templateType",result); - if(template.getTemplateStatus() != null){ - if(template.getTemplateStatus().intValue() == CommonEnumUtil.USER_STATUS.DISABLE.getValue()){ - HqlPack.getNumEqualPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result); - }else { - HqlPack.getNumSmallerPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result); - } - } - HqlPack.getStringLikerPack(template.getName(),"name",result); - - // 添加默认排序 - HqlPack.getOrderDefault(template); - - return result.toString(); - } - +// /** +// * 目录查询封装 +// * @param template +// * @return +// */ +// public static String packHqlBrTemplate(BrTemplate template){ +// StringBuffer result = new StringBuffer(); +// +// // 查询参数封装 +// HqlPack.getNumEqualPack(template.getTemplateType(),"templateType",result); +// if(template.getTemplateStatus() != null){ +// if(template.getTemplateStatus().intValue() == CommonEnumUtil.USER_STATUS.DISABLE.getValue()){ +// HqlPack.getNumEqualPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result); +// }else { +// HqlPack.getNumSmallerPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result); +// } +// } +// HqlPack.getStringLikerPack(template.getName(),"name",result); +// +// // 添加默认排序 +// HqlPack.getOrderDefault(template); +// +// return result.toString(); +// } +// /** * 报表元素查询 * @param brElement @@ -181,4 +183,46 @@ public class ReportHqlPack { return result.toString(); } + + public static DdlPackBean packHqlBrPojo(BrPojo pojo){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumEqualPack(pojo.getMasterId(),"masterId",result); + DdlPreparedPack.getNumEqualPack(pojo.getSoftType(),"softType",result); + DdlPreparedPack.getNumEqualPack(pojo.getJoinType(),"joinType",result); + DdlPreparedPack.getNumEqualPack(pojo.getPojoType(),"pojoType",result); + DdlPreparedPack.getNumEqualPack(pojo.getWhereType(),"whereType",result); + DdlPreparedPack.getStringEqualPack(pojo.getPojoCodeAlias(),"pojoCodeAlias",result); + DdlPreparedPack.getStringLikerPack(pojo.getPojoName(),"pojoName",result); + DdlPreparedPack.getStringLikerPack(pojo.getPojoCode(),"pojoCode",result); + + return result; + } + + public static DdlPackBean packHqlBrPojoFilter(BrPojoFilter bean){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bean.getMasterId(),"masterId",result); + + return result; + } + + public static DdlPackBean packHqlBrPojoFilterAttr(BrPojoFilterAttr bean){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bean.getFilterId(),"filterId",result); + DdlPreparedPack.getNumEqualPack(bean.getMasterId(),"masterId",result); + DdlPreparedPack.getNumEqualPack(bean.getPojoId(),"pojoId",result); + + return result; + } + + public static DdlPackBean packHqlBrPojoViewAttr(BrPojoViewAttr bean){ + DdlPackBean result = DdlPackBean.getDdlPackBean(bean); + + DdlPreparedPack.getNumEqualPack(bean.getPojoId(),"pojoId",result); + DdlPreparedPack.getNumEqualPack(bean.getViewId(),"viewId",result); + + return result; + } }