From fc5977d180ae72e5eb6abd1fc7834350460ae660 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Fri, 2 Nov 2018 17:35:25 +0800 Subject: [PATCH] =?UTF-8?q?mongodb=E5=B7=A5=E5=85=B7=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=8C=E6=97=A5=E5=BF=97=E9=83=A8=E5=88=86=E4=BD=BF=E7=94=A8?= =?UTF-8?q?mongo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/api/iservice/busi/ILogOperateService.java | 10 +++++- modules/i3plus-core-apiservice/pom.xml | 6 ++++ .../apiservice/controller/DemoMongoController.java | 18 ++++++++++- .../controller/busi/LogOperateController.java | 5 +-- .../serviceimpl/busi/LogOperateService.java | 37 ++++++++++++++-------- pom.xml | 6 ++++ 6 files changed, 65 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java index b7f64db..2eb557b 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java @@ -1,5 +1,6 @@ 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.LogOperate; @@ -27,7 +28,7 @@ public interface ILogOperateService { * @param pager * @return */ - List listLogOperate(LogOperate logOperate,Pager pager); + ListPager listLogOperate(LogOperate logOperate, Pager pager); /** * 根据id删除日志 @@ -47,4 +48,11 @@ public interface ILogOperateService { * @return */ LogOperate getLogOperateById(long id); + + /** + * 根据操作人姓名模糊查询日志 + * @param operateUserName + * @return + */ + List listLogOperateByOperateUserName(String operateUserName); } diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml index c8bf412..2ff810d 100644 --- a/modules/i3plus-core-apiservice/pom.xml +++ b/modules/i3plus-core-apiservice/pom.xml @@ -100,6 +100,12 @@ org.springframework.boot spring-boot-starter-test test + + + spring-boot-starter-logging + org.springframework.boot + + junit diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java index b2f3629..65fe8f0 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java @@ -84,7 +84,23 @@ public class DemoMongoController { @ApiOperation(value="查询日志",notes = "查询日志") public ResultBean queryLanguage(LogOperate logOperate,Pager pager) { try { - List logList = logOperateService.listLogOperate(logOperate,pager); + ListPager logList = logOperateService.listLogOperate(logOperate,pager); + return ResultBean.success("操作成功").setListPager(logList).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 ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } + + @GetMapping(value="/logoperate/operate-user-name") + @ApiOperation(value="查询日志",notes = "查询日志") + public ResultBean queryLanguage(String OperateUserName) { + try { + List logList = logOperateService.listLogOperateByOperateUserName(OperateUserName); + return ResultBean.success("操作成功").setResultList(logList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogOperateController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogOperateController.java index 4b1a8c1..af480c6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogOperateController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogOperateController.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ILogOperateService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; +import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.LogOperate; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; @@ -79,9 +80,9 @@ public class LogOperateController { @ApiOperation(value = "查询全部操作日志",notes = "查询全部操作日志") public ResultBean findLogOperateAll(){ try { - List logOperateList = logOperateService.listLogOperate(null,null); + ListPager logOperateList = logOperateService.listLogOperate(null,null); return ResultBean.success("查询成功") - .setResultList(logOperateList) + .setListPager(logOperateList) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java index 90bff5b..317b297 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java @@ -1,9 +1,14 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ILogOperateService; +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.base.tool.BsonPackTool; import cn.estsh.i3plus.pojo.platform.bean.LogOperate; import cn.estsh.i3plus.pojo.platform.repository.LogOperateRepository; +import com.mongodb.client.model.Filters; +import org.bson.conversions.Bson; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -32,8 +37,20 @@ public class LogOperateService implements ILogOperateService { } @Override - public List listLogOperate(LogOperate logOperate, Pager pager) { - return logOperateRDao.findAll(); + public ListPager listLogOperate(LogOperate logOperate, Pager pager) { + if(logOperate == null) { + return new ListPager(logOperateRDao.findAll(),pager); + }else{ + Bson bson = Filters.and(); + BsonPackTool.getStringLikerPack(logOperate.getOperateUserName(),"operateUserName",bson); + BsonPackTool.timeBuilder(logOperate.getCreateDateTimeStart(),logOperate.getCreateDateTimeEnd(),"reateDateTime",bson,false); + BsonPackTool.getNumEqualPack(logOperate.getOperateModuleId(),"operateModuleId",bson); + BsonPackTool.getNumEqualPack(logOperate.getOperateTypeId(),"operateTypeId",bson); + + pager = PagerHelper.getPager(pager,(int)logOperateRDao.findByBsonCount(bson)); + //分页，排序 + return new ListPager(logOperateRDao.findByBsonPager(bson,pager,logOperate.getOrderByParam(),logOperate.getAscOrDesc()),pager); + } } @Override @@ -50,17 +67,11 @@ public class LogOperateService implements ILogOperateService { @Override public LogOperate getLogOperateById(long id) { - System.out.println("id====" + id); - List list = logOperateRDao.findAll(); - System.out.println(list.size()); - Optional optional = logOperateRDao.findById(id); - if(optional != null) { - System.out.println(optional); + return logOperateRDao.getById(id); + } - System.out.println(optional.get()); - return (LogOperate) optional.get(); - }else{ - return null; - } + @Override + public List listLogOperateByOperateUserName(String operateUserName) { + return logOperateRDao.findByProperty("operateUserName",operateUserName); } } diff --git a/pom.xml b/pom.xml index 97710cc..f532c7d 100644 --- a/pom.xml +++ b/pom.xml @@ -157,6 +157,12 @@ spring-boot-starter-test 2.0.3.RELEASE test + + + spring-boot-starter-logging + org.springframework.boot + + junit