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

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogExceptionService.java

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.core.api.iservice.busi;
+
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.platform.bean.SysLogException;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @Description : 异常日志服务接口
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2018-11-19 17:28
+ * @Modify:
+ **/
+public interface ISysLogExceptionService {
+
+    /**
+     * 系统异常日志复杂查询，分页，排序
+     * @param sysLogException
+     * @param pager
+     * @return
+     */
+    @ApiOperation(value = "系统异常日志复杂查询，分页，排序")
+    ListPager<SysLogException> querySysLogExceptionByPager(SysLogException sysLogException, Pager pager);
+}

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogOperateService.java

@@ -62,6 +62,7 @@ public interface ISysLogOperateService {
     List<SysLogOperate> listSysLogOperateByOperateUserName(String operateUserName);
 
     //查询所有日志数量
+    @ApiOperation(value = "查询所有日志数量")
     long countAllSysLogOperate();
 
     /**

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java

@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.core.apiservice.controller.busi;
+
+import cn.estsh.i3plus.core.api.iservice.busi.ISysLogExceptionService;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
+import cn.estsh.i3plus.pojo.platform.bean.SysLogException;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
+import cn.estsh.impp.framework.boot.exception.ImppBusiException;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.util.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description : 系统异常日志服务
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2018-11-19 18:42
+ * @Modify:
+ **/
+@RestController
+@Api(description = "系统异常日志服务")
+@RequestMapping(CoreBaseController.BASE_URL + "/sys-log-exception")
+public class SysLogExceptionController {
+    public static final Logger LOGGER = LoggerFactory.getLogger(SysLogExceptionController.class);
+
+    @Autowired
+    private ISysLogExceptionService sysLogExceptionService;
+
+        @GetMapping(value = "/query")
+        @ApiOperation(value = "异常日志复杂查询，分页，排序",notes = "异常日志复杂查询，分页，排序")
+        public ResultBean querySysLogOperateByPager(SysLogException sysLogException, Pager pager){
+            try {
+                ListPager logExceptionList = sysLogExceptionService.querySysLogExceptionByPager(sysLogException, pager);
+                return ResultBean.success("查询成功").setListPager(logExceptionList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+            }catch(ImppBusiException busExcep){
+                return ResultBean.fail(busExcep.getErrorShow());
+            }catch(Exception e){
+                return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+            }
+    }
+}

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java

@@ -1,16 +1,13 @@
 package cn.estsh.i3plus.core.apiservice.controller.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISysLogOperateService;
-import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
-import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.SysLogOperate;
 import cn.estsh.impp.framework.base.controller.CoreBaseController;
-import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
-import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ResultBean;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import io.swagger.annotations.Api;
@@ -24,7 +21,7 @@ import javax.websocket.server.PathParam;
 import java.util.List;
 
 /**
- * @Description : 操作日志
+ * @Description : 操作日志服务
  * @Reference :
  * @Author : yunhao
  * @Date : 2018-10-25 14:08
@@ -32,7 +29,7 @@ import java.util.List;
  **/
 @RestController
 @Api(description = "操作日志")
-@RequestMapping(CoreBaseController.BASE_URL + "/log-operate")
+@RequestMapping(CoreBaseController.BASE_URL + "/sys-log-operate")
 public class SysLogOperateController extends CoreBaseController {
     public static final Logger LOGGER = LoggerFactory.getLogger(SysLogOperateController.class);
 
@@ -43,20 +40,12 @@ public class SysLogOperateController extends CoreBaseController {
     @ApiOperation(value = "添加操作日志",notes = "添加操作日志")
     public ResultBean insertSysLogOperateController(SysLogOperate logOperate){
         try {
-            // 登录用户
-            SessionUser user = AuthUtil.getSessionUser();
-
-            // 新增初始化
-            ConvertBean.modelInitialize(logOperate,user);
-
             logOperateService.insertSysLogOperate(logOperate);
             return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
-            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
             return ResultBean.fail(busExcep.getErrorShow());
         }catch(Exception e){
-            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
         }
     }
 
@@ -70,11 +59,9 @@ public class SysLogOperateController extends CoreBaseController {
             logOperateService.deleteSysLogOperateById(Long.parseLong(id));
             return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
-            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
             return ResultBean.fail(busExcep.getErrorShow());
         }catch(Exception e){
-            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
         }
     }
 
@@ -85,11 +72,9 @@ public class SysLogOperateController extends CoreBaseController {
             List logOperateList = logOperateService.listSysLogOperate();
             return ResultBean.success("查询成功").setResultList(logOperateList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
-            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
             return ResultBean.fail(busExcep.getErrorShow());
         }catch(Exception e){
-            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
         }
     }
 
@@ -108,11 +93,9 @@ public class SysLogOperateController extends CoreBaseController {
                         .setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
             }
         }catch(ImppBusiException busExcep){
-            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
             return ResultBean.fail(busExcep.getErrorShow());
         }catch(Exception e){
-            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
         }
     }
 
@@ -123,11 +106,9 @@ public class SysLogOperateController extends CoreBaseController {
             ListPager logSystemList = logOperateService.querySysLogOperateByPager(logOperate, pager);
             return ResultBean.success("查询成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
-            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
             return ResultBean.fail(busExcep.getErrorShow());
         }catch(Exception e){
-            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
         }
     }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java

@@ -1,16 +1,13 @@
 package cn.estsh.i3plus.core.apiservice.controller.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISysLogSystemService;
-import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SysLogSystem;
-import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.impp.framework.base.controller.CoreBaseController;
-import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
-import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ResultBean;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import io.swagger.annotations.Api;
@@ -31,7 +28,7 @@ import java.util.List;
  **/
 @RestController
 @Api(description = "系统日志服务")
-@RequestMapping(CoreBaseController.BASE_URL +"/log-system")
+@RequestMapping(CoreBaseController.BASE_URL +"/sys-log-system")
 public class SysLogSystemController extends CoreBaseController{
     public static final Logger LOGGER = LoggerFactory.getLogger(SysLogSystemController.class);
 
@@ -43,20 +40,12 @@ public class SysLogSystemController extends CoreBaseController{
     @ApiOperation(value="新增系统日志",notes = "新增系统日志")
     public ResultBean insertSysLogSystem(SysLogSystem logSystem) {
         try {
-            // 登录用户
-            SessionUser user = AuthUtil.getSessionUser();
-
-            // 新增初始化
-            ConvertBean.modelInitialize(logSystem,user);
-
             logSystemService.insertSysLogSystem(logSystem);
             return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
-            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
             return ResultBean.fail(busExcep.getErrorShow());
         }catch(Exception e){
-            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
         }
     }
 
@@ -70,11 +59,9 @@ public class SysLogSystemController extends CoreBaseController{
             logSystemService.deleteSysLogSystemById(Long.parseLong(id));
             return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
-            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
             return ResultBean.fail(busExcep.getErrorShow());
         }catch(Exception e){
-            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
         }
     }
 
@@ -83,15 +70,11 @@ public class SysLogSystemController extends CoreBaseController{
     public ResultBean findSysLogSystemAll(){
         try {
             List<SysLogSystem> logSystemList = logSystemService.listSysLogSystem();
-            return ResultBean.success("查询成功")
+            return ResultBean.success("查询成功").setResultList(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-                                .setResultList(logSystemList)
-                                .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
-            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
             return ResultBean.fail(busExcep.getErrorShow());
         }catch(Exception e){
-            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
         }
     }
 
@@ -102,11 +85,9 @@ public class SysLogSystemController extends CoreBaseController{
             SysLogSystem logSystem = logSystemService.getSysLogSystemById(Long.parseLong(id));
             return ResultBean.success("查询成功").setResultObject(logSystem).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
-            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
             return ResultBean.fail(busExcep.getErrorShow());
         }catch(Exception e){
-            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
         }
     }
 
@@ -123,11 +104,9 @@ public class SysLogSystemController extends CoreBaseController{
             ListPager logSystemList = logSystemService.querySysLogSystemByPager(logSystem, pager);
             return ResultBean.success("查询成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
-            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
             return ResultBean.fail(busExcep.getErrorShow());
         }catch(Exception e){
-            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
         }
     }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java

@@ -117,7 +117,6 @@ public class SysDictionaryService implements ISysDictionaryService {
 
     @Override
     public ListPager querySysDictionaryByPager(SysDictionary sysDictionary, Pager pager) {
-        LOGGER.info("字典 SYS_DICTIONARY SysDictionary:{}，Pager:{}",sysDictionary,pager);
         sysDictionary = sysDictionary == null ? new SysDictionary():sysDictionary;
 
         String hqlPack = CoreHqlPack.packHqlSysDictionary(sysDictionary);

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogExceptionService.java

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
+
+import cn.estsh.i3plus.core.api.iservice.busi.ISysLogExceptionService;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.base.common.PagerHelper;
+import cn.estsh.i3plus.pojo.platform.bean.SysLogException;
+import cn.estsh.i3plus.pojo.platform.repositorymongo.SysLogExceptionRepository;
+import cn.estsh.i3plus.pojo.platform.sqlpack.CoreBsonPack;
+import io.swagger.annotations.ApiOperation;
+import org.bson.conversions.Bson;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description :异常日志服务接口实现
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2018-11-19 17:30
+ * @Modify:
+ **/
+@Service
+public class SysLogExceptionService implements ISysLogExceptionService {
+    public static final Logger LOGGER = LoggerFactory.getLogger(SysLogExceptionService.class);
+
+    @Autowired
+    private SysLogExceptionRepository sysLogExceptionRDao;
+
+    @Override
+    @ApiOperation(value = "系统异常日志复杂查询，分页，排序")
+    public ListPager<SysLogException> querySysLogExceptionByPager(SysLogException sysLogException, Pager pager) {
+        if(sysLogException == null) {
+            pager = PagerHelper.getPager(pager, (int) sysLogExceptionRDao.count());
+            return new ListPager(sysLogExceptionRDao.findAll(),pager);
+        }else{
+            Bson bson = CoreBsonPack.packBsonBySysLogException(sysLogException);
+            pager = PagerHelper.getPager(pager,sysLogExceptionRDao.findByBsonCount(bson));
+            //分页，排序
+            return new ListPager(sysLogExceptionRDao.findByBsonPager(bson,pager,sysLogException.getOrderByParam()
+                            ,sysLogException.getAscOrDesc()),pager);
+        }
+    }
+}

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogOperateService.java

@@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.common.PagerHelper;
 import cn.estsh.i3plus.pojo.platform.bean.SysLogOperate;
 import cn.estsh.i3plus.pojo.platform.repositorymongo.SysLogOperateRepository;
 import cn.estsh.i3plus.pojo.platform.sqlpack.CoreBsonPack;
+import io.swagger.annotations.ApiOperation;
 import org.bson.conversions.Bson;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -31,16 +32,19 @@ public class SysLogOperateService implements ISysLogOperateService {
     public SysLogOperateRepository logOperateRDao;
 
     @Override
+    @ApiOperation(value = "添加操作日志",notes = "添加操作日志")
     public SysLogOperate insertSysLogOperate(SysLogOperate logOperate) {
         return logOperateRDao.insert(logOperate);
     }
 
     @Override
+    @ApiOperation(value = "根据id删除日志",notes = "根据id删除日志")
     public void deleteSysLogOperateById(Long id) {
         logOperateRDao.deleteById(id);
     }
 
     @Override
+    @ApiOperation(value = "查询全部操作日志",notes = "查询全部操作日志")
     public List listSysLogOperate() {
         return logOperateRDao.listPager(null);
     }
@@ -53,28 +57,32 @@ public class SysLogOperateService implements ISysLogOperateService {
     }
 
     @Override
+    @ApiOperation(value = "根据id查询操作日志",notes = "根据id查询操作日志")
     public SysLogOperate getSysLogOperateById(Long id) {
         return logOperateRDao.getById(id);
     }
 
     @Override
+    @ApiOperation(value = "根据操作人姓名模糊查询日志",notes = "根据操作人姓名模糊查询日志")
     public List<SysLogOperate> listSysLogOperateByOperateUserName(String operateUserName) {
         return logOperateRDao.findByProperty("operateUserName",operateUserName);
     }
 
     @Override
+    @ApiOperation(value = "查询所有日志数量")
     public long countAllSysLogOperate() {
         return logOperateRDao.listCount();
     }
 
     @Override
+    @ApiOperation(value = "操作日志复杂查询，分页，排序",notes = "操作日志复杂查询，分页，排序")
     public ListPager<SysLogOperate> querySysLogOperateByPager(SysLogOperate logOperate, Pager pager) {
         if(logOperate == null) {
             pager = PagerHelper.getPager(pager, (int) logOperateRDao.count());
             return new ListPager(logOperateRDao.findAll(),pager);
         }else{
             Bson bson = CoreBsonPack.packBsonByLogOperate(logOperate);
-            pager = PagerHelper.getPager(pager,(int)logOperateRDao.findByBsonCount(bson));
+            pager = PagerHelper.getPager(pager,logOperateRDao.findByBsonCount(bson));
             //分页，排序
             return new ListPager(logOperateRDao.findByBsonPager(bson,pager,logOperate.getOrderByParam(),logOperate.getAscOrDesc()),pager);
         }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogSystemService.java

@@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.common.PagerHelper;
 import cn.estsh.i3plus.pojo.platform.bean.SysLogSystem;
 import cn.estsh.i3plus.pojo.platform.repositorymongo.SysLogSystemRepository;
 import cn.estsh.i3plus.pojo.platform.sqlpack.CoreBsonPack;
+import io.swagger.annotations.ApiOperation;
 import org.bson.conversions.Bson;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -32,38 +33,38 @@ public class SysLogSystemService implements ISysLogSystemService {
     private SysLogSystemRepository logSystemRDao;
 
     @Override
+    @ApiOperation(value = "添加系统日志",notes = "添加系统日志")
     public void insertSysLogSystem(SysLogSystem logSystem) {
-        LOGGER.info("系统日志 SYS_SYSTEM {}",logSystem);
         logSystemRDao.insert(logSystem);
     }
 
     @Override
+    @ApiOperation(value = "删除日志",notes = "删除日志")
     public void deleteSysLogSystemById(Long id) {
-        LOGGER.info("系统日志 SYS_SYSTEM id:{}",id);
         logSystemRDao.deleteById(id);
     }
 
     @Override
+    @ApiOperation(value = "查询全部日志",notes = "查询全部日志")
     public List<SysLogSystem> listSysLogSystem() {
-        LOGGER.info("系统日志 LOG_SYSTEM list");
         return logSystemRDao.findAll();
     }
 
     @Override
+    @ApiOperation(value = "根据id查询系统日志",notes = "根据id查询系统日志")
     public SysLogSystem getSysLogSystemById(long id) {
-        LOGGER.info("系统日志 LOG_SYSTEM id:{}",id);
         return logSystemRDao.getById(id);
     }
 
     @Override
+    @ApiOperation(value = "系统日志分页复杂查询",notes = "系统日志分页复杂查询")
     public ListPager querySysLogSystemByPager(SysLogSystem logSystem, Pager pager) {
-        LOGGER.info("系统日志 LOG_SYSTEM logSystem:{}，Pager:{}",logSystem,pager);
         if (logSystem == null) {
-            pager = PagerHelper.getPager(pager,(int) logSystemRDao.listCount());
+            pager = PagerHelper.getPager(pager,logSystemRDao.listCount());
             return new ListPager(logSystemRDao.listPager(pager),pager);
         } else {
             Bson bson = CoreBsonPack.packBsonByLogSystem(logSystem);
-            pager = PagerHelper.getPager(pager, (int) logSystemRDao.findByBsonCount(bson));
+            pager = PagerHelper.getPager(pager,logSystemRDao.findByBsonCount(bson));
             return new ListPager(logSystemRDao.findByBsonPager(bson,pager,logSystem.getOrderByParam()
                                     ,logSystem.getAscOrDesc()),pager);
         }