测试邮件发送

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java

@@ -0,0 +1,34 @@
+package cn.estsh.i3plus.pojo.platform.bean;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 邮件配置信息
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-01-27 10:53
+ * @Modify:
+ **/
+@Data
+public class MailConfig {
+
+    @ApiParam(value = "邮箱服务器")
+    private String mailHost;
+
+    @ApiParam(value = "邮箱端口")
+    private Integer mailPort;
+
+    @ApiParam(value = "邮箱账号")
+    private String mailUser;
+
+    @ApiParam(value = "邮箱密码")
+    private String mailPassword;
+
+    @ApiParam(value = "发信昵称")
+    private String mailNick;
+
+    @ApiParam(value = "测试收信人")
+    private String testTo;
+
+}

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

@@ -70,7 +70,7 @@ public class BrLayoutColumn extends BaseBean {
     @ApiParam(value ="列描述")
     private String columnDescription;
 
-    @Column(name="COLUMN_HTML")
+    @Column(name="COLUMN_HTML",columnDefinition = "TEXT")
     @ApiParam(value ="列html")
     private String columnHtml;
 }

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

@@ -51,8 +51,19 @@ public class BrRefReportTypeset extends BaseBean {
     /**
      * 关联id，元素或模板id
      */
-    @Column(name = "REL_ID")
+    @Column(name = "REF_ID")
     @ApiParam(value = "关联id")
-    @JsonSerialize(using = ToStringSerializer.class)
+    @JsonSerialize (using = ToStringSerializer.class)
-    private Long contentId;
+    private Long refId;
+
+    /**
+     * 关联元素或模板html
+     */
+    @Column(name = "REF_HTML")
+    @ApiParam(value = "关联对象html")
+    private String refHtml;
+
+    @Column(name = "TYPESET_DESCRIPTION",columnDefinition = "TEXT")
+    @ApiParam(value ="排版描述")
+    private String typesetDescription;
 }

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

@@ -4,6 +4,7 @@ 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;
@@ -13,6 +14,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 : 报表实例
@@ -39,16 +42,35 @@ public class BrReport extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long layoutId;
 
-    @Column(name="LAYOUT_ID_RDD")
+    @Column(name="LAYOUT_NAME_RDD")
     @ApiParam(value ="布局名称")
-    @JsonSerialize(using = ToStringSerializer.class)
+    private String layoutNameRdd;
-    private Long layoutNameRdd;
 
     @Column(name="LAYOUT_HTML")
-    @ApiParam(value ="布局html")
+    @ApiParam(value ="报表html")
     private String reportHtml;
 
     @Column(name="SEQ")
     @ApiParam(value ="排序")
     private Integer seq;
+
+    @Column(name="TEMPLATE_NUM")
+    @ApiParam(value ="模板数量")
+    private Integer templateNum;
+
+    @Column(name="ELEMENT_NUM")
+    @ApiParam(value ="元素数量")
+    private Integer elementNum;
+
+    @Column(name = "REPORT_DESCRIPTION",columnDefinition = "TEXT")
+    @ApiParam(value ="报表描述")
+    private String reportDescription;
+
+    @Transient
+    @ApiParam(value = "报表关联布局对象")
+    private BrLayout brLayout;
+
+    @Transient
+    @ApiParam(value = "报表排版关系")
+    private List<BrRefReportTypeset> brRefReportTypesetList;
 }

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

@@ -104,7 +104,7 @@ public class ReportHqlPack {
 
         // 查询参数封装
         HqlPack.getNumEqualPack(rowId,"layoutRowId",result);
-        HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()},new String[]{"columnSeq"},result);
+        HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue(),CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"columnSeq","modifyDatetime"},result);
 
         return result.toString();
     }
@@ -119,7 +119,7 @@ public class ReportHqlPack {
 
         // 查询参数封装
         HqlPack.getNumEqualPack(layoutId,"layoutId",result);
-        HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()},new String[]{"rowSeq"},result);
+        HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue(),CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"rowSeq","modifyDatetime"},result);
 
         return result.toString();
     }
@@ -134,6 +134,7 @@ public class ReportHqlPack {
 
         // 查询参数封装
         HqlPack.getStringLikerPack(brReport.getReportName(),"reportName",result);
+        HqlPack.getNumEqualPack(brReport.getLayoutId(),"layoutId",result);
 
         return result.toString();
     }