diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java index 7208908..432f0a1 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java @@ -9,10 +9,7 @@ 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 javax.persistence.*; import java.util.List; /** @@ -43,7 +40,8 @@ public class BfDataObject extends BaseBean { @ApiParam(value ="数据表名") private String objectTableName; - @Column(name="OBJECT_CONTENT",columnDefinition="TEXT") + @Lob + @Column(name="OBJECT_CONTENT") @ApiParam(value ="数据内容") private String objectContent; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java index 2441c0d..d58c49c 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java @@ -7,10 +7,9 @@ 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 org.hibernate.annotations.Type; + +import javax.persistence.*; import java.util.List; /** @@ -60,7 +59,8 @@ public class BfLayout extends BaseBean { @ApiParam(value = "引用报表数量") private Integer layoutReportCount; - @Column(name = "LAYOUT_DESCRIPTION", columnDefinition = "TEXT") + @Lob + @Column(name = "LAYOUT_DESCRIPTION") @ApiParam(value = "布局描述") private String layoutDescription; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java index 6adb621..bafc0a5 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -59,7 +60,8 @@ public class BfLayoutColumn extends BaseBean { @ApiParam(value = "排序，降序") private Integer columnSort; - @Column(name = "COLUMN_DESCRIPTION", columnDefinition = "TEXT") + @Lob + @Column(name = "COLUMN_DESCRIPTION") @ApiParam(value = "列描述") private String columnDescription; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java index df72dd0..c9888f1 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java @@ -9,10 +9,9 @@ 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 org.hibernate.annotations.Type; + +import javax.persistence.*; import java.util.List; /** @@ -44,7 +43,8 @@ public class BfLayoutRow extends BaseBean { @ApiParam(value = "排序") private Integer rowSort; - @Column(name = "ROW_STYLE", columnDefinition = "TEXT") + @Lob + @Column(name = "ROW_STYLE") @ApiParam(value = "行样式") private String rowStyle; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java index 6a404a4..e1f5a71 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java @@ -10,6 +10,7 @@ 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; @@ -61,7 +62,8 @@ public class BfMenu extends BaseBean { @ApiParam(value ="菜单图标") private String menuIcon; - @Column(name="MENU_STYLE", columnDefinition = "TEXT") + @Lob + @Column(name="MENU_STYLE") @ApiParam(value ="菜单样式") private String menuStyle; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java index 90ea6c9..f5e33c7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java @@ -7,10 +7,7 @@ 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 javax.persistence.*; import javax.script.CompiledScript; /** @@ -41,7 +38,8 @@ public class EngineScriptPersistence extends BaseBean { @Column(name = "LANGUAGE_TYPE") private int languageType; // 脚本的具体内容 - @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT") + @Lob + @Column(name = "SCRIPT_CONTENT") private String scriptContent; // 脚本的描述，包含脚本的用法，参数说明等 @Column(name = "SCRIPT_REMARK", length = 2000) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java index 7759328..39eb527 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java @@ -7,11 +7,9 @@ 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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description : 打印模板 @@ -37,7 +35,8 @@ public class SysLabelTemplate extends BaseBean { @ApiParam(value ="模板名称") private String templateName; - @Column(name="TEMPLATE_CONTENT", columnDefinition = "TEXT") + @Lob + @Column(name="TEMPLATE_CONTENT") @ApiParam(value ="模板内容") private String templateContent; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java index 6b39045..4654f76 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java @@ -9,11 +9,9 @@ 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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description : 打印模板参数 @@ -44,7 +42,8 @@ public class SysLabelTemplateParam extends BaseBean { @ApiParam(value ="模板参数") private String templateParam; - @Column(name="TEMPLATE_PARAM_TEXT", columnDefinition = "TEXT") + @Lob + @Column(name="TEMPLATE_PARAM_TEXT") @ApiParam(value ="模板参数描述") private String templateParamText; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index beb96bf..695c519 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -12,10 +12,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.Subselect; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -58,7 +55,8 @@ public class SysMessage extends BaseBean { @ApiParam(value = "消息内容类型(枚举：ImppEnumUtil.MESSAGE_TYPE_CONTENT)", example = "-1") private Integer messageContentType; - @Column(name = "MESSAGE_CONTENT", columnDefinition = "TEXT") + @Lob + @Column(name = "MESSAGE_CONTENT") @ApiParam(value = "消息内容", access = "消息内容") private String messageContent; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java index 9a8948e..4ded623 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java @@ -9,9 +9,11 @@ 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; /** @@ -63,7 +65,8 @@ public class SysRole extends BaseBean { @ApiParam(value ="权限功能数量" , example ="0" , access ="权限功能数量") private Integer menuNumber; - @Column(name="MENU_NAMES_RDD",columnDefinition="TEXT") + @Lob + @Column(name="MENU_NAMES_RDD") @ApiParam(value ="权限功能名称" , access ="权限功能名称") private String menuNamesRdd; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java index fad0818..df65a54 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java @@ -9,8 +9,11 @@ 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; /** @@ -124,7 +127,8 @@ public class SysTaskPlan extends BaseBean { @ApiParam(value = "通知方式", example = "1") private Integer noticeMethod; - @Column(name = "NOTICE_CHANNEL", columnDefinition = "TEXT") + @Lob + @Column(name = "NOTICE_CHANNEL") @ApiParam(value = "通知渠道") private String noticeChannel; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 9fbed02..85b26eb 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -9,11 +9,9 @@ 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.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -104,15 +102,18 @@ public class SysUser extends BaseBean { @ApiParam(value ="组织名称" , access ="组织名称") private String organizeNameRdd; - @Column(name="ROLE_NAMES_RDD",columnDefinition = "TEXT") + @Lob + @Column(name="ROLE_NAMES_RDD") @ApiParam(value ="角色名称集合") private String roleNamesRdd; - @Column(name="DEPARTMENT_NAMES_RDD",columnDefinition = "TEXT") + @Lob + @Column(name="DEPARTMENT_NAMES_RDD") @ApiParam(value ="部门名称集合") private String departmentNamesRdd; - @Column(name="ORGANIZE_NAMES_RDD",columnDefinition = "TEXT") + @Lob + @Column(name="ORGANIZE_NAMES_RDD") @ApiParam(value ="组织名称集合") private String organizeNamesRdd; @@ -133,7 +134,7 @@ public class SysUser extends BaseBean { @Transient @ApiParam(value ="账号所有操作部门 Id 集合") private List departmentIdList; - + @Transient @ApiParam(value ="账号所有操作部门信息") private List departmentList; @@ -147,7 +148,7 @@ public class SysUser extends BaseBean { @ApiParam(value ="角色ID集合" , example = "0") @JsonSerialize(using = ToStringSerializer.class) private List roleIdList; - + @Transient @ApiParam(value ="账号所有角色信息") private List roleList; @@ -156,4 +157,14 @@ public class SysUser extends BaseBean { @ApiParam(value ="账号所有操作权限信息") private List menuList; + /*** test ***/ +// @Lob +// @Basic(fetch=FetchType.LAZY) +// @Column(name = "CONTENT", columnDefinition = "BLOB") +// private byte[] content; +// +// @Lob +// @Basic(fetch=FetchType.LAZY) +// @Column(name="REMARK", columnDefinition="CLOB") +// private String remark; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java index d162959..8a426ea 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java @@ -10,9 +10,11 @@ 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; /** @@ -62,15 +64,18 @@ public class WmsActionLogData extends BaseBean { @ApiParam(value="结束执行时间",example = "2000-01-01 01:00:00") private String endTime; - @Column(name = "IN_PARAMS", columnDefinition = "TEXT") + @Lob + @Column(name = "IN_PARAMS") @ApiParam(value = "输入参数") private String inParams; - @Column(name = "OUT_PARAMS", columnDefinition = "TEXT") + @Lob + @Column(name = "OUT_PARAMS") @ApiParam(value = "输出参数") private String outParams; - @Column(name = "OUT_RESULT", columnDefinition = "TEXT") + @Lob + @Column(name = "OUT_RESULT") @ApiParam(value = "执行结果") private String outResult; } 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 0689b99..891996a 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 @@ -9,11 +9,9 @@ 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.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -57,7 +55,8 @@ public class BrElement extends BaseBean { @ApiParam(value ="元素样式css") private String elementStyle; - @Column(name="ELEMENT_HTML",columnDefinition = "TEXT") + @Lob + @Column(name="ELEMENT_HTML") @ApiParam(value ="元素html") private String elementHtml; } 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 9f80884..6351b74 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 @@ -7,11 +7,9 @@ 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.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -54,11 +52,13 @@ public class BrLayout extends BaseBean { @ApiParam(value ="引用报表数量") private Integer layoutReportCount; - @Column(name="LAYOUT_HTML",columnDefinition = "TEXT") + @Lob + @Column(name="LAYOUT_HTML") @ApiParam(value ="布局html") private String layoutHtml; - @Column(name = "LAYOUT_DESCRIPTION",columnDefinition = "TEXT") + @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 88be0d5..9665e99 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 @@ -9,11 +9,9 @@ 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.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -70,11 +68,13 @@ public class BrLayoutColumn extends BaseBean { @ApiParam(value ="排序，降序") private Integer columnSort; - @Column(name = "COLUMN_DESCRIPTION",columnDefinition = "TEXT") + @Lob + @Column(name = "COLUMN_DESCRIPTION") @ApiParam(value ="列描述") private String columnDescription; - @Column(name="COLUMN_HTML",columnDefinition = "TEXT") + @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 24db11e..9b23fb0 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 @@ -9,11 +9,9 @@ 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.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -49,7 +47,8 @@ public class BrLayoutRow extends BaseBean { @ApiParam(value ="排序") private Integer rowSort; - @Column(name="ROW_STYLE",columnDefinition = "TEXT") + @Lob + @Column(name="ROW_STYLE") @ApiParam(value ="行样式") private String rowStyle; @@ -57,7 +56,8 @@ public class BrLayoutRow extends BaseBean { @ApiParam(value ="行所关联列数") private Integer rowColNum; - @Column(name="ROW_HTML",columnDefinition = "TEXT") + @Lob + @Column(name="ROW_HTML") @ApiParam(value ="行html") private String rowHtml; 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 c329c15..2c32625 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,9 +9,11 @@ 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; /** @@ -59,11 +61,13 @@ public class BrRefReportTypeset extends BaseBean { /** * 关联元素或模板html */ - @Column(name = "REF_HTML",columnDefinition = "TEXT") + @Lob + @Column(name = "REF_HTML") @ApiParam(value = "关联对象html") private String refHtml; - @Column(name = "TYPESET_DESCRIPTION",columnDefinition = "TEXT") + @Lob + @Column(name = "TYPESET_DESCRIPTION") @ApiParam(value ="排版描述") private String typesetDescription; } \ No newline at end of file diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefRoleMenu.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefRoleMenu.java index 1c29ea9..5b2cb10 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefRoleMenu.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefRoleMenu.java @@ -26,7 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_REF_ROLE_MENU") +@Table(name="BR_REF_ROLE_MENU") @Api(value="关系-角色目录",description = "关系-角色目录") public class BrRefRoleMenu extends BaseBean { 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 f37e43e..7debebc 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 @@ -10,11 +10,9 @@ 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.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -55,7 +53,8 @@ public class BrReport extends BaseBean { @ApiParam(value ="布局名称") private String layoutNameRdd; - @Column(name="LAYOUT_HTML",columnDefinition = "TEXT") + @Lob + @Column(name="LAYOUT_HTML") @ApiParam(value ="报表html") private String reportHtml; @@ -71,7 +70,8 @@ public class BrReport extends BaseBean { @ApiParam(value ="元素数量") private Integer elementNum; - @Column(name = "REPORT_DESCRIPTION",columnDefinition = "TEXT") + @Lob + @Column(name = "REPORT_DESCRIPTION") @ApiParam(value ="报表描述") private String reportDescription; 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 40ff440..d2f2342 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 @@ -7,11 +7,9 @@ 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.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; @@ -47,7 +45,8 @@ public class BrTemplate extends BaseBean { @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") private Integer numPojo; - @Column(name="TEMPLATE_POJO_NAMES_RDD",columnDefinition = "TEXT") + @Lob + @Column(name="TEMPLATE_POJO_NAMES_RDD") @ApiParam(value ="对象名称" , access ="对象名称") private String templatePojoNamesRdd; @@ -55,11 +54,13 @@ public class BrTemplate extends BaseBean { @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") private Integer numServer; - @Column(name="TEMPLATE_SERVER_ID_LIST",columnDefinition = "TEXT") + @Lob + @Column(name="TEMPLATE_SERVER_ID_LIST") @ApiParam(value ="数据服务ID集合" , access ="服务名称") private String templateServerIdList; - @Column(name="TEMPLATE_SERVER_NAMES_RDD",columnDefinition = "TEXT") + @Lob + @Column(name="TEMPLATE_SERVER_NAMES_RDD") @ApiParam(value ="服务名称" , access ="服务名称") private String templateServerNamesRdd; @@ -67,7 +68,8 @@ public class BrTemplate extends BaseBean { @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") private Integer numTemplateAttrFilter; - @Column(name="template_attr_filter_list",columnDefinition = "TEXT") + @Lob + @Column(name="template_attr_filter_list") @ApiParam(value ="模板查询条件" , access ="模板查询条件") private String templateAttrFilterList; @@ -75,7 +77,8 @@ public class BrTemplate extends BaseBean { @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") private Integer numTemplateAttrFilterGroup; - @Column(name="TEMPLATE_ATTR_FILTER_GROUP_LIST",columnDefinition = "TEXT") + @Lob + @Column(name="TEMPLATE_ATTR_FILTER_GROUP_LIST") @ApiParam(value ="模板分组条件" , access ="模板分組条件") private String templateAttrFilterGroupList; @@ -83,7 +86,8 @@ public class BrTemplate extends BaseBean { @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") private Integer numTemplateAttrShow; - @Column(name="TEMPLATE_ATTR_SHOW_LIST",columnDefinition = "TEXT") + @Lob + @Column(name="TEMPLATE_ATTR_SHOW_LIST") @ApiParam(value ="模板显示属性" , access ="模板显示属性") private String templateAttrShowList; @@ -91,7 +95,8 @@ public class BrTemplate extends BaseBean { @ApiParam(value ="对象聚集数量" , example ="0" , access ="对象聚集数量") private Integer numTemplateAggregation; - @Column(name="TEMPLATE_ATTR_AGGREGATION_LIST",columnDefinition = "TEXT") + @Lob + @Column(name="TEMPLATE_ATTR_AGGREGATION_LIST") @ApiParam(value ="模板聚集属性" , access ="模板聚集属性") private String templateAttrAggregationList; @@ -99,11 +104,13 @@ public class BrTemplate extends BaseBean { @ApiParam(value ="模板描述" , access ="模板描述") private String templateDescription; - @Column(name="TEMPLATE_HQL",columnDefinition = "TEXT") + @Lob + @Column(name="TEMPLATE_HQL") @ApiParam(value ="模板执行HQL" , access ="模板执行HQL") private String templateHql; - @Column(name="TEMPLATE_HTML",columnDefinition = "TEXT") + @Lob + @Column(name="TEMPLATE_HTML") @ApiParam(value ="模板HTML" , access ="模板HTML") private String templateHtml; 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 5e5cfd0..8e5e68a 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 @@ -9,9 +9,11 @@ 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; /** @@ -39,7 +41,8 @@ public class BrTemplateCustomHql extends BaseBean { @ApiParam(value ="自定义类型" , example ="-1") private Integer dataType; - @Column(name="CUSTOM_CONTENT",columnDefinition="TEXT") + @Lob + @Column(name="CUSTOM_CONTENT") @ApiParam(value ="自定义语句内容" , access ="自定义语句内容") private String customContent; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java index 342b258..ab93720 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java @@ -12,6 +12,7 @@ import org.springframework.data.annotation.Transient; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -37,7 +38,8 @@ public class EngineRulePersistence extends BaseBean { @Column(name = "RULE_NAME", length = 50) private String ruleName; // 规则的具体内容 - @Column(name = "RULE_CONTENT", columnDefinition = "TEXT") + @Lob + @Column(name = "RULE_CONTENT") private String ruleContent; // 规则的描述，包含规则的用法，参数说明等 @Column(name = "RULE_REMARK", length = 2000) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java index c928ee1..da76b34 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java @@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.Type; import javax.persistence.*; import javax.script.CompiledScript; @@ -47,7 +48,8 @@ public class EngineScriptPersistence extends BaseBean { private Integer languageType; // 脚本的具体内容 - @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT") + @Lob + @Column(name = "SCRIPT_CONTENT") private String scriptContent; // 脚本的描述，包含脚本的用法，参数说明等