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

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

@@ -19,7 +19,7 @@ public class BlockReportEnumUtil {
     @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;

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

@@ -293,8 +293,8 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QUEUE_NAME {
 
-        SUCCESS_QUEUE(1, "success_queue", "成功消息队列"),
-        FAIL_QUEUE(2, "fail_queue", "成功消息队列");
+        SUCCESS_QUEUE(1, "wms_success_queue", "成功消息队列"),
+        FAIL_QUEUE(2, "wms_fail_queue", "成功消息队列");
 
         private int value;
         private String name;

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<BrLayoutRow> brLayoutRowList;
-
-    @Transient
-    @ApiParam(value ="使用模板的报表")
-    private List<BrReport> brReportList;
 }

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<BrElement> brElementList;
+    @Column(name = "COLUMN_DESCRIPTION",columnDefinition = "TEXT")
+    @ApiParam(value ="列描述")
+    private String columnDescription;
 
-    @Transient
-    @ApiParam(value ="列所包含的报表模板")
-    private List<BrReportTemplate> brReportTemplateList;
+    @Column(name="COLUMN_HTML")
+    @ApiParam(value ="列html")
+    private String columnHtml;
 }

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<BrLayoutColumn> brLayoutColumns;
-
 }

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 = "报表实例")

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 = "报表模板")

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 ="排序")

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<BrReportTemplateDetail> brReportTemplateDetailList;
+    private List<BrRefReportTemplate> brReportTemplateDetailList;
 
     @Transient
     @ApiParam(value ="元素所在的列")

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<BrReportElementDetail,Long> {
+public interface BrRefReportElementRepository extends BaseRepository<BrRefReportElement,Long> {
 }

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<BrReportTemplateDetail,Long> {
+public interface BrRefReportTemplateRepository extends BaseRepository<BrRefReportTemplate,Long> {
 }

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.report.sqlpack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.report.bean.BrElement;
 import cn.estsh.i3plus.pojo.report.bean.BrMenu;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @Description : 报表对象封装
@@ -14,6 +15,33 @@ import cn.estsh.i3plus.pojo.report.bean.BrMenu;
 public class ReportHqlPack {
 
     /**
+     * In 参数封装
+     * @param columnName
+     * @return
+     */
+    public static String packHqlIds(String columnName,String[] params){
+        StringBuffer result =  new StringBuffer();
+
+        // 参数数组 [1,2,3] -> "1,2,3"
+        HqlPack.getInPack(String.join(",",params),columnName,result);
+        return result.toString();
+    }
+
+
+    /**
+     * In 参数封装
+     * @param columnName
+     * @return
+     */
+    public static String packHqlIds(String columnName,Long[] params){
+        StringBuffer result =  new StringBuffer();
+
+        // 参数数组 [1,2,3] -> "1,2,3"
+        HqlPack.getInPack(StringUtils.join(params,","),columnName,result);
+        return result.toString();
+    }
+
+    /**
      * 目录查询封装
      * @param menu
      * @return