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/BlockFormEnumUtil.java

@@ -1713,10 +1713,10 @@ public class BlockFormEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TRIGGER_EVENT {
-        CLICK(10, "CLICK", "单击"),
+        CLICK(10, "CLICK", "单击");
-        DB_LCLICK(20, "DB_LCLICK", "双击"),
+//        DB_LCLICK(20, "DB_LCLICK", "双击"),
-        MOUSE_OUT(30, "MOUSE_OUT", "鼠标指针移出"),
+//        MOUSE_OUT(30, "MOUSE_OUT", "鼠标指针移出"),
-        MOUSE_OVER(40, "MOUSE_OVER", "鼠标指针移动入");
+//        MOUSE_OVER(40, "MOUSE_OVER", "鼠标指针移入");
 
         private int value;
         private String code;

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;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.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.*;
+import javax.persistence.Lob;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.List;
 
 /**

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 {
 

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 {
 

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 {
 

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 {
 

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);