From 42a38392fc26f53d2a6b51200d69cdcecd79b069 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 18 Jan 2019 10:14:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=85=83=E7=B4=A0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/BlockEnumUtil.java | 2 +- .../cn/estsh/i3plus/pojo/report/bean/BrLayout.java | 12 ++++++---- .../i3plus/pojo/report/bean/BrLayoutColumn.java | 28 ++++++++++++---------- .../estsh/i3plus/pojo/report/bean/BrLayoutRow.java | 17 +++++++------ ...tElementDetail.java => BrRefReportElement.java} | 24 ++++++++++++++----- ...emplateDetail.java => BrRefReportTemplate.java} | 25 ++++++++++++------- .../cn/estsh/i3plus/pojo/report/bean/BrReport.java | 12 ++++++---- .../i3plus/pojo/report/bean/BrReportTemplate.java | 2 +- ...tory.java => BrRefReportElementRepository.java} | 4 ++-- ...ory.java => BrRefReportTemplateRepository.java} | 4 ++-- 10 files changed, 82 insertions(+), 48 deletions(-) rename modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/{BrReportElementDetail.java => BrRefReportElement.java} (76%) rename modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/{BrReportTemplateDetail.java => BrRefReportTemplate.java} (76%) rename modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/{BrReportElementDetailRepository.java => BrRefReportElementRepository.java} (57%) rename modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/{BrReportTemplateDetailRepository.java => BrRefReportTemplateRepository.java} (56%) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockEnumUtil.java index d8350d6..8be7342 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockEnumUtil.java @@ -19,7 +19,7 @@ public class BlockEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum REPORT_ELEMENT_TYPE{ - WORDS(1,"文字"),PIC(2,"图片"),REPORT(3,"报表"); + WORDS(1,"文字"),PIC(2,"图片"); private int value; private String description; 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 fd5bfe9..be01fe4 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 @@ -54,11 +54,15 @@ public class BrLayout extends BaseBean { @ApiParam(value ="排序") private Integer seq; + @Column(name="LAYOUT_HTML",columnDefinition = "TEXT") + @ApiParam(value ="布局html") + private String layoutHtml; + + @Column(name = "LAYOUT_DESCRIPTION",columnDefinition = "TEXT") + @ApiParam(value ="布局描述") + private String layoutDescription; + @Transient @ApiParam(value ="模板行列表") private List brLayoutRowList; - - @Transient - @ApiParam(value ="使用模板的报表") - private List brReportList; } 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 05a5a47..6fa3a3c 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 @@ -42,27 +42,31 @@ public class BrLayoutColumn extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long layoutRowId; - @Column(name="COLUMN_CROSS") + @Column(name="COLUMN_COLSPAN") @ApiParam(value ="跨列数") - private Integer columnCross; + private Integer columnColspan; + + @Column(name="COLUMN_ROWSPAN") + @ApiParam(value ="跨行数") + private Integer columnRowspan; @Column(name="COLUMN_WIDTH") @ApiParam(value ="列宽") private Integer columnWidth; + @Column(name="COLUMN_HEIGHT") + @ApiParam(value ="列高") + private Integer columnHeight; + @Column(name="SEQ") @ApiParam(value ="排序") private Integer seq; - @Transient - @ApiParam(value ="列所在的行") - private BrLayoutRow brLayoutRow; - - @Transient - @ApiParam(value ="列所包含的元素") - private List brElementList; + @Column(name = "COLUMN_DESCRIPTION",columnDefinition = "TEXT") + @ApiParam(value ="列描述") + private String columnDescription; - @Transient - @ApiParam(value ="列所包含的报表模板") - private List brReportTemplateList; + @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 ede4846..450b5a1 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 @@ -37,9 +37,9 @@ public class BrLayoutRow extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long layoutId; - @Column(name="ROW_CROSS") - @ApiParam(value ="跨行") - private Integer rowCross; + @Column(name="ROW_WIDTH") + @ApiParam(value ="行宽") + private Integer rowWidth; @Column(name="ROW_HEIGHT") @ApiParam(value ="行高") @@ -49,12 +49,15 @@ public class BrLayoutRow extends BaseBean { @ApiParam(value ="排序") private Integer seq; - @Transient - @ApiParam(value ="行所在的布局") - private BrLayout brLayout; + @Column(name="ROW_STYLE") + @ApiParam(value ="行样式") + private String rowStyle; + + @Column(name="ROW_HTML") + @ApiParam(value ="行样式") + private String rowHtml; @Transient @ApiParam(value ="行所包含的列") private List brLayoutColumns; - } diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportElementDetail.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportElement.java similarity index 76% rename from modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportElementDetail.java rename to modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportElement.java index 03ce6c8..b278d0b 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportElementDetail.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportElement.java @@ -28,25 +28,37 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="BR_REPORT_ELEMENT_DETAIL") +@Table(name="BR_REF_REPORT_ELEMENT") @Api(value="元素&报表",description = "元素和报表的关联表 * -》 *") -public class BrReportElementDetail extends BaseBean { +public class BrRefReportElement extends BaseBean { @Column(name = "REPORT_ID") @ApiParam(value = "报表主键") @JsonSerialize(using = ToStringSerializer.class) private Long reportId; - @Column(name = "ELEMENT_ID") - @ApiParam(value = "元素主键") - @JsonSerialize(using = ToStringSerializer.class) - private Long elementId; + @Column(name = "REPORT_NAME_RDD") + @ApiParam(value = "报表名称") + private String reportNameRdd; @Column(name = "LAYOUT_COLUMN_ID") @ApiParam(value = "列主键") @JsonSerialize(using = ToStringSerializer.class) private Long layoutColumnId; + @Column(name = "ELEMENT_ID") + @ApiParam(value = "元素主键") + @JsonSerialize(using = ToStringSerializer.class) + private Long elementId; + + @Column(name = "ELEMENT_NAME_RDD") + @ApiParam(value = "元素名称") + private String elementNameRdd; + + @Column(name = "ELEMENT_HTML_RDD") + @ApiParam(value = "元素html") + @JsonSerialize(using = ToStringSerializer.class) + private Long elementHtmlRdd; @Transient @ApiParam(value = "报表实例") diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplateDetail.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTemplate.java similarity index 76% rename from modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplateDetail.java rename to modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTemplate.java index 37db458..d213c6d 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplateDetail.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTemplate.java @@ -27,29 +27,36 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="BR_REPORT_TEMPLATE_DETAIL") +@Table(name="BR_REF_REPORT_TEMPLATE") @Api(value="报表模板&报表",description = "报表模板和报表的关联表 * -》 *") -public class BrReportTemplateDetail extends BaseBean { +public class BrRefReportTemplate extends BaseBean { @Column(name="REPORT_ID") @ApiParam(value ="报表主键") @JsonSerialize(using = ToStringSerializer.class) private Long reportId; - @Column(name="REPORT_TEMPLATE_ID") - @ApiParam(value ="报表模板主键") - @JsonSerialize(using = ToStringSerializer.class) - private Long reportTemplateId; + @Column(name = "REPORT_NAME_RDD") + @ApiParam(value = "报表名称") + private String reportNameRdd; @Column(name="LAYOUT_COLUMN_ID") @ApiParam(value ="列主键") @JsonSerialize(using = ToStringSerializer.class) private Long layoutColumnId; + @Column(name="REPORT_TEMPLATE_ID") + @ApiParam(value ="报表模板主键") + @JsonSerialize(using = ToStringSerializer.class) + private Long reportTemplateId; + + @Column(name="REPORT_TEMPLATE_NAME_RDD") + @ApiParam(value ="报表模板名称") + private String reportTemplateNameRdd; - @Transient - @ApiParam(value = "报表实例") - private BrReport brReport; + @Column(name="REPORT_TEMPLATE_HTML_RDD") + @ApiParam(value ="报表模板html") + private String reportTemplateHtmlRdd; @Transient @ApiParam(value = "报表模板") 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 7d3c0bb..79d54e2 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 @@ -39,10 +39,14 @@ public class BrReport extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long layoutId; - @Column(name="SOFT_TYPE") - @ApiParam(value ="模块") - //所属模块，CommonEnumUtil.SOFT_TYPE - private Integer softType; + @Column(name="LAYOUT_ID_RDD") + @ApiParam(value ="布局名称") + @JsonSerialize(using = ToStringSerializer.class) + private Long layoutNameRdd; + + @Column(name="LAYOUT_HTML") + @ApiParam(value ="布局html") + private String reportHtml; @Column(name="SEQ") @ApiParam(value ="排序") 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 3f847f0..65480b8 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 @@ -48,7 +48,7 @@ public class BrReportTemplate extends BaseBean { @Transient @ApiParam(value ="报表模板列表") - private List brReportTemplateDetailList; + private List brReportTemplateDetailList; @Transient @ApiParam(value ="元素所在的列") diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrReportElementDetailRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportElementRepository.java similarity index 57% rename from modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrReportElementDetailRepository.java rename to modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportElementRepository.java index 44a969d..90771e4 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrReportElementDetailRepository.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportElementRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.report.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.report.bean.BrReportElementDetail; +import cn.estsh.i3plus.pojo.report.bean.BrRefReportElement; /** * @Description : @@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.report.bean.BrReportElementDetail; * @CreateDate : 2018-12-26 20:23 * @Modify: **/ -public interface BrReportElementDetailRepository extends BaseRepository { +public interface BrRefReportElementRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrReportTemplateDetailRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportTemplateRepository.java similarity index 56% rename from modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrReportTemplateDetailRepository.java rename to modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportTemplateRepository.java index 99387d4..1b22193 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrReportTemplateDetailRepository.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportTemplateRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.report.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.report.bean.BrReportTemplateDetail; +import cn.estsh.i3plus.pojo.report.bean.BrRefReportTemplate; /** * @Description : @@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.report.bean.BrReportTemplateDetail; * @CreateDate : 2018-12-26 20:23 * @Modify: **/ -public interface BrReportTemplateDetailRepository extends BaseRepository { +public interface BrRefReportTemplateRepository extends BaseRepository { }