From 324c7aa4130760a870e6fa5cf084069140198d6c Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Sun, 20 Jan 2019 13:32:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=20=E7=9B=AE=E5=BD=95=E5=8A=9F=E8=83=BD=20=E8=81=94=E8=B0=83?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/model/common/ClassModel.java | 10 ++++++++ .../cn/estsh/i3plus/pojo/report/bean/BrMenu.java | 6 ++++- .../estsh/i3plus/pojo/report/bean/BrPojoAttr.java | 14 ++++++---- .../estsh/i3plus/pojo/report/bean/BrRefPojo.java | 2 +- .../i3plus/pojo/report/bean/BrRefServerPojo.java | 20 ++++++++++----- .../pojo/report/bean/BrRefTemplateServer.java | 2 +- .../estsh/i3plus/pojo/report/bean/BrTemplate.java | 30 ++++++++++++++++++++++ .../pojo/report/bean/BrTemplateCustomHql.java | 4 +-- .../i3plus/pojo/report/sqlpack/ReportHqlPack.java | 4 +++ .../pojo/report/sqlpack/TemplateHqlPack.java | 13 ++++++++++ 10 files changed, 89 insertions(+), 16 deletions(-) create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/TemplateHqlPack.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassModel.java index 7884c40..1ad7bc8 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassModel.java @@ -6,6 +6,7 @@ import lombok.Setter; import lombok.ToString; import java.io.Serializable; +import java.util.List; /** * @Description : 报表类选择模型 @@ -19,6 +20,12 @@ import java.io.Serializable; @ToString public class ClassModel implements Serializable { + @ApiParam(value ="服务ID") + private int serverId; + + @ApiParam(value ="服务ID") + private String serverName; + @ApiParam(value ="包名") private String packageName; @@ -30,4 +37,7 @@ public class ClassModel implements Serializable { @ApiParam(value ="类描述") private String clzDesc; + + @ApiParam(value ="属性集合") + private List fieldList; } diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrMenu.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrMenu.java index 6de49aa..95941b3 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrMenu.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrMenu.java @@ -96,8 +96,12 @@ public class BrMenu extends BaseBean { private String roleNamesRdd; @Transient + @ApiParam(value ="查询 ID 集合") + private List findIdList = new ArrayList<>(); + + @Transient @ApiParam(value ="角色ID 集合") - private List roleIdList = new ArrayList<>(); + private List roleIdList = new ArrayList<>(); @Transient @ApiParam(value ="子集列表") diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java index eda7d86..08f2865 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java @@ -27,7 +27,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="BR_POJO_ATTR") -@Api(value="报表模板",description = "报表模板") +@Api(value="对象属性",description = "对象属性") public class BrPojoAttr extends BaseBean { @Column(name="TEMPLATE_ID") @@ -39,10 +39,6 @@ public class BrPojoAttr extends BaseBean { @ApiParam(value ="服务编号",example = "-1") private Integer serverId; - @Column(name="POJO_CLASS_PATH") - @ApiParam(value ="对象ClassPath") - private String pojoClassPath; - @Column(name="POJO_NAME") @ApiParam(value ="对象名称") private String pojoName; @@ -51,6 +47,14 @@ public class BrPojoAttr extends BaseBean { @ApiParam(value ="对象别名") private String pojoNameAlias; + @Column(name="ATTR_NAME") + @ApiParam(value ="对象别名") + private String attrName; + + @Column(name="ATTR_NAME_ALIAS") + @ApiParam(value ="对象别名") + private String attrNameAlias; + @Column(name="ATTR_TYPE") @ApiParam(value ="属性类型",example = "-1") private Integer attrType; 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 c40470e..05b6a68 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 @@ -27,7 +27,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="BR_REF_POJO") -@Api(value="报表模板",description = "报表模板") +@Api(value="对象关系",description = "对象关系") public class BrRefPojo extends BaseBean { @Column(name="MASTER_TEMPLATE_ID") 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 77e4c9f..faeef2b 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 @@ -27,7 +27,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="BR_REF_SERVER_POJO") -@Api(value="报表模板",description = "报表模板") +@Api(value="报表模板服务对象",description = "报表模板服务对象") public class BrRefServerPojo extends BaseBean { @Column(name="TEMPLATE_ID") @@ -44,19 +44,27 @@ public class BrRefServerPojo extends BaseBean { private Integer serverId; @Column(name="SERVER_NAME_RDD") - @ApiParam(value ="服务名称" , access ="模板名称") + @ApiParam(value ="服务名称" , access ="服务名称") private String serverNameRdd; + @Column(name="SERVER_PACKAGE_NAME_RDD") + @ApiParam(value ="服务对象包名称" , access ="服务对象包名称") + private String serverPackageNameRdd; + @Column(name="SERVER_POJO_NAME_RDD") - @ApiParam(value ="服务对象名称" , access ="模板名称") + @ApiParam(value ="服务对象名称" , access ="服务对象名称") private String serverPojoNameRdd; + @Column(name="SERVER_POJO_NAME_DESC_RDD") + @ApiParam(value ="服务对象名称中文" , access ="服务对象名称中文") + private String serverPojoNameDescRdd; + @Column(name="SERVER_POJO_NAME_ALIAS") - @ApiParam(value ="服务对象别名" , access ="模板名称") + @ApiParam(value ="服务对象别名" , access ="服务对象别名") private String serverPojoNameAlias; @Column(name="SERVER_POJO_CLASS_PATH") - @ApiParam(value ="服务对象名称" , access ="模板名称") - private String serverPojoClassPath; + @ApiParam(value ="对象全路径名称" , access ="对象全路径名称") + private String serverPojoFullName; } 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 d0ebe1f..db686b1 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 @@ -27,7 +27,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="BR_REF_TEMPLATE_SERVER") -@Api(value="报表模板",description = "报表模板") +@Api(value="报表模板-服务",description = "报表模板-服务") public class BrRefTemplateServer extends BaseBean { @Column(name="TEMPLATE_ID") 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 2cd232d..0a2be32 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 @@ -11,6 +11,8 @@ 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 : @@ -92,4 +94,32 @@ public class BrTemplate extends BaseBean { @ApiParam(value ="模板HTML" , access ="模板HTML") private String templateHtml; + @Transient + @ApiParam(value ="模板服务") + private List serverList; + + @Transient + @ApiParam(value ="模板服务对象") + private List serverPojoList; + + @Transient + @ApiParam(value ="模板服务对象关系") + private List serverPojoRefList; + + @Transient + @ApiParam(value ="模板服务对象查询条件") + private List pojoAttrWhereList; + + @Transient + @ApiParam(value ="模板服务对象分组条件") + private List pojoAttrGroupList; + + @Transient + @ApiParam(value ="模板服务对象聚合条件") + private List pojoAttrAggrList; + + @Transient + @ApiParam(value ="模板服务对象显示属性") + private List pojoAttrShowList; + } 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 93dcb89..5e5cfd0 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 @@ -35,9 +35,9 @@ public class BrTemplateCustomHql extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long templateId; - @Column(name="CUSTOM_TYPE") + @Column(name="DATA_TYPE") @ApiParam(value ="自定义类型" , example ="-1") - private Integer customType; + private Integer dataType; @Column(name="CUSTOM_CONTENT",columnDefinition="TEXT") @ApiParam(value ="自定义语句内容" , access ="自定义语句内容") 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 0bcd1d9..5a911a5 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 @@ -58,6 +58,10 @@ public class ReportHqlPack { HqlPack.getStringLikerPack(menu.getName(),"name",result); HqlPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result); + if(menu.getFindIdList() != null && menu.getFindIdList().size() > 0){ + HqlPack.getInPack(StringUtils.join(menu.getFindIdList(),","),"id",result); + } + // 添加默认排序 HqlPack.getOrderDefault(menu); diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/TemplateHqlPack.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/TemplateHqlPack.java new file mode 100644 index 0000000..1e6911b --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/TemplateHqlPack.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.report.sqlpack; + +/** + * @Description : 报表对象封装 + * @Reference : + * @Author : wei peng + * @CreateDate : 2019-01-17 15:41 + * @Modify: + **/ +public class TemplateHqlPack { + + +}