From 43770f8bccbcd7097a5f74fe91d614c752ea5fab Mon Sep 17 00:00:00 2001
From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com>
Date: Mon, 12 Nov 2018 23:31:31 +0800
Subject: [PATCH] =?UTF-8?q?1=EF=BC=8C=E5=AF=B9=E8=B1=A1hashcode=E5=92=8Ceq?=
 =?UTF-8?q?uals=E7=BB=A7=E6=89=BF=E7=88=B6=E5=AF=B9=E8=B1=A1=202=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=BB=E9=94=AE=E7=94=9F=E6=88=90=E7=AD=96=E7=95=A5=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java   | 3 +++
 .../estsh/i3plus/core/apiservice/controller/DemoMongoController.java | 3 +++
 .../core/apiservice/serviceimpl/base/DataSimpleServiceImpl.java      | 5 +----
 .../i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java   | 5 +++++
 4 files changed, 12 insertions(+), 4 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 2eb557b..7655330 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
@@ -55,4 +55,7 @@ public interface ILogOperateService {
      * @return
      */
     List<LogOperate> listLogOperateByOperateUserName(String operateUserName);
+
+    //查询所有日志数量
+    long countAllLogOperate();
 }
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 65fe8f0..293c67c 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
@@ -101,6 +101,9 @@ public class DemoMongoController {
         try {
             List<LogOperate> logList = logOperateService.listLogOperateByOperateUserName(OperateUserName);
 
+            long count = logOperateService.countAllLogOperate();
+            LOGGER.info("=log size= " + count);
+
             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/serviceimpl/base/DataSimpleServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/DataSimpleServiceImpl.java
index 6c17061..33a2d5b 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/DataSimpleServiceImpl.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/DataSimpleServiceImpl.java
@@ -2,16 +2,13 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.core.api.iservice.base.IDataSimpleService;
 import cn.estsh.i3plus.core.apiservice.dao.IMachineFactoryDao;
-import cn.estsh.i3plus.platform.common.idtool.SnowflakeIdMaker;
+import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
 import cn.estsh.i3plus.pojo.mes.MachineFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.sql.DataSource;
-import java.util.List;
-
 /**
  * @Description :
  * @Reference :
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 f4c61ef..4139c9c 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
@@ -74,4 +74,9 @@ public class LogOperateService implements ILogOperateService {
     public List<LogOperate> listLogOperateByOperateUserName(String operateUserName) {
         return logOperateRDao.findByProperty("operateUserName",operateUserName);
     }
+
+    @Override
+    public long countAllLogOperate() {
+        return logOperateRDao.listCount();
+    }
 }