From 98de08ba4a47f96519d201f8a5061ed061e4667c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sat, 29 Jun 2019 17:01:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=AD=97=E6=AE=B5=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=20=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java | 8 ++++---- .../java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java | 7 +++++++ .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java | 2 ++ .../cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java | 8 +++++++- .../cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java | 8 +++++++- .../java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java | 8 +++++++- .../cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java | 8 +++++++- .../java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 3 ++- 8 files changed, 43 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 9730fb8..b790007 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -1713,10 +1713,10 @@ public class BlockFormEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TRIGGER_EVENT { - CLICK(10, "CLICK", "单击"), - DB_LCLICK(20, "DB_LCLICK", "双击"), - MOUSE_OUT(30, "MOUSE_OUT", "鼠标指针移出"), - MOUSE_OVER(40, "MOUSE_OVER", "鼠标指针移动入"); + CLICK(10, "CLICK", "单击"); +// DB_LCLICK(20, "DB_LCLICK", "双击"), +// MOUSE_OUT(30, "MOUSE_OUT", "鼠标指针移出"), +// MOUSE_OVER(40, "MOUSE_OVER", "鼠标指针移入"); private int value; private String code; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java index 5361cd0..5eaa6c5 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java @@ -83,6 +83,13 @@ public class SysDictionary extends BaseBean { @ApiParam(value = "是否默认",example = "2") private Integer isDefault; + public int getIsDefaultVal(){ + if(this.isDefault == null){ + return 0; + } + return isDefault.intValue(); + } + @Column(name="DICTIONARY_DESCRIPTION") @ApiParam(value ="描述") private String dictionaryDescription; 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 85b26eb..d46b5da 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 @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.Type; @@ -35,6 +36,7 @@ public class SysUser extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long userInfoId; + @ColumnDefault("CN/zh") @Column(name="LANGUAGE_CODE") @ApiParam(value ="用户语言") private String languageCode; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java index c4d47ff..f277ace 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -26,7 +27,12 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_EXCEPTION") +@Table(name="SYS_LOG_EXCEPTION", + indexes = { + @Index(columnList = "CREATE_DATE_TIME DESC", name = "LOG_INDEX_CREATE_DATE_TIME"), + @Index(columnList = "EXC_MODULE_ID DESC", name = "LOG_INDEX_EXC_MODULE_ID") + } +) @Api(value="系统异常表",description = "记录系统出现的异常") public class SysLogException extends BaseBean { diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java index 543dac6..5e20049 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java @@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -29,7 +30,12 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_OPERATE") +@Table(name="SYS_LOG_OPERATE", + indexes = { + @Index(columnList = "CREATE_DATE_TIME DESC", name = "LOG_INDEX_CREATE_DATE_TIME"), + @Index(columnList = "OPERATE_MODULE DESC", name = "LOG_INDEX_OPERATE_MODULE"), + @Index(columnList = "OPERATE_TYPE DESC", name = "LOG_INDEX_OPERATE_TYPE") +}) @Api(value="操作日志表",description = "操作日志表") public class SysLogOperate extends BaseBean { diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java index c9e32ec..f4fdc54 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java @@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -29,7 +30,12 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_SYSTEM") +@Table(name="SYS_LOG_SYSTEM", + indexes = { + @Index(columnList = "CREATE_DATE_TIME", name = "LOG_INDEX_CREATE_DATE_TIME"), + @Index(columnList = "LOG_LEVEL", name = "LOG_INDEX_LOG_LEVEL"), + @Index(columnList = "LOG_MODULE_ID", name = "LOG_INDEX_LOG_MODULE_ID") + }) @Api(value="系统日志表",description = "系统日志表") public class SysLogSystem extends BaseBean { diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java index 569a11c..c5928ee 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -26,7 +27,12 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_TASK_TIME") +@Table(name="SYS_LOG_TASK_TIME", + indexes = { + @Index(columnList = "CREATE_DATE_TIME", name = "LOG_INDEX_CREATE_DATE_TIME"), + @Index(columnList = "NAME DESC", name = "LOG_INDEX_LOG_NAME"), + @Index(columnList = "GROUP_NAME DESC", name = "LOG_INDEX_LOG_GROUP_NAME") + }) @Api(value="定时任务执行日志",description = "定时任务执行记录") public class SysLogTaskTime extends BaseBean { diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 5b60a92..9b24ccb 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -240,6 +240,7 @@ public class CoreHqlPack { HqlPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(), "parentId", result); } HqlPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); + HqlPack.getStringLikerPack(dictionary.getParentCodeRdd(),"parentCodeRdd", result); // 添加默认排序 HqlPack.getOrderDefault(dictionary); @@ -256,7 +257,7 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); // hql拼接 - HqlPack.getStringLikerPack(toolType.getName(),"name",result); + HqlPack.getStringLikerPack(toolType.getName(),"name", result); // 添加默认排序 HqlPack.getOrderDefault(toolType); From 4fe37019293d78cc52c6271abd55bbeea752d29f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sat, 29 Jun 2019 17:03:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 d46b5da..aa214c0 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 @@ -7,12 +7,13 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; -import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.Type; - -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -36,7 +37,6 @@ public class SysUser extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long userInfoId; - @ColumnDefault("CN/zh") @Column(name="LANGUAGE_CODE") @ApiParam(value ="用户语言") private String languageCode;