From 4421ab69ef579b7a15518edd61d23c787fc9b161 Mon Sep 17 00:00:00 2001
From: "yunhao.wang" <yunhao.wang@estsh.com>
Date: Mon, 19 Nov 2018 19:49:40 +0800
Subject: [PATCH] Merge branch 'master' of
 http://git.estsh.com/i3-IMPP/impp-framework

# Conflicts:
#	modules/impp-framework-boot/src/main/java/cn/estsh/impp/framework/boot/aspect/LogServiceAspect.java
---
 .../{SysException.java => SysLogException.java}     |  4 ++--
 ...pository.java => SysLogExceptionRepository.java} |  4 ++--
 .../i3plus/pojo/platform/sqlpack/CoreBsonPack.java  | 21 +++++++++++++++++++++
 3 files changed, 25 insertions(+), 4 deletions(-)
 rename modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/{SysException.java => SysLogException.java} (93%)
 rename modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/{SysExceptionRepository.java => SysLogExceptionRepository.java} (63%)

diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysException.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogException.java
similarity index 93%
rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysException.java
rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogException.java
index d0d45c3..c0b0e4e 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysException.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogException.java
@@ -24,9 +24,9 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="SYS_EXCEPTION")
+@Table(name="SYS_LOG_EXCEPTION")
 @Api(value="系统异常表",description = "记录系统出现的异常")
-public class SysException extends BaseBean {
+public class SysLogException extends BaseBean {
 
     //CommonEnumUtil.SOFT_TYPE
     @Column(name="EXC_MODULE_ID")
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysExceptionRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogExceptionRepository.java
similarity index 63%
rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysExceptionRepository.java
rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogExceptionRepository.java
index 05697c4..100f739 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysExceptionRepository.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogExceptionRepository.java
@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.platform.repositorymongo;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
-import cn.estsh.i3plus.pojo.platform.bean.SysException;
+import cn.estsh.i3plus.pojo.platform.bean.SysLogException;
 
 /**
  * @Description : 异常记录表(使用Mongodb)
@@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.SysException;
  * @Date        : 2018-11-8 12:03:00
  * @Modify      :
  **/
-public interface SysExceptionRepository extends BaseMongoRepository<SysException, Long> {
+public interface SysLogExceptionRepository extends BaseMongoRepository<SysLogException, Long> {
 }
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java
index a9f2c60..3e835da 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java
@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.platform.sqlpack;
 
 import cn.estsh.i3plus.pojo.base.tool.BsonPackTool;
+import cn.estsh.i3plus.pojo.platform.bean.SysLogException;
 import cn.estsh.i3plus.pojo.platform.bean.SysLogOperate;
 import cn.estsh.i3plus.pojo.platform.bean.SysLogSystem;
 import com.mongodb.BasicDBObject;
@@ -33,6 +34,11 @@ public class CoreBsonPack {
         return bson;
     }
 
+    /**
+     * 系统操作日志
+     * @param logOperate
+     * @return
+     */
     public static Bson packBsonByLogOperate(SysLogOperate logOperate){
         Bson bson = new BasicDBObject();
 
@@ -43,4 +49,19 @@ public class CoreBsonPack {
 
         return bson;
     }
+
+    /**
+     * 系统异常日志复杂查询
+     * @param sysLogException
+     * @return
+     */
+    public static Bson packBsonBySysLogException(SysLogException sysLogException){
+        Bson bson = new BasicDBObject();
+
+        bson = BsonPackTool.getNumEqualPack(sysLogException.getExcModule(),"excModule",bson);
+        bson = BsonPackTool.getStringLikerPack(sysLogException.getExcClassName(),"excClassName",bson);
+        bson = BsonPackTool.timeBuilder(sysLogException.getCreateDatetime(),"createDatetime",bson,false,false);
+
+        return bson;
+    }
 }