Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core

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<LogOperate> listLogOperate(LogOperate logOperate,Pager pager);
+    ListPager<LogOperate> listLogOperate(LogOperate logOperate, Pager pager);
 
     /**
      * 根据id删除日志
@@ -47,4 +48,11 @@ public interface ILogOperateService {
      * @return
      */
     LogOperate getLogOperateById(long id);
+
+    /**
+     * 根据操作人姓名模糊查询日志
+     * @param operateUserName
+     * @return
+     */
+    List<LogOperate> listLogOperateByOperateUserName(String operateUserName);
 }

modules/i3plus-core-apiservice/pom.xml

@@ -100,6 +100,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                    <groupId>org.springframework.boot</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

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<LogOperate> logList = logOperateService.listLogOperateByOperateUserName(OperateUserName);
+
             return ResultBean.success("操作成功").setResultList(logList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);

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<LogOperate> logOperateList = logOperateService.listLogOperate(null,null);
+            ListPager<LogOperate> 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);

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<LogOperate> listLogOperate(LogOperate logOperate, Pager pager) {
-        return logOperateRDao.findAll();
+    public ListPager<LogOperate> 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<LogOperate> listLogOperateByOperateUserName(String operateUserName) {
+        return logOperateRDao.findByProperty("operateUserName",operateUserName);
     }
 }

pom.xml

@@ -157,6 +157,12 @@
                 <artifactId>spring-boot-starter-test</artifactId>
                 <version>2.0.3.RELEASE</version>
                 <scope>test</scope>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>spring-boot-starter-logging</artifactId>
+                        <groupId>org.springframework.boot</groupId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>junit</groupId>