查询优化

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

@@ -29,6 +29,7 @@ import javax.persistence.Table;
 @Api(value="数据对象")
 public class SysDataSource extends BaseBean {
 
+    private static final long serialVersionUID = -3116421427693381484L;
     @Column(name="SOFT_TYPE")
     @ApiParam(value ="产品类型")
     private Integer softType;

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

@@ -33,9 +33,7 @@ import javax.persistence.*;
 @Api(value="对象历史")
 public class SysPojoVersion extends BaseBean {
 
-
+    private static final long serialVersionUID = -2265406135818649545L;
-    private static final long serialVersionUID = -2456588444446248239L;
-
     @Column(name="SOFT_TYPE")
     @ApiParam(value ="产品类型")
     private Integer softType;

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

@@ -32,8 +32,7 @@ import javax.persistence.Table;
 @Api(value="对象历史")
 public class SysPojoVersionDetail extends BaseBean {
 
-
+    private static final long serialVersionUID = 5385530381442176242L;
-    private static final long serialVersionUID = -2456588444446248239L;
     @Column(name="POJO_VERSION_ID")
     @ApiParam(value ="对象id" ,example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

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

@@ -29,7 +29,7 @@ import javax.persistence.Table;
 @Api(value="对象历史")
 public class SysPojoVersionPlan extends BaseBean {
 
-    private static final long serialVersionUID = -1120504360281638917L;
+    private static final long serialVersionUID = -3125272220108497862L;
     @Column(name="SOFT_TYPE")
     @ApiParam(value ="产品类型")
     private Integer softType;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java

@@ -35,7 +35,10 @@ public class SysLogConsole extends BaseBean {
     /******** 服务器信息 ********/
     @Column(name="SOFT_TYPE")
     @ApiParam(value ="产品名称")
-    private String softType;
+    private Integer softType;
+    public String getSoftTypeTxt() {
+        return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
+    }
 
     @Column(name="LOG_HOST")
     @ApiParam(value ="服务器IP")

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java

@@ -33,17 +33,12 @@ public class SysLogException extends BaseBean {
 
     //CommonEnumUtil.SOFT_TYPE
     @Indexed
-    @Column(name="EXC_MODULE_ID")
+    @Column(name="SOFT_TYPE")
     @ApiParam(value ="系统模块（枚举）", example = "1")
     @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description")
-    private Integer excModule;
+    private Integer softType;
-
+    public String getSoftTypeTxt() {
-    private String excModuleName;
+        return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
-    public String getExcModuleName(){
-        if(this.excModule != null){
-            return CommonEnumUtil.SOFT_TYPE.valueOfDescription(this.excModule);
-        }
-        return excModuleName;
     }
 
     @Column(name="EXC_CLASS_NAME")

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java

@@ -35,17 +35,12 @@ import javax.persistence.Table;
 public class SysLogOperate extends BaseBean {
 
     @Indexed
-    @Column(name="OPERATE_MODULE")
+    @Column(name="SOFT_TYPE")
     @ApiParam(value ="系统模块（枚举）", example = "1")
     @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description")
-    private Integer operateModule;
+    private Integer softType;
-
+    public String getSoftTypeTxt() {
-    private String operateModuleName;
+        return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
-    public String getOperateModuleName(){
-        if(this.operateModule != null){
-            return CommonEnumUtil.SOFT_TYPE.valueOfDescription(this.operateModule);
-        }
-        return operateModuleName;
     }
 
     @Indexed
@@ -54,8 +49,8 @@ public class SysLogOperate extends BaseBean {
     @AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class,refForeignKey = "value",value = "description")
     private Integer operateType;
 
-    public String getOperateTypeName(){
+    public String getOperateTypeTxt(){
-        return ImppEnumUtil.OPERATE_TYPE.valueOfCode(operateType);
+        return operateType == null ? null : ImppEnumUtil.OPERATE_TYPE.valueOfDescription(operateType);
     }
 
     @Column(name="OPERATE_MESSAGE")
@@ -74,9 +69,9 @@ public class SysLogOperate extends BaseBean {
     @ApiParam(value ="请求路径" , access ="请求路径")
     private String requestUrl;
 
-    @Column(name="HTTP_METHOD")
+//    @Column(name="HTTP_METHOD")
-    @ApiParam(value ="http请求方法" , access ="http请求方法")
+//    @ApiParam(value ="http请求方法" , access ="http请求方法")
-    private String httpMethod;
+//    private String httpMethod;
 
     @Column(name="LOG_ARGS")
     @ApiParam(value ="方法入参" , access ="方法入参")

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java

@@ -39,12 +39,18 @@ public class SysLogSystem extends BaseBean {
     @ApiParam(value ="日志级别" , example ="1")
     @AnnoOutputColumn(refClass = ImppEnumUtil.LOG_LEVEL.class,refForeignKey = "value",value = "name")
     private Integer logLevel;
+    public String getLogLevelTxt() {
+        return logLevel == null ? null : ImppEnumUtil.LOG_LEVEL.valueOfDescription(logLevel);
+    }
 
     @Indexed
-    @Column(name="LOG_MODULE_ID")
+    @Column(name="SOFT_TYPE")
     @ApiParam(value ="系统模块（枚举）", example = "1")
     @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description")
-    private Integer logModuleId;
+    private Integer softType;
+    public String getSoftTypeTxt() {
+        return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
+    }
 
     @Column(name="REMOTE_IP")
     @ApiParam(value ="请求IP" , access ="请求IP")

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java

@@ -63,9 +63,12 @@ public class SysLogTaskTime extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long taskPlanId;
 
-    @Column(name = "TASK_SOFT_TYPE_RDD")
+    @Column(name="SOFT_TYPE")
-    @ApiParam(value = "任务所属模块")
+    @ApiParam(value ="产品名称")
-    private Integer taskSoftTypeRdd;
+    private Integer softType;
+    public String getSoftTypeTxt() {
+        return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
+    }
 
     @Column(name="TASK_CYCLE_NAME_RDD")
     @ApiParam(value ="任务周期名称")

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

@@ -114,13 +114,13 @@ public class ReportHqlPack {
      * @param brLayout
      * @return
      */
-    public static String packHqlBrLayout(BrLayout brLayout){
+        public static DdlPackBean packHqlBrLayout(BrLayout brLayout){
-        StringBuffer result = new StringBuffer();
+        DdlPackBean result = DdlPackBean.getDdlPackBean(brLayout);
 
         // 查询参数封装
-        HqlPack.getStringLikerPack(brLayout.getLayoutName(),"layoutName",result);
+        DdlPreparedPack.getStringLikerPack(brLayout.getLayoutName(),"layoutName",result);
 
-        return result.toString();
+        return result;
     }
 
     /**