From 7fa6e30dabf732236f437c0c534b500490c0c7b3 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Wed, 20 May 2020 14:49:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/apiservice/serviceimpl/busi/SysMenuService.java      |  5 +++++
 .../apiservice/serviceimpl/busi/SysPojoVersionService.java    |  3 +--
 .../java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java  | 11 ++++++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java
index 65ee1be..a661d3c 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java
@@ -69,6 +69,11 @@ public class SysMenuService extends CacheCrudService<SysMenu> implements ISysMen
     }
 
     @Override
+    public DdlPackBean getFindPagerPackBean(SysMenu bean) {
+        return CoreHqlPack.packDdlBeanSysMenu(bean, null);
+    }
+
+    @Override
     public SysMenu packBeforeUpdate(SysMenu bean) {
         return super.packBeforeUpdate(bean);
     }
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPojoVersionService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPojoVersionService.java
index d81bc58..e6000d3 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPojoVersionService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPojoVersionService.java
@@ -50,8 +50,7 @@ public class SysPojoVersionService extends CrudService<SysPojoVersion> implement
     }
 
     @Override
-    public DdlPackBean packFindAllBean(SysPojoVersion bean) {
+    public DdlPackBean getFindPagerPackBean(SysPojoVersion bean) {
         return CoreHqlPack.packHqlSysPojoVersion(bean);
     }
-
 }
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java
index 450113b..5789835 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java
@@ -54,6 +54,8 @@ public class NoSqlPack {
 
         bson = BsonPackTool.getNumEqualPack(sysLogException.getSoftType(), "softType", bson);
         bson = BsonPackTool.getStringLikerPack(sysLogException.getExcMessage(), "excMessage", bson);
+        bson = BsonPackTool.getStringLikerPack(sysLogException.getExcStack(), "excStack", bson);
+        bson = BsonPackTool.getStringLikerPack(sysLogException.getExcClassName(), "excClassName", bson);
         bson = BsonPackTool.timeBuilder("createDatetime", bson, sysLogException.getCreateDateTimeStart(),sysLogException.getCreateDateTimeEnd());
 
         return bson;
@@ -63,7 +65,10 @@ public class NoSqlPack {
         ElasticSearchPack result = packElasticSearchPack(bean);
 
         result.andNumberEquals("softType",bean.getSoftType());
-        result.andKeywordLike("excMessage",bean.getExcMessage());
+        result.andStringLike("excMessage",bean.getExcMessage());
+        result.andStringLike("excClassName",bean.getExcClassName());
+//        result.andTextEquals("excStack",bean.getExcStack());
+        result.andText("excStack",bean.getExcStack());
         result.andKeywordDateTimeBetween("createDatetime",bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd());
 
         return result;
@@ -96,6 +101,8 @@ public class NoSqlPack {
         result.andKeywordEquals("operateType",bean.getOperateType());
         result.andNumberEquals("softType",bean.getSoftType());
         result.andStringEquals("remoteIp",bean.getRemoteIp());
+//        result.andStringEquals("requestUrl",bean.getRequestUrl());
+        result.andTextLike("requestUrl",bean.getRequestUrl());
         result.andStringEquals("createUser",bean.getCreateUser());
         result.andStringLike("operateMessage",bean.getOperateMessage());
         result.andStringDateTimeBetween("createDatetime",bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd());
@@ -130,6 +137,8 @@ public class NoSqlPack {
         result.andTextEquals("logLevel",bean.getLogLevel());
         result.andNumberEquals("softType",bean.getSoftType());
         result.andStringEquals("remoteIp",bean.getRemoteIp());
+        result.andStringEquals("logClass",bean.getLogClass());
+        result.andStringEquals("logMethod",bean.getLogMethod());
         result.andTextLike("requestUrl",bean.getRequestUrl());
         result.andKeywordDateTimeBetween("createDatetime",bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd());